Changeset 8442

Timestamp:

12/19/07 21:16:27 (8 months ago)

Author:

bitsweat

Message:

Revert [8392]. Closes #10568, reopens #10379.

Files:

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

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