bullet 4.3.1 → 4.5.0

data/spec/integration/association_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-if active_record3?
+if active_record3? || active_record4?
   describe Bullet::Detector::Association, 'has_many' do
     before(:each) do
       Bullet.clear
@@ -16,7 +16,7 @@ if active_record3?
         Post.all.each do |post|
           post.comments.map(&:name)
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Post, :comments)
@@ -26,7 +26,7 @@ if active_record3?
         Post.includes(:comments).each do |post|
           post.comments.map(&:name)
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -34,7 +34,7 @@ if active_record3?
 
       it "should detect unused preload post => comments" do
         Post.includes(:comments).map(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should be_unused_preload_associations_for(Post, :comments)
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -42,7 +42,7 @@ if active_record3?
 
       it "should not detect unused preload post => comments" do
         Post.all.map(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -56,7 +56,7 @@ if active_record3?
             post.comments.map(&:name)
           end
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Category, :posts)
@@ -66,10 +66,10 @@ if active_record3?
       it "should detect preload category => posts, but no post => comments" do
         Category.includes(:posts).each do |category|
           category.posts.each do |post|
-            post.comments.collect(&:name)
+            post.comments.map(&:name)
           end
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should_not be_detecting_unpreloaded_association_for(Category, :posts)
@@ -82,7 +82,7 @@ if active_record3?
             post.comments.map(&:name)
           end
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -90,7 +90,7 @@ if active_record3?
 
       it "should detect unused preload with category => posts => comments" do
         Category.includes({:posts => :comments}).map(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should be_unused_preload_associations_for(Post, :comments)
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -100,7 +100,7 @@ if active_record3?
         Category.includes({:posts => :comments}).each do |category|
           category.posts.map(&:name)
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should be_unused_preload_associations_for(Post, :comments)
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -113,7 +113,7 @@ if active_record3?
           category.posts.map(&:name)
           category.entries.map(&:name)
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Category, :posts)
@@ -125,7 +125,7 @@ if active_record3?
           category.posts.map(&:name)
           category.entries.map(&:name)
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should_not be_detecting_unpreloaded_association_for(Category, :posts)
@@ -137,7 +137,7 @@ if active_record3?
           category.posts.map(&:name)
           category.entries.map(&:name)
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -145,7 +145,7 @@ if active_record3?
 
       it "should detect unused preload with category => [posts, entries]" do
         Category.includes([:posts, :entries]).map(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should be_unused_preload_associations_for(Category, :posts)
         Bullet::Detector::Association.should be_unused_preload_associations_for(Category, :entries)
 
@@ -156,7 +156,7 @@ if active_record3?
         Category.includes([:posts, :entries]).each do |category|
           category.posts.map(&:name)
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_unused_preload_associations_for(Category, :posts)
         Bullet::Detector::Association.should be_unused_preload_associations_for(Category, :entries)
 
@@ -169,15 +169,15 @@ if active_record3?
         Post.includes(:comments).each do |post|
           post.comments.first.name
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_unused_preload_associations_for(Post, :comments)
 
         Bullet::Detector::Association.should be_completely_preloading_associations
       end
 
       it "should detect preload with post => commnets" do
-        Post.first.comments.collect(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Post.first.comments.map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -191,7 +191,7 @@ if active_record3?
           post.name
           post.writer.name
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_unused_preload_associations_for(Category, :posts)
         Bullet::Detector::Association.should_not be_unused_preload_associations_for(Post, :writer)
       end
@@ -199,10 +199,10 @@ if active_record3?
 
     context "scope for_category_name" do
       it "should detect preload with post => category" do
-        Post.in_category_name('first').all.each do |post|
+        Post.in_category_name('first').each do |post|
           post.category.name
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -210,7 +210,7 @@ if active_record3?
 
       it "should not be unused preload post => category" do
         Post.in_category_name('first').all.map(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -222,7 +222,7 @@ if active_record3?
         Post.preload_comments.each do |post|
           post.comments.map(&:name)
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -230,7 +230,7 @@ if active_record3?
 
       it "should detect unused preload with scope" do
         Post.preload_comments.map(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should be_unused_preload_associations_for(Post, :comments)
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -253,7 +253,7 @@ if active_record3?
         Comment.all.each do |comment|
           comment.post.name
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Comment, :post)
@@ -261,7 +261,7 @@ if active_record3?
 
       it "should detect preload with one comment => post" do
         Comment.first.post.name
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -271,15 +271,15 @@ if active_record3?
         Comment.includes(:post).each do |comment|
           comment.post.name
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
       end
 
       it "should not detect preload with comment => post" do
-        Comment.all.collect(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Comment.all.map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -287,7 +287,7 @@ if active_record3?
 
       it "should detect unused preload with comments => post" do
         Comment.includes(:post).map(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should be_unused_preload_associations_for(Comment, :post)
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -299,7 +299,7 @@ if active_record3?
         Comment.all.each do |comment|
           comment.post.category.name
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Comment, :post)
@@ -309,7 +309,7 @@ if active_record3?
         Comment.includes(:post).each do |comment|
           comment.post.category.name
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Post, :category)
@@ -319,7 +319,7 @@ if active_record3?
         Comment.includes(:post => :category).each do |comment|
           comment.post.category.name
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -333,7 +333,7 @@ if active_record3?
         Comment.includes([:author, :post]).where(["base_users.id = ?", BaseUser.first]).each do |comment|
           comment.post.writer.name
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Post, :writer)
@@ -345,7 +345,7 @@ if active_record3?
         Comment.includes([:author, {:post => :writer}]).where(["base_users.id = ?", BaseUser.first]).each do |comment|
           comment.post.writer.name
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should be_unused_preload_associations_for(Comment, :author)
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -357,7 +357,7 @@ if active_record3?
         Comment.all(:include => {:post => :writer}, :conditions => "posts.name like '%first%'").each do |comment|
           comment.post.writer.newspaper.name
         end
-        #Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        #Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         #Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Writer, :newspaper)
@@ -390,7 +390,7 @@ if active_record3?
         Student.all.each do |student|
           student.teachers.map(&:name)
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Student, :teachers)
@@ -400,7 +400,7 @@ if active_record3?
         Student.includes(:teachers).each do |student|
           student.teachers.map(&:name)
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -408,15 +408,15 @@ if active_record3?
 
       it "should detect unused preload associations" do
         Student.includes(:teachers).map(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should be_unused_preload_associations_for(Student, :teachers)
 
         Bullet::Detector::Association.should be_completely_preloading_associations
       end
 
       it "should detect no unused preload associations" do
-        Student.all.collect(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Student.all.map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -439,7 +439,7 @@ if active_record3?
         Firm.all.each do |firm|
           firm.clients.map(&:name)
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Firm, :clients)
@@ -449,23 +449,23 @@ if active_record3?
         Firm.includes(:clients).each do |firm|
           firm.clients.map(&:name)
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
       end
 
       it "should not detect preload associations" do
-        Firm.all.collect(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Firm.all.map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
       end
 
       it "should detect unused preload associations" do
-        Firm.includes(:clients).collect(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Firm.includes(:clients).map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should be_unused_preload_associations_for(Firm, :clients)
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -488,33 +488,33 @@ if active_record3?
         Company.all.each do |company|
           company.address.name
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Company, :address)
       end
 
       it "should detect preload association" do
-        Company.find(:all, :include => :address).each do |company|
+        Company.includes(:address).each do |company|
           company.address.name
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
       end
 
       it "should not detect preload association" do
-        Company.all.collect(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Company.all.map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
       end
 
       it "should detect unused preload association" do
-        Company.find(:all, :include => :address).collect(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Company.includes(:address).map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should be_unused_preload_associations_for(Company, :address)
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -535,7 +535,7 @@ if active_record3?
     it "should not detect preload association" do
       Post.all
       Post.first.comments.map(&:name)
-      Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+      Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
       Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
       Bullet::Detector::Association.should be_completely_preloading_associations
@@ -557,37 +557,129 @@ if active_record3?
         Page.all.each do |page|
           page.author.name
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Page, :author)
       end
 
       it "should detect preload associations" do
-        Page.find(:all, :include => :author).each do |page|
+        Page.includes(:author).each do |page|
           page.author.name
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
       end
 
       it "should detect unused preload associations" do
-        Page.find(:all, :include => :author).collect(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Page.includes(:author).map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should be_unused_preload_associations_for(Page, :author)
 
         Bullet::Detector::Association.should be_completely_preloading_associations
       end
 
       it "should not detect preload associations" do
-        Page.all.collect(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Page.all.map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
       end
     end
+
+    context "disable n plus one query" do
+      before { Bullet.n_plus_one_query_enable = false }
+      after { Bullet.n_plus_one_query_enable = true }
+
+      it "should not detect n plus one query" do
+        Post.all.each do |post|
+          post.comments.map(&:name)
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+
+        expect(Bullet::Detector::Association).not_to be_detecting_unpreloaded_association_for(Post, :comments)
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+      end
+
+      it "should still detect unused eager loading" do
+        Post.includes(:comments).map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Post, :comments)
+      end
+    end
+
+    context "disable unused eager loading" do
+      before { Bullet.unused_eager_loading_enable = false }
+      after { Bullet.unused_eager_loading_enable = true }
+
+      it "should not detect unused eager loading" do
+        Post.includes(:comments).map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+      end
+
+      it "should still detect n plus one query" do
+        Post.all.each do |post|
+          post.comments.map(&:name)
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :comments)
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+      end
+    end
+
+    context "whitelist n plus one query" do
+      before { Bullet.add_whitelist :type => :n_plus_one_query, :class_name => "Post", :association => :comments }
+      after { Bullet.reset_whitelist }
+
+      it "should not detect n plus one query" do
+        Post.all.each do |post|
+          post.comments.map(&:name)
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+
+        expect(Bullet::Detector::Association).not_to be_detecting_unpreloaded_association_for(Post, :comments)
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+      end
+
+      it "should still detect unused eager loading" do
+        Post.includes(:comments).map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Post, :comments)
+      end
+    end
+
+    context "whitelist unused eager loading" do
+      before { Bullet.add_whitelist :type => :unused_eager_loading, :class_name => "Post", :association => :comments }
+      after { Bullet.reset_whitelist }
+
+      it "should not detect unused eager loading" do
+        Post.includes(:comments).map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+      end
+
+      it "should still detect n plus one query" do
+        Post.all.each do |post|
+          post.comments.map(&:name)
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :comments)
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+      end
+    end
   end
 end

data/spec/integration/{counter_spec.rb → counter_cache_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-if active_record3?
-  describe Bullet::Detector::Counter do
+if active_record3? || active_record4?
+  describe Bullet::Detector::CounterCache do
     before(:each) do
       Bullet.start_request
     end
@@ -35,5 +35,29 @@ if active_record3?
       end
       Bullet.collected_counter_cache_notifications.should be_empty
     end
+
+    context "disable" do
+      before { Bullet.counter_cache_enable = false }
+      after { Bullet.counter_cache_enable = true }
+
+      it "should not detect counter cache" do
+        Country.all.each do |country|
+          country.cities.size
+        end
+        expect(Bullet.collected_counter_cache_notifications).to be_empty
+      end
+    end
+
+    context "whitelist" do
+      before { Bullet.add_whitelist :type => :counter_cache, :class_name => "Country", :association => :cities }
+      after { Bullet.reset_whitelist }
+
+      it "should not detect counter cache" do
+        Country.all.each do |country|
+          country.cities.size
+        end
+        expect(Bullet.collected_counter_cache_notifications).to be_empty
+      end
+    end
   end
 end