jeremymcanally-context 0.5 → 0.5.2

data/context.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = "context"
-  s.version  = "0.5"
+  s.version  = "0.5.2"
   s.date     = "2008-10-03"
   s.summary  = "Contexts and DSL sugar for your tests"
   s.email    = "jeremy@entp.com"

data/lib/context/lifecycle.rb

@@ -12,6 +12,8 @@ class Test::Unit::TestCase
       send("before_#{period}_callbacks") << block
     end
     
+    alias :setup :before
+    
     # Add logic to run after the tests (i.e., a +teardown+ method)
     #
     #     after do
@@ -21,6 +23,8 @@ class Test::Unit::TestCase
     def after(period = :each, &block)
       send("after_#{period}_callbacks") << block
     end
+    
+    alias :teardown :after
 
     def gather_callbacks(callback_type, period) # :nodoc:
       callbacks = superclass.respond_to?(:gather_callbacks) ? superclass.gather_callbacks(callback_type, period) : []
@@ -41,13 +45,15 @@ class Test::Unit::TestCase
     child.after_all_callbacks   = []
 
     child.class_eval do
-      def setup
+      def setup(&block)
         super
+        
         run_each_callbacks :before
       end
 
       def teardown
         super
+
         run_each_callbacks :after
       end
     end

data/lib/context/version.rb

@@ -2,7 +2,7 @@ module Context
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 5
-    TINY  = 0
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/test_lifecycle.rb

@@ -25,7 +25,7 @@ class TestLifecycle < Test::Unit::TestCase
   sample_test = context "lifecycle" do
     attr_reader :inherited_before_each_var, :inherited_before_each_var_2, :inherited_after_each_var, 
       :after_each_var, :inherited_before_all_var, :inherited_after_all_var, :before_all_var, :after_all_var, 
-      :superclass_before_each_var, :superclass_after_each_var, :superclass_before_all_var, :superclass_after_all_var
+      :superclass_before_each_var, :superclass_after_each_var, :superclass_before_all_var, :superclass_after_all_var, :one, :two
 
     before do
       @inherited_before_each_var = 3
@@ -127,4 +127,38 @@ class TestLifecycle < Test::Unit::TestCase
       assert_equal 1, @test.after_all_var
     end
   end
+  
+  # Test that we aren't stomping on defined seutp method
+  context "With setup/teardown methods" do
+    before do
+      @result = Test::Unit::TestResult.new
+      @test = sample_test.new("test_lifecycle_foo")
+      
+      @test.class.setup do
+        @one = 1
+      end
+      
+      @test.class.teardown do
+        @two = 10
+      end
+      
+      @test.run(@result) { |inherited_after_each_var, v| }
+    end
+    
+    it "runs setup method block a la Shoulda" do
+      assert_equal 1, @test.one
+    end
+    
+    it "runs setup method block and regular callbacks" do
+      assert_equal 3, @test.inherited_before_each_var
+    end
+    
+    it "runs teardown method block a la Shoulda" do
+      assert_equal 10, @test.two
+    end
+    
+    it "runs teardown method block and regular callbacks" do
+      assert_equal 1, @test.after_each_var
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jeremymcanally-context
 version: !ruby/object:Gem::Version 
-  version: "0.5"
+  version: 0.5.2
 platform: ruby
 authors: 
 - Jeremy McAnally