mirror of
https://github.com/github/rails.git
synced 2026-04-26 03:00:59 -04:00
Don't assume Active Record is available. Closes #5497.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4505 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
@@ -505,6 +505,7 @@ module Test #:nodoc:
|
||||
end
|
||||
|
||||
def setup_with_fixtures
|
||||
return if !defined?(ActiveRecord::Base) || ActiveRecord::Base.configurations.blank?
|
||||
if pre_loaded_fixtures && !use_transactional_fixtures
|
||||
raise RuntimeError, 'pre_loaded_fixtures requires use_transactional_fixtures'
|
||||
end
|
||||
@@ -535,6 +536,7 @@ module Test #:nodoc:
|
||||
alias_method :setup, :setup_with_fixtures
|
||||
|
||||
def teardown_with_fixtures
|
||||
return if !defined?(ActiveRecord::Base) || ActiveRecord::Base.configurations.blank?
|
||||
# Rollback changes.
|
||||
if use_transactional_fixtures?
|
||||
ActiveRecord::Base.connection.rollback_db_transaction
|
||||
|
||||
Reference in New Issue
Block a user