diff options
| -rw-r--r-- | activerecord/lib/active_record/test_case.rb | 12 | ||||
| -rw-r--r-- | railties/lib/test_help.rb | 22 |
2 files changed, 15 insertions, 19 deletions
diff --git a/activerecord/lib/active_record/test_case.rb b/activerecord/lib/active_record/test_case.rb index 588cf65156..02a12e4685 100644 --- a/activerecord/lib/active_record/test_case.rb +++ b/activerecord/lib/active_record/test_case.rb @@ -1,18 +1,8 @@ require "active_support/test_case" require "active_record/fixtures" -module ActiveRecord +module ActiveRecord class TestCase < ActiveSupport::TestCase #:nodoc: - include TestFixtures - - 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 442ce3fadc..a7be514cf0 100644 --- a/railties/lib/test_help.rb +++ b/railties/lib/test_help.rb @@ -7,16 +7,22 @@ silence_warnings { RAILS_ENV = "test" } require 'action_controller/integration' require 'action_mailer/test_case' if defined?(ActionMailer) -require 'active_record/fixtures' -class ActiveSupport::TestCase - include ActiveRecord::TestFixtures -end +if defined?(ActiveRecord) + require 'active_record/test_case' + require 'active_record/fixtures' + + class ActiveSupport::TestCase + include ActiveRecord::TestFixtures + self.fixture_path = "#{RAILS_ROOT}/test/fixtures/" + self.use_instantiated_fixtures = false + self.use_transactional_fixtures = true + end -ActiveSupport::TestCase.fixture_path = "#{RAILS_ROOT}/test/fixtures/" -ActionController::IntegrationTest.fixture_path = ActiveSupport::TestCase.fixture_path + ActionController::IntegrationTest.fixture_path = ActiveSupport::TestCase.fixture_path -def create_fixtures(*table_names) - Fixtures.create_fixtures(ActiveSupport::TestCase.fixture_path, table_names) + def create_fixtures(*table_names, &block) + Fixtures.create_fixtures(ActiveSupport::TestCase.fixture_path, table_names, {}, &block) + end end begin |