ratnikov-shoulda 2.9.0.1 → 2.9.0.2

data/lib/shoulda/context.rb

@@ -257,10 +257,10 @@ module Shoulda
       context = self
       test_unit_class.send(:define_method, test_name) do
         begin
-          context.run_parent_setup_blocks(self)
+	  context.run_all_setup_blocks(self)
+	  context.run_parent_evaluate_blocks(self)
           should[:before].bind(self).call if should[:before]
-          context.run_current_setup_blocks(self)
-	  context.run_all_evaluate_blocks(self)
+	  context.run_current_evaluate_blocks(self)
           should[:block].bind(self).call
         ensure
           context.run_all_teardown_blocks(self)

data/test/other/helpers_test.rb

@@ -84,7 +84,7 @@ class HelpersTest < Test::Unit::TestCase # :nodoc:
     end
 
     context "after adding another value" do
-      setup do
+      evaluate do
         @a.push(4)
       end
 
@@ -96,7 +96,7 @@ class HelpersTest < Test::Unit::TestCase # :nodoc:
     end
 
     context "after replacing it with an array of strings" do
-      setup do
+      evaluate do
         @a = %w(a b c d e f)
       end
 

data/test/other/should_test.rb

@@ -227,22 +227,27 @@ class ShouldTest < Test::Unit::TestCase # :nodoc:
 
   context "A :before proc" do
     setup do
-      assert_equal "before", @value
+      assert_nil @value, "Should not have run the before block before the setup"
       @value = "setup"
     end
 
-    should "run before the current setup", :before => lambda { @value = "before" } do
-      assert_equal "setup", @value
+    evaluate do
+      assert_equal "before", @value
+      @value = "evaluate"
+    end
+
+    should "run after the current setup and before the current evaluate", :before => lambda { @value = "before" } do
+      assert_equal "evaluate", @value
     end
   end
 
   context "a before statement" do
-    setup do
+    evaluate do
       assert_equal "before", @value
-      @value = "setup"
+      @value = "evaluate"
     end
 
-    before_should "run before the current setup" do
+    before_should "run before the current evaluate" do
       @value = "before"
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ratnikov-shoulda
 version: !ruby/object:Gem::Version 
-  version: 2.9.0.1
+  version: 2.9.0.2
 platform: ruby
 authors: 
 - Tammer Saleh