aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--railties/lib/test_help.rb15
1 files changed, 8 insertions, 7 deletions
diff --git a/railties/lib/test_help.rb b/railties/lib/test_help.rb
index 3cc61d7932..442ce3fadc 100644
--- a/railties/lib/test_help.rb
+++ b/railties/lib/test_help.rb
@@ -4,18 +4,19 @@ require_dependency 'application'
# so fixtures are loaded to the right database
silence_warnings { RAILS_ENV = "test" }
-require 'test/unit'
-require 'active_support/test_case'
-require 'active_record/fixtures'
-require 'action_controller/test_case'
require 'action_controller/integration'
require 'action_mailer/test_case' if defined?(ActionMailer)
-Test::Unit::TestCase.fixture_path = RAILS_ROOT + "/test/fixtures/"
-ActionController::IntegrationTest.fixture_path = Test::Unit::TestCase.fixture_path
+require 'active_record/fixtures'
+class ActiveSupport::TestCase
+ include ActiveRecord::TestFixtures
+end
+
+ActiveSupport::TestCase.fixture_path = "#{RAILS_ROOT}/test/fixtures/"
+ActionController::IntegrationTest.fixture_path = ActiveSupport::TestCase.fixture_path
def create_fixtures(*table_names)
- Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names)
+ Fixtures.create_fixtures(ActiveSupport::TestCase.fixture_path, table_names)
end
begin