fixture_background 0.9.8 → 0.9.9

data/lib/fixture_background/active_support/test_case.rb

@@ -18,8 +18,6 @@ module FixtureBackground
         end
         
         def background(&blk)
-          set_callback(:setup, :before, :reset_active_record_fixture_cache, {:prepend => true})
-          set_callback(:setup, :before, :setup_background_ivars)
           @fixture_background = FixtureBackground::Background.new(name, self, nil, blk)
         end
       end

data/lib/fixture_background/background.rb

@@ -69,8 +69,15 @@ module FixtureBackground
       @full_class_name = full_class_name
       @parent = parent
       @background_block = blk
+      
       FixtureBackground.clean_database!
-      @generator = Generator.new(@full_class_name, background_signature, fixture_path, ancestors_and_own_background_blocks, @test_unit_class) unless background_valid?
+      test_unit_class.set_callback(:setup, :before, :reset_active_record_fixture_cache, {:prepend => true})
+      test_unit_class.set_callback(:setup, :before, :setup_background_ivars)  
+      
+      @generator = Generator.new(
+        @full_class_name, background_signature, fixture_path,
+        ancestors_and_own_background_blocks, @test_unit_class
+      ) unless background_valid?
     end
     
     def generate!

data/lib/fixture_background/version.rb

@@ -1,4 +1,4 @@
 module FixtureBackground
-  VERSION = "0.9.8"
+  VERSION = "0.9.9"
 end
 

data/test/rails3/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    fixture_background (0.9.7)
+    fixture_background (0.9.8)
 
 GEM
   remote: http://rubygems.org/

data/test/rails3/test/unit/person_test.rb

@@ -96,7 +96,23 @@ class PersonTest < ActiveSupport::TestCase
     end
 end
 
-class ZZZEmptyDatabaseTest < ActiveSupport::TestCase  
+class PersonWithoutGlobalBackgroundTest < ActiveSupport::TestCase
+
+  context "main context" do
+  
+    background do
+      @person = Person.create(:name => "person")
+    end
+        
+    context "without explicit background" do
+      should "instantiate ivars" do
+        assert_not_nil @person
+      end
+    end
+  end
+end
+
+class ZZZEmptyDatabaseTest < ActiveSupport::TestCase
   should "have a clean database" do
     assert_equal 0, Person.count
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 8
-  version: 0.9.8
+  - 9
+  version: 0.9.9
 platform: ruby
 authors: 
 - Thies C. Arntzen