From ff4ccb8334e4f5b5bdccbd5dc6876b4e43d9565e Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Fri, 14 Nov 2008 12:01:26 +0100
Subject: Revert "Move fixtures settings from AR::TestCase to railties
 test_help" -- it broke all the tests!

This reverts commit 9a88ab64bb45ddb2bdcf80fab9203111d8f8abb4.
---
 activerecord/lib/active_record/test_case.rb | 10 +++++++++-
 railties/lib/test_help.rb                   | 19 ++++---------------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/activerecord/lib/active_record/test_case.rb b/activerecord/lib/active_record/test_case.rb
index d5f43f56e6..eabf06fc3b 100644
--- a/activerecord/lib/active_record/test_case.rb
+++ b/activerecord/lib/active_record/test_case.rb
@@ -1,7 +1,15 @@
 require "active_support/test_case"
 
-module ActiveRecord
+module ActiveRecord 
   class TestCase < ActiveSupport::TestCase #:nodoc:
+    self.fixture_path               = FIXTURES_ROOT
+    self.use_instantiated_fixtures  = false
+    self.use_transactional_fixtures = true
+
+    def create_fixtures(*table_names, &block)
+      Fixtures.create_fixtures(FIXTURES_ROOT, table_names, {}, &block)
+    end
+
     def assert_date_from_db(expected, actual, message = nil)
       # SQL Server doesn't have a separate column type just for dates,
       # so the time is in the string and incorrectly formatted
diff --git a/railties/lib/test_help.rb b/railties/lib/test_help.rb
index 367533cf0f..3cc61d7932 100644
--- a/railties/lib/test_help.rb
+++ b/railties/lib/test_help.rb
@@ -11,22 +11,11 @@ require 'action_controller/test_case'
 require 'action_controller/integration'
 require 'action_mailer/test_case' if defined?(ActionMailer)
 
-if defined?(ActiveRecord)
-  require 'active_record/test_case'
-  require 'active_record/fixtures'
+Test::Unit::TestCase.fixture_path = RAILS_ROOT + "/test/fixtures/"
+ActionController::IntegrationTest.fixture_path = Test::Unit::TestCase.fixture_path
 
-  class ActiveSupport::TestCase
-    include ActiveRecord::TestFixtures
-    self.fixture_path = "#{RAILS_ROOT}/test/fixtures/"
-    self.use_instantiated_fixtures  = false
-    self.use_transactional_fixtures = true
-  end
-
-  ActionController::IntegrationTest.fixture_path = ActiveSupport::TestCase.fixture_path
-
-  def create_fixtures(*table_names, &block)
-    Fixtures.create_fixtures(ActiveSupport::TestCase.fixture_path, table_names, {}, &block)
-  end
+def create_fixtures(*table_names)
+  Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names)
 end
 
 begin
-- 
cgit v1.2.3