1 files changed, 12 insertions, 10 deletions
diff --git a/activerecord/test/cases/identity_map_test.rb b/activerecord/test/cases/identity_map_test.rb
index 89f7b92d09..649715fbb5 100644
--- a/activerecord/test/cases/identity_map_test.rb
+++ b/activerecord/test/cases/identity_map_test.rb
@@ -1,4 +1,5 @@
 require "cases/helper"
+
 require 'models/developer'
 require 'models/project'
 require 'models/company'
@@ -90,6 +91,13 @@ class IdentityMapTest < ActiveRecord::TestCase
     )
   end
 
+  def test_queries_are_not_executed_when_finding_by_id
+    Post.find 1
+    assert_no_queries do
+      Post.find 1
+    end
+  end
+
   ##############################################################################
   # Tests checking if IM is functioning properly on more advanced finds        #
   # and associations                                                           #
@@ -130,8 +138,6 @@ class IdentityMapTest < ActiveRecord::TestCase
     assert_equal(["name"], swistak.changed)
     assert_equal({"name" => ["Marcin Raczkowski", "Swistak Sreberkowiec"]}, swistak.changes)
 
-    s = Subscriber.find('swistak')
-
     assert swistak.name_changed?
     assert_equal("Swistak Sreberkowiec", swistak.name)
   end
@@ -142,9 +148,7 @@ class IdentityMapTest < ActiveRecord::TestCase
 
     Subscriber.update_all({:name => "Raczkowski Marcin"}, {:name => "Marcin Raczkowski"})
 
-    s = Subscriber.find('swistak')
-
-    assert_equal({'name' => ["Raczkowski Marcin", "Swistak Sreberkowiec"]}, swistak.changes)
+    assert_equal({"name"=>["Marcin Raczkowski", "Swistak Sreberkowiec"]}, swistak.changes)
     assert_equal("Swistak Sreberkowiec", swistak.name)
   end
 
@@ -156,11 +160,9 @@ class IdentityMapTest < ActiveRecord::TestCase
 
     Subscriber.update_all({:name => "Swistak Sreberkowiec"}, {:name => "Marcin Raczkowski"})
 
-    s = Subscriber.find('swistak')
-
     assert_equal("Swistak Sreberkowiec", swistak.name)
-    assert_equal({}, swistak.changes)
-    assert !swistak.name_changed?
+    assert_equal({"name"=>["Marcin Raczkowski", "Swistak Sreberkowiec"]}, swistak.changes)
+    assert swistak.name_changed?
   end
 
   def test_has_many_associations
@@ -168,7 +170,7 @@ class IdentityMapTest < ActiveRecord::TestCase
     pirate.birds.create!(:name => 'Posideons Killer')
     pirate.birds.create!(:name => 'Killer bandita Dionne')
 
-    posideons, killer = pirate.birds
+    posideons, _ = pirate.birds
 
     pirate.reload