Changeset 8392

Timestamp:

12/15/07 01:23:05 (7 months ago)

Author:

rick

Message:

Make the Fixtures Test::Unit enhancements more supporting for double-loaded test cases. Closes #10379 [brynary]

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/fixtures.rb (modified) (3 diffs)
• trunk/activerecord/test/fixtures_test.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Make the Fixtures Test::Unit enhancements more supporting for double-loaded test cases.  Closes #10379 [brynary]
-
-* Fix that validates_acceptance_of still works for non-existent tables (useful for bootstrapping new databases).  Closes #10474 [hasmanyjosh]

trunk/activerecord/lib/active_record/fixtures.rb

@@ -917 +917 @@
-
-      def setup_with_fixtures
+        return if @fixtures_setup
+        @fixtures_setup = true
-        return unless defined?(ActiveRecord::Base) && !ActiveRecord::Base.configurations.blank?
-
@@ -948 +950 @@
-
-      def teardown_with_fixtures
+        return if @fixtures_teardown
+        @fixtures_teardown = true
-        return unless defined?(ActiveRecord::Base) && !ActiveRecord::Base.configurations.blank?
-
@@ -964 +968 @@
-
-      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
-
+
+
+
+
-      end
-

trunk/activerecord/test/fixtures_test.rb

@@ -325 +325 @@
-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