citrusbyte-contest 0.0.8 → 0.0.9

data/lib/contest.rb

@@ -25,15 +25,11 @@ class Test::Unit::TestCase
   end
 
   def setup
-    self.class.setup_blocks.each do |block|
-      instance_eval(&block)
-    end
+    eval_blocks(:setup_blocks, self.class.ancestors.reverse)
   end
 
   def teardown
-    self.class.teardown_blocks.each do |block|
-      instance_eval(&block)
-    end
+    eval_blocks(:teardown_blocks, self.class.ancestors)
   end
 
   def self.context(name, &block)
@@ -55,6 +51,15 @@ 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

data/test/all_test.rb

@@ -4,7 +4,7 @@ class FooTest < Test::Unit::TestCase
   setup do
     @value = 1
   end
-  
+
   teardown do
     @value = nil
   end

data/test/setup_and_teardown_order.rb

@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + "/../lib/contest"
+
+class Test::Unit::TestCase
+  setup { puts "Grandparent Setup" }
+end
+
+class Test::Unit::TestCase
+  teardown { puts "Grandparent Teardown" }
+end
+
+class MidLayerTest < Test::Unit::TestCase
+  setup { puts "Parent Setup" }
+  teardown { puts "Parent Teardown" }
+end
+
+class LeafTest < MidLayerTest
+  setup { puts "Child Setup" }
+  teardown { puts "Child Teardown" }
+
+  test "my actual test" do
+    puts "Test Case"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: citrusbyte-contest
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - Damian Janowski
@@ -29,6 +29,7 @@ files:
 - Rakefile
 - rails/init.rb
 - test/all_test.rb
+- test/setup_and_teardown_order.rb
 has_rdoc: false
 homepage: http://github.com/citrusbyte/contest
 post_install_message: