aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/test_help.rb
diff options
context:
space:
mode:
Diffstat (limited to 'railties/lib/test_help.rb')
-rw-r--r--railties/lib/test_help.rb19
1 files changed, 4 insertions, 15 deletions
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