Ticket #10536: call_setup_method_in_subclassed_test_case.patch

activerecord/test/fixtures_test.rb

@@ -331 +331 @@
-    fixtures :topics
-
-    def setup
+      @setup_done = true
-    end
-  
-    def test_should_properly_setup_fixtures
+      assert @setup_done
-      assert_nothing_raised { topics(:first) }
-    end
-  end
-CODE
-2.times { eval(class_def) }
-
+class BaseOfSubclassedTestCase < ActiveSupport::TestCase
+  def setup
+    @base_setup_done = true
+  end
+
+  def teardown
+    assert @subclass_teardown_done
+    @base_teardown_done = true
+  end
+end
+class SubclassedTestCase < BaseOfSubclassedTestCase
+  fixtures :topics
+
+  def setup
+    super
+    @subclass_setup_done = true
+  end
+  
+  def teardown
+    @subclass_teardown_done = true
+    super
+    assert @base_teardown_done
+  end
+  
+  def test_should_properly_call_all_setup_and_teardown_methods
+    assert @base_setup_done
+    assert @subclass_setup_done
+    assert_nothing_raised { topics(:first) }
+  end
+end
+
-class OverlappingFixturesTest < Test::Unit::TestCase
-  fixtures :topics, :developers
-  fixtures :developers, :accounts

activerecord/lib/active_record/fixtures.rb

@@ -972 +972 @@
-        
-        case method.to_s
-        when 'setup'
-
-
-
-
-
-
-
-
+
+
+
-        when 'teardown'
-
-
-
-
-
-
-
-
+
+
+
-        end
-        
-        @__disable_method_added__ = false