Permalink
Browse files

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
  • Loading branch information...
1 parent 1419623 commit 5b866f75a7ba5970a51a91cf643d03cc89f5c4c3 @jeremy jeremy committed Jun 29, 2006
Showing with 4 additions and 2 deletions.
  1. +4 −2 activerecord/lib/active_record/fixtures.rb
@@ -505,7 +505,8 @@ def use_transactional_fixtures?
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 @@ def setup_with_fixtures
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

0 comments on commit 5b866f7

Please sign in to comment.