Ticket #10379: make_fixture_setup_support_testcase_classes_loaded_multiple_times.patch

test/fixtures_test.rb

@@ -324 +324 @@
-  end
-end
-
+# This is to reproduce a bug where if a TestCase is loaded
+# twice by Ruby, it loses its fixture setup hook.
+class_def = <<-CODE
+  class DoubleLoadedTestCase < Test::Unit::TestCase
+    fixtures :topics
+
+    def setup
+    end
+  
+    def test_should_properly_setup_fixtures
+      assert_nothing_raised { topics(:first) }
+    end
+  end
+CODE
+2.times { eval(class_def) }
+
-class OverlappingFixturesTest < Test::Unit::TestCase
-  fixtures :topics, :developers
-  fixtures :developers, :accounts

lib/active_record/fixtures.rb

@@ -911 +911 @@
-      end
-
-      def setup_with_fixtures
+        return if @fixtures_setup
+        @fixtures_setup = true
-        return unless defined?(ActiveRecord::Base) && !ActiveRecord::Base.configurations.blank?
-
-        if pre_loaded_fixtures && !use_transactional_fixtures
@@ -942 +944 @@
-      alias_method :setup, :setup_with_fixtures
-
-      def teardown_with_fixtures
+        return if @fixtures_teardown
+        @fixtures_teardown = true
-        return unless defined?(ActiveRecord::Base) && !ActiveRecord::Base.configurations.blank?
-
-        unless use_transactional_fixtures?
@@ -958 +962 @@
-      alias_method :teardown, :teardown_with_fixtures
-
-      def self.method_added(method)
+        return if @__disable_method_added__
+        @__disable_method_added__ = true
+        
-        case method.to_s
-        when 'setup'
-          unless method_defined?(:setup_without_fixtures)
-            alias_method :setup_without_fixtures, :setup
-
+full_
-              setup_with_fixtures
-              setup_without_fixtures
-            end
-          end
+          alias_method :setup, :full_setup
-        when 'teardown'
-          unless method_defined?(:teardown_without_fixtures)
-            alias_method :teardown_without_fixtures, :teardown
-
+full_
-              teardown_without_fixtures
-              teardown_with_fixtures
-            end
-          end
+          alias_method :teardown, :full_teardown
-        end
+        
+        @__disable_method_added__ = false
-      end
-
-      private