1 files changed, 23 insertions, 3 deletions
diff --git a/activerecord/test/cases/counter_cache_test.rb b/activerecord/test/cases/counter_cache_test.rb
index ee3d8a81c2..07a182070b 100644
--- a/activerecord/test/cases/counter_cache_test.rb
+++ b/activerecord/test/cases/counter_cache_test.rb
@@ -19,6 +19,7 @@ class CounterCacheTest < ActiveRecord::TestCase
 
   class ::SpecialTopic < ::Topic
     has_many :special_replies, :foreign_key => 'parent_id'
+    has_many :lightweight_special_replies, -> { select('topics.id, topics.title') }, :foreign_key => 'parent_id', :class_name => 'SpecialReply'
   end
 
   class ::SpecialReply < ::Reply
@@ -51,6 +52,16 @@ class CounterCacheTest < ActiveRecord::TestCase
     end
   end
 
+  test "reset counters by counter name" do
+    # throw the count off by 1
+    Topic.increment_counter(:replies_count, @topic.id)
+
+    # check that it gets reset
+    assert_difference '@topic.reload.replies_count', -1 do
+      Topic.reset_counters(@topic.id, :replies_count)
+    end
+  end
+
   test 'reset multiple counters' do
     Topic.update_counters @topic.id, replies_count: 1, unique_replies_count: 1
     assert_difference ['@topic.reload.replies_count', '@topic.reload.unique_replies_count'], -1 do
@@ -154,10 +165,19 @@ class CounterCacheTest < ActiveRecord::TestCase
     end
   end
 
-  test "the passed symbol needs to be an association name" do
+  test "the passed symbol needs to be an association name or counter name" do
     e = assert_raises(ArgumentError) do
-      Topic.reset_counters(@topic.id, :replies_count)
+      Topic.reset_counters(@topic.id, :undefined_count)
+    end
+    assert_equal "'Topic' has no association called 'undefined_count'", e.message
+  end
+
+  test "reset counter works with select declared on association" do
+    special = SpecialTopic.create!(:title => 'Special')
+    SpecialTopic.increment_counter(:replies_count, special.id)
+
+    assert_difference 'special.reload.replies_count', -1 do
+      SpecialTopic.reset_counters(special.id, :lightweight_special_replies)
     end
-    assert_equal "'Topic' has no association called 'replies_count'", e.message
   end
 end