test: fix database cleaner hook

yanovich · Dec 29, 2011 · 5a6803d · 5a6803d
1 parent 84d66fa
commit 5a6803d
Show file tree

Hide file tree

Showing 14 changed files with 2 additions and 97 deletions.
diff --git a/spec/models/asset_spec.rb b/spec/models/asset_spec.rb
@@ -10,13 +10,6 @@
 require 'spec_helper'
 
 describe Asset do
-  before(:all) do
-    DatabaseCleaner.start
-  end
-
-  after(:all) do
-    DatabaseCleaner.clean
-  end
   it "should have next behaviour" do
     Factory(:asset)
     should validate_presence_of :tag

diff --git a/spec/models/balance_spec.rb b/spec/models/balance_spec.rb
@@ -10,13 +10,6 @@
 require 'spec_helper'
 
 describe Balance do
-  before(:all) do
-    DatabaseCleaner.start
-  end
-
-  after(:all) do
-    DatabaseCleaner.clean
-  end
   it "should have next behaviour" do
     Factory(:balance, :side => Balance::ACTIVE)
     should validate_presence_of :amount

diff --git a/spec/models/bug133_spec.rb b/spec/models/bug133_spec.rb
@@ -10,13 +10,6 @@
 require 'spec_helper'
 
 describe "Bug133" do
-  before(:all) do
-    DatabaseCleaner.start
-  end
-
-  after(:all) do
-    DatabaseCleaner.clean
-  end
   it "should fix bug #133" do
     x = Factory(:money)
     y = Factory(:asset)

diff --git a/spec/models/chart_spec.rb b/spec/models/chart_spec.rb
@@ -10,13 +10,6 @@
 require 'spec_helper'
 
 describe Chart do
-  before(:all) do
-    DatabaseCleaner.start
-  end
-
-  after(:all) do
-    DatabaseCleaner.clean
-  end
   it "should have next behaviour" do
     Factory(:chart)
     should belong_to :currency

diff --git a/spec/models/deal_spec.rb b/spec/models/deal_spec.rb
@@ -10,13 +10,6 @@
 require 'spec_helper'
 
 describe Deal do
-  before(:all) do
-    DatabaseCleaner.start
-  end
-
-  after(:all) do
-    DatabaseCleaner.clean
-  end
   it "should have next behaviour" do
     Factory(:deal)
     should validate_presence_of :tag

diff --git a/spec/models/entity_spec.rb b/spec/models/entity_spec.rb
@@ -10,13 +10,6 @@
 require 'spec_helper'
 
 describe Entity do
-  before(:all) do
-    DatabaseCleaner.start
-  end
-
-  after(:all) do
-    DatabaseCleaner.clean
-  end
   it "should have next behaviour" do
     Factory(:entity)
     should validate_presence_of :tag

diff --git a/spec/models/fact_spec.rb b/spec/models/fact_spec.rb
@@ -10,13 +10,6 @@
 require 'spec_helper'
 
 describe Fact do
-  before(:all) do
-    DatabaseCleaner.start
-  end
-
-  after(:all) do
-    DatabaseCleaner.clean
-  end
   it "should have next behaviour" do
     should validate_presence_of :day
     should validate_presence_of :amount

diff --git a/spec/models/income_spec.rb b/spec/models/income_spec.rb
@@ -10,13 +10,6 @@
 require 'spec_helper'
 
 describe Income do
-  before(:all) do
-    DatabaseCleaner.start
-  end
-
-  after(:all) do
-    DatabaseCleaner.clean
-  end
   it "should have next behaviour" do
     Factory(:income)
     should validate_presence_of :start

diff --git a/spec/models/money_spec.rb b/spec/models/money_spec.rb
@@ -10,13 +10,6 @@
 require 'spec_helper'
 
 describe Money do
-  before(:all) do
-    DatabaseCleaner.start
-  end
-
-  after(:all) do
-    DatabaseCleaner.clean
-  end
   it "should have next behaviour" do
     Factory(:money)
     should validate_presence_of :num_code

diff --git a/spec/models/quote_spec.rb b/spec/models/quote_spec.rb
@@ -11,8 +11,6 @@
 
 describe Quote do
   before(:all) do
-    DatabaseCleaner.start
-
     @cf = Factory(:money)
     @c1 = Factory(:money)
     @c2 = Factory(:money)
@@ -25,10 +23,6 @@
     @sy2 = Factory(:deal, :give => @y, :take => @c2, :rate => 150.0)
   end
 
-  after(:all) do
-    DatabaseCleaner.clean
-  end
-
   it "should create quote" do
     q = Factory(:quote, :money => @c1, :rate => 1.5, :day => DateTime.civil(2008, 3, 24, 12, 0, 0))
     @c1.quote.should eq(q)

diff --git a/spec/models/rule_spec.rb b/spec/models/rule_spec.rb
@@ -10,13 +10,6 @@
 require 'spec_helper'
 
 describe Rule do
-  before(:all) do
-    DatabaseCleaner.start
-  end
-
-  after(:all) do
-    DatabaseCleaner.clean
-  end
   let(:rub) { Factory(:chart).currency }
 
   it "should have next behaviour" do

diff --git a/spec/models/state_spec.rb b/spec/models/state_spec.rb
@@ -10,13 +10,6 @@
 require 'spec_helper'
 
 describe State do
-  before(:all) do
-    DatabaseCleaner.start
-  end
-
-  after(:all) do
-    DatabaseCleaner.clean
-  end
   it "should have next behaviour" do
     Factory(:state)
     should validate_presence_of :amount

diff --git a/spec/models/txn_spec.rb b/spec/models/txn_spec.rb
@@ -27,7 +27,6 @@ class TestData
 
 describe Txn do
   before(:all) do
-    DatabaseCleaner.start
     @rub = Factory(:chart).currency
     @eur = Factory(:money)
     @aasii = Factory(:asset)
@@ -43,10 +42,6 @@ class TestData
     @office = Factory(:deal, :rate => (1 / 2000.0), :give => @bank.give, :take => Factory(:asset))
   end
 
-  after(:all) do
-    DatabaseCleaner.clean
-  end
-
   it "should create states" do
     fact = Factory(:fact, :day => DateTime.civil(2011, 11, 22, 12, 0, 0), :from => @share2,
                    :to => @bank, :resource => @rub, :amount => 100000.0)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -48,18 +48,11 @@
 
     config.before(:all) do
       PaperTrail.enabled = false
+      DatabaseCleaner.start
     end
     config.after(:all) do
+      DatabaseCleaner.clean
       PaperTrail.enabled = true
     end
-    #config.before(:each) do
-    #  pp "Hello suite"
-    #  DatabaseCleaner.start
-    #end
-    #
-    #config.after(:each) do
-    #  pp "Bye suite"
-    #  DatabaseCleaner.clean
-    #end
   end
 end