added merge_block

lib/shoulda/gem/shoulda.rb

@@ -2,12 +2,27 @@ require File.join(File.dirname(__FILE__), 'proc_extensions')
 
 module Thoughtbot
   module Shoulda
-    class << self
-      attr_accessor :current_context
-    end
-
     VERSION = '1.1.1'
 
+    class << self
+      attr_accessor :contexts
+      def contexts
+        @contexts ||= []
+      end
+
+      def current_context
+        self.contexts.last
+      end
+
+      def add_context(context)
+        self.contexts.push(context)
+      end
+
+      def remove_context
+        self.contexts.pop
+      end
+    end
+
     # == Should statements
     #
     # Should statements are just syntactic sugar over normal Test::Unit test methods.  A should block 
@@ -58,7 +73,6 @@ module Thoughtbot
       end
     end
 
-
     # Just like should, but never runs, and instead prints an 'X' in the Test::Unit output.
     def should_eventually(name, options = {}, &blk)
       context_name = self.name.gsub(/Test/, "")
@@ -136,13 +150,13 @@ module Thoughtbot
       attr_accessor :name               # my name
       attr_accessor :parent             # may be another context, or the original test::unit class.
       attr_accessor :subcontexts        # array of contexts nested under myself
-      attr_accessor :setup_blocks       # block given via a setup method
-      attr_accessor :teardown_blocks    # block given via a teardown method
+      attr_accessor :setup_blocks       # blocks given via setup methods
+      attr_accessor :teardown_blocks    # blocks given via teardown methods
       attr_accessor :shoulds            # array of hashes representing the should statements
       attr_accessor :should_eventuallys # array of hashes representing the should eventually statements
 
       def initialize(name, parent, &blk)
-        Shoulda.current_context = self
+        Shoulda.add_context(self)
         self.name               = name
         self.parent             = parent
         self.setup_blocks       = []
@@ -151,13 +165,16 @@ module Thoughtbot
         self.should_eventuallys = []
         self.subcontexts        = []
 
+        merge_block(&blk)
+        Shoulda.remove_context
+      end
+
+      def merge_block(&blk)
         blk.bind(self).call
-        Shoulda.current_context = nil
       end
 
       def context(name, &blk)
-        subcontexts << Context.new(name, self, &blk)
-        Shoulda.current_context = self
+        self.subcontexts << Context.new(name, self, &blk)
       end
 
       def setup(&blk)

test/other/context_test.rb

@@ -2,12 +2,27 @@ require File.join(File.dirname(__FILE__), '..', 'test_helper')
 
 class ContextTest < Test::Unit::TestCase # :nodoc:
   
+  def self.context_macro(&blk)
+    context "with a subcontext made by a macro" do
+      setup { @context_macro = :foo }
+
+      merge_block &blk 
+    end
+  end
+
+  # def self.context_macro(&blk)
+  #   context "with a subcontext made by a macro" do
+  #     setup { @context_macro = :foo }
+  #     yield # <- this doesn't work.
+  #   end
+  # end
+
   context "context with setup block" do
     setup do
       @blah = "blah"
     end
     
-    should "have @blah == 'blah'" do
+    should "run the setup block" do
       assert_equal "blah", @blah
     end
     
@@ -24,10 +39,25 @@ class ContextTest < Test::Unit::TestCase # :nodoc:
         assert_match(/^test: context with setup block and a subcontext should be named correctly/, self.to_s)
       end
       
-      should "run the setup methods in order" do
+      should "run the setup blocks in order" do
         assert_equal @blah, "blah twice"
       end
     end
+
+    context_macro do
+      should "have name set right" do
+        assert_match(/^test: context with setup block with a subcontext made by a macro should have name set right/, self.to_s)
+      end
+
+      should "run the setup block of that context macro" do
+        assert_equal :foo, @context_macro
+      end
+
+      should "run the setup block of the main context" do
+        assert_equal "blah", @blah
+      end
+    end
+
   end
 
   context "another context with setup block" do

test/other/should_test.rb

@@ -1,6 +1,225 @@
 require File.join(File.dirname(__FILE__), '..', 'test_helper')
 
 class ShouldTest < Test::Unit::TestCase # :nodoc:
+  should "be able to define a should statement outside of a context" do
+    assert true
+  end
+  
+  should "see the name of my class as ShouldTest" do
+    assert_equal "ShouldTest", self.class.name
+  end
+  
+  def self.should_see_class_methods
+    should "be able to see class methods" do
+      assert true
+    end
+  end
+
+  def self.should_see_a_context_block_like_a_Test_Unit_class
+    should "see a context block as a Test::Unit class" do
+      assert_equal "ShouldTest", self.class.name
+    end
+  end
+
+  def self.should_see_blah
+    should "see @blah through a macro" do
+      assert @blah 
+    end
+  end
+
+  def self.should_not_see_blah
+    should "not see @blah through a macro" do
+      assert_nil @blah 
+    end
+  end
+
+  def self.should_be_able_to_make_context_macros(prefix = nil)
+    context "a macro" do
+      should "have the tests named correctly" do
+        assert_match(/^test: #{prefix}a macro should have the tests named correctly/, self.to_s)
+      end
+    end
+  end
+
+  context "Context" do
+
+    should_see_class_methods
+    should_see_a_context_block_like_a_Test_Unit_class
+    should_be_able_to_make_context_macros("Context ")
+
+    should "not define @blah" do
+      assert ! self.instance_variables.include?("@blah")
+    end
+
+    should_not_see_blah
+
+    should "be able to define a should statement" do
+      assert true
+    end
+
+    should "see the name of my class as ShouldTest" do
+      assert_equal "ShouldTest", self.class.name
+    end
+
+    context "with a subcontext" do
+      should_be_able_to_make_context_macros("Context with a subcontext ")
+    end
+  end
+
+  context "Context with setup block" do
+    setup do
+      @blah = "blah"
+    end
+    
+    should "have @blah == 'blah'" do
+      assert_equal "blah", @blah
+    end
+    should_see_blah
+    
+    should "have name set right" do
+      assert_match(/^test: Context with setup block/, self.to_s)
+    end
+
+    context "and a subcontext" do
+      setup do
+        @blah = "#{@blah} twice"
+      end
+      
+      should "be named correctly" do
+        assert_match(/^test: Context with setup block and a subcontext should be named correctly/, self.to_s)
+      end
+      
+      should "run the setup methods in order" do
+        assert_equal @blah, "blah twice"
+      end
+      should_see_blah
+    end
+  end
+
+  context "Another context with setup block" do
+    setup do
+      @blah = "foo"
+    end
+    
+    should "have @blah == 'foo'" do
+      assert_equal "foo", @blah
+    end
+
+    should "have name set right" do
+      assert_match(/^test: Another context with setup block/, self.to_s)
+    end
+    should_see_blah
+  end
+  
+  should_eventually "pass, since it's a should_eventually" do
+    flunk "what?"
+  end
+
+  # Context creation and naming
+
+  def test_should_create_a_new_context
+    assert_nothing_raised do
+      Thoughtbot::Shoulda::Context.new("context name", self) do; end
+    end
+  end
+
+  def test_should_create_a_nested_context
+    assert_nothing_raised do
+      parent = Thoughtbot::Shoulda::Context.new("Parent", self) do; end
+      child  = Thoughtbot::Shoulda::Context.new("Child", parent) do; end
+    end
+  end
+
+  def test_should_name_a_contexts_correctly
+    parent     = Thoughtbot::Shoulda::Context.new("Parent", self) do; end
+    child      = Thoughtbot::Shoulda::Context.new("Child", parent) do; end
+    grandchild = Thoughtbot::Shoulda::Context.new("GrandChild", child) do; end
+
+    assert_equal "Parent", parent.full_name
+    assert_equal "Parent Child", child.full_name
+    assert_equal "Parent Child GrandChild", grandchild.full_name
+  end
+
+  # Should statements
+
+  def test_should_have_should_hashes_when_given_should_statements
+    context = Thoughtbot::Shoulda::Context.new("name", self) do
+      should "be good" do; end
+      should "another" do; end
+    end
+    
+    names = context.shoulds.map {|s| s[:name]}
+    assert_equal ["another", "be good"], names.sort
+  end
+
+  # setup and teardown
+
+  def test_should_capture_setup_and_teardown_blocks
+    context = Thoughtbot::Shoulda::Context.new("name", self) do
+      setup    do; "setup";    end
+      teardown do; "teardown"; end
+    end
+    
+    assert_equal "setup",    context.setup_blocks.first.call
+    assert_equal "teardown", context.teardown_blocks.first.call
+  end
+
+  # building
+
+  def test_should_create_shoulda_test_for_each_should_on_build
+    context = Thoughtbot::Shoulda::Context.new("name", self) do
+      should "one" do; end
+      should "two" do; end
+    end
+    context.expects(:create_test_from_should_hash).with(has_entry(:name => "one"))
+    context.expects(:create_test_from_should_hash).with(has_entry(:name => "two"))
+    context.build
+  end
+
+  def test_should_create_test_methods_on_build
+    tu_class = Test::Unit::TestCase
+    context = Thoughtbot::Shoulda::Context.new("A Context", tu_class) do
+      should "define the test" do; end
+    end
+
+    tu_class.expects(:define_method).with(:"test: A Context should define the test. ")
+    context.build
+  end
+
+  def test_should_create_test_methods_on_build_when_subcontext
+    tu_class = Test::Unit::TestCase
+    context = Thoughtbot::Shoulda::Context.new("A Context", tu_class) do
+      context "with a child" do
+        should "define the test" do; end
+      end
+    end
+
+    tu_class.expects(:define_method).with(:"test: A Context with a child should define the test. ")
+    context.build
+  end
+
+  # Test::Unit integration
+
+  def test_should_create_a_new_context_and_build_it_on_Test_Unit_context
+    c = mock("context")
+    c.expects(:build)
+    Thoughtbot::Shoulda::Context.expects(:new).with("foo", kind_of(Class)).returns(c)
+    self.class.context "foo" do; end
+  end
+
+  def test_should_create_a_one_off_context_and_build_it_on_Test_Unit_should
+    s = mock("test")
+    Thoughtbot::Shoulda::Context.any_instance.expects(:should).with("rock", {}).returns(s)
+    Thoughtbot::Shoulda::Context.any_instance.expects(:build)
+    self.class.should "rock" do; end
+  end
+
+  def test_should_create_a_one_off_context_and_build_it_on_Test_Unit_should_eventually
+    s = mock("test")
+    Thoughtbot::Shoulda::Context.any_instance.expects(:should_eventually).with("rock").returns(s)
+    Thoughtbot::Shoulda::Context.any_instance.expects(:build)
+    self.class.should_eventually "rock" do; end
+  end
 
   should "run a :before proc", :before => lambda { @value = "before" } do
     assert_equal "before", @value