diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2008-11-14 12:01:26 +0100 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-11-14 12:01:26 +0100 |
commit | ff4ccb8334e4f5b5bdccbd5dc6876b4e43d9565e (patch) | |
tree | 852167cd0da69059f4e5f0d7003def38cb64ba6d /railties/lib | |
parent | db7daa04b858f224b8b34a5dc94fe5804c1c6400 (diff) | |
download | rails-ff4ccb8334e4f5b5bdccbd5dc6876b4e43d9565e.tar.gz rails-ff4ccb8334e4f5b5bdccbd5dc6876b4e43d9565e.tar.bz2 rails-ff4ccb8334e4f5b5bdccbd5dc6876b4e43d9565e.zip |
Revert "Move fixtures settings from AR::TestCase to railties test_help" -- it broke all the tests!
This reverts commit 9a88ab64bb45ddb2bdcf80fab9203111d8f8abb4.
Diffstat (limited to 'railties/lib')
-rw-r--r-- | railties/lib/test_help.rb | 19 |
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 |