Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Revert "Move fixtures settings from AR::TestCase to railties test_hel…

…p" -- it broke all the tests!

This reverts commit 9a88ab6.
  • Loading branch information...
commit ff4ccb8334e4f5b5bdccbd5dc6876b4e43d9565e 1 parent db7daa0
@dhh dhh authored
View
10 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
View
19 railties/lib/test_help.rb
@@ -11,22 +11,11 @@
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
Please sign in to comment.
Something went wrong with that request. Please try again.