r4720@asus: jeremy | 2006-06-28 18:12:57 -0700

Don't be such a hardass. References #5497.


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4508 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jeremy Kemper 2006-06-29 01:13:55 +00:00
parent 141962348c
commit 5b866f75a7
1 changed files with 4 additions and 2 deletions

View File

@ -505,7 +505,8 @@ module Test #:nodoc:
end
def setup_with_fixtures
return if !defined?(ActiveRecord::Base) || ActiveRecord::Base.configurations.blank?
return unless defined?(ActiveRecord::Base)
if pre_loaded_fixtures && !use_transactional_fixtures
raise RuntimeError, 'pre_loaded_fixtures requires use_transactional_fixtures'
end
@ -536,7 +537,8 @@ module Test #:nodoc:
alias_method :setup, :setup_with_fixtures
def teardown_with_fixtures
return if !defined?(ActiveRecord::Base) || ActiveRecord::Base.configurations.blank?
return unless defined?(ActiveRecord::Base)
# Rollback changes.
if use_transactional_fixtures?
ActiveRecord::Base.connection.rollback_db_transaction