aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-05-27 18:07:50 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-05-27 18:07:50 -0700
commitb7baf1211f83f7dd008f156f1f5cfc62b52bf458 (patch)
tree5856ef13c7a2af4fe6d75bf15f394ff6db2ea491 /activerecord
parentc122c7b271ef27ceb432c932855b76c2247503df (diff)
parent9fb51e76fd4f533748a4711c093f2dc7812a62a8 (diff)
downloadrails-b7baf1211f83f7dd008f156f1f5cfc62b52bf458.tar.gz
rails-b7baf1211f83f7dd008f156f1f5cfc62b52bf458.tar.bz2
rails-b7baf1211f83f7dd008f156f1f5cfc62b52bf458.zip
Merge pull request #1368 from amatsuda/disable_im_by_default_on_test
Disable IdentityMap by default for ActiveRecord testing
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
index fbb4ee6f7b..9644ac1b02 100644
--- a/activerecord/test/cases/helper.rb
+++ b/activerecord/test/cases/helper.rb
@@ -26,8 +26,8 @@ ActiveSupport::Deprecation.debug = true
# Quote "type" if it's a reserved word for the current connection.
QUOTED_TYPE = ActiveRecord::Base.connection.quote_column_name('type')
-# Enable Identity Map for testing
-ActiveRecord::IdentityMap.enabled = (ENV['IM'] == "false" ? false : true)
+# Enable Identity Map only when ENV['IM'] is set to "true"
+ActiveRecord::IdentityMap.enabled = (ENV['IM'] == "true")
def current_adapter?(*types)
types.any? do |type|