citrusbyte-contest 0.0.9 → 0.1.0

data/lib/contest.rb

@@ -17,25 +17,22 @@ end
 # of this library.
 class Test::Unit::TestCase
   def self.setup(&block)
-    setup_blocks << block
+    define_method :setup do
+      super
+      instance_eval(&block)
+    end
   end
 
   def self.teardown(&block)
-    teardown_blocks << block
-  end
-
-  def setup
-    eval_blocks(:setup_blocks, self.class.ancestors.reverse)
-  end
-
-  def teardown
-    eval_blocks(:teardown_blocks, self.class.ancestors)
+    define_method :teardown do
+      instance_eval(&block)
+      super
+    end
   end
 
   def self.context(name, &block)
-    subclass = Class.new(self.superclass)
-    subclass.setup_blocks.unshift(*setup_blocks)
-    subclass.teardown_blocks.unshift(*teardown_blocks)
+    subclass = Class.new(self)
+    remove_tests(subclass)
     subclass.class_eval(&block)
     const_set(context_name(name), subclass)
   end
@@ -51,23 +48,6 @@ class Test::Unit::TestCase
 
 private
 
-  def eval_blocks(type, ancestors)
-    ancestors.each do |ancestor|
-      next unless ancestor.respond_to?(type)
-      ancestor.send(type).each do |block|
-        instance_eval(&block)
-      end
-    end
-  end
-
-  def self.setup_blocks
-    @setup_blocks ||= []
-  end
-
-  def self.teardown_blocks
-    @teardown_blocks ||= []
-  end
-
   def self.context_name(name)
     "Test#{sanitize_name(name).gsub(/(^| )(\w)/) { $2.upcase }}".to_sym
   end
@@ -79,4 +59,10 @@ private
   def self.sanitize_name(name)
     name.gsub(/\W+/, ' ').strip
   end
+
+  def self.remove_tests(subclass)
+    subclass.public_instance_methods.grep(/^test_/).each do |meth|
+      subclass.send(:undef_method, meth.to_sym)
+    end
+  end
 end

data/test/all_test.rb

@@ -79,3 +79,36 @@ class BarTest < Test::Unit::TestCase
     end
   end
 end
+
+class TestBaz < Test::Unit::TestCase
+  def foo
+    42
+  end
+
+  def setup
+    @value = 1
+    super
+  end
+
+  context "some context" do
+    def setup
+      super
+      @value += 2
+    end
+      
+    test "a helper" do
+      assert_equal 42, foo
+      assert_equal 3, @value
+    end
+    
+    context "another context" do
+      setup do
+        @value += 3
+      end
+
+      test "blah" do
+        assert_equal 6, @value
+      end
+    end
+  end
+end

data/test/setup_and_teardown_order.rb

@@ -1,11 +1,15 @@
 require File.dirname(__FILE__) + "/../lib/contest"
 
 class Test::Unit::TestCase
-  setup { puts "Grandparent Setup" }
+  def setup
+    puts "Grandparent Setup"
+  end
 end
 
 class Test::Unit::TestCase
-  teardown { puts "Grandparent Teardown" }
+  def teardown
+    puts "Grandparent Teardown"
+  end
 end
 
 class MidLayerTest < Test::Unit::TestCase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: citrusbyte-contest
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors: 
 - Damian Janowski