bullet 4.7.1 → 4.8.0

data/spec/integration/active_record4/association_spec.rb

@@ -17,9 +17,9 @@ if active_record4?
           post.comments.map(&:name)
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Post, :comments)
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :comments)
       end
 
       it "should detect preload with post => comments" do
@@ -27,25 +27,25 @@ if active_record4?
           post.comments.map(&:name)
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
 
       it "should detect unused preload post => comments" do
         Post.includes(:comments).map(&:name)
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should be_unused_preload_associations_for(Post, :comments)
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Post, :comments)
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
 
       it "should not detect unused preload post => comments" do
         Post.all.map(&:name)
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
 
       it "should detect non preload comment => post with inverse_of" do
@@ -56,9 +56,9 @@ if active_record4?
           end
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
     end
 
@@ -70,10 +70,10 @@ if active_record4?
           end
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Category, :posts)
-        Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Post, :comments)
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Category, :posts)
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :comments)
       end
 
       it "should detect preload category => posts, but no post => comments" do
@@ -83,10 +83,10 @@ if active_record4?
           end
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should_not be_detecting_unpreloaded_association_for(Category, :posts)
-        Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Post, :comments)
+        expect(Bullet::Detector::Association).not_to be_detecting_unpreloaded_association_for(Category, :posts)
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :comments)
       end
 
       it "should detect preload with category => posts => comments" do
@@ -96,17 +96,17 @@ if active_record4?
           end
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
 
       it "should detect unused preload with category => posts => comments" do
         Category.includes({:posts => :comments}).map(&:name)
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should be_unused_preload_associations_for(Post, :comments)
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Post, :comments)
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
 
       it "should detect unused preload with post => commnets, no category => posts" do
@@ -114,9 +114,9 @@ if active_record4?
           category.posts.map(&:name)
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should be_unused_preload_associations_for(Post, :comments)
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Post, :comments)
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
     end
 
@@ -127,10 +127,10 @@ if active_record4?
           category.entries.map(&:name)
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Category, :posts)
-        Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Category, :entries)
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Category, :posts)
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Category, :entries)
       end
 
       it "should detect preload with category => posts, but not with category => entries" do
@@ -139,10 +139,10 @@ if active_record4?
           category.entries.map(&:name)
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should_not be_detecting_unpreloaded_association_for(Category, :posts)
-        Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Category, :entries)
+        expect(Bullet::Detector::Association).not_to be_detecting_unpreloaded_association_for(Category, :posts)
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Category, :entries)
       end
 
       it "should detect preload with category => [posts, entries]" do
@@ -151,18 +151,18 @@ if active_record4?
           category.entries.map(&:name)
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
 
       it "should detect unused preload with category => [posts, entries]" do
         Category.includes([:posts, :entries]).map(&:name)
         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)
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Category, :posts)
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Category, :entries)
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
 
       it "should detect unused preload with category => entries, but not with category => posts" do
@@ -170,10 +170,10 @@ if active_record4?
           category.posts.map(&:name)
         end
         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)
+        expect(Bullet::Detector::Association).not_to be_unused_preload_associations_for(Category, :posts)
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Category, :entries)
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
     end
 
@@ -183,17 +183,17 @@ if active_record4?
           post.comments.first.name
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_unused_preload_associations_for(Post, :comments)
+        expect(Bullet::Detector::Association).not_to be_unused_preload_associations_for(Post, :comments)
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
 
       it "should detect preload with post => commnets" do
         Post.first.comments.map(&:name)
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
     end
 
@@ -205,8 +205,8 @@ if active_record4?
           post.writer.name
         end
         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)
+        expect(Bullet::Detector::Association).not_to be_unused_preload_associations_for(Category, :posts)
+        expect(Bullet::Detector::Association).not_to be_unused_preload_associations_for(Post, :writer)
       end
     end
 
@@ -216,17 +216,17 @@ if active_record4?
           post.category.name
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
 
       it "should not be unused preload post => category" do
         Post.in_category_name('first').references(:categories).map(&:name)
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
     end
 
@@ -236,17 +236,17 @@ if active_record4?
           post.comments.map(&:name)
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
 
       it "should detect unused preload with scope" do
         Post.preload_comments.map(&:name)
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should be_unused_preload_associations_for(Post, :comments)
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Post, :comments)
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
     end
   end
@@ -267,17 +267,17 @@ if active_record4?
           comment.post.name
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Comment, :post)
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Comment, :post)
       end
 
       it "should detect preload with one comment => post" do
         Comment.first.post.name
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
 
       it "should dtect preload with comment => post" do
@@ -285,25 +285,25 @@ if active_record4?
           comment.post.name
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
 
       it "should not detect preload with comment => post" do
         Comment.all.map(&:name)
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
 
       it "should detect unused preload with comments => post" do
         Comment.includes(:post).map(&:name)
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should be_unused_preload_associations_for(Comment, :post)
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Comment, :post)
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
     end
 
@@ -313,9 +313,9 @@ if active_record4?
           comment.post.category.name
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Comment, :post)
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Comment, :post)
       end
 
       it "should detect non preload association with post => category" do
@@ -323,9 +323,9 @@ if active_record4?
           comment.post.category.name
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Post, :category)
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :category)
       end
 
       it "should not detect unpreload association" do
@@ -333,9 +333,9 @@ if active_record4?
           comment.post.category.name
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
     end
 
@@ -347,9 +347,9 @@ if active_record4?
           comment.post.writer.name
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Post, :writer)
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :writer)
       end
 
       # this happens because the comment doesn't break down the hash into keys
@@ -359,9 +359,9 @@ if active_record4?
           comment.post.writer.name
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should be_unused_preload_associations_for(Comment, :author)
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Comment, :author)
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
 
       # To flyerhzm: This does not detect that newspaper is unpreloaded. The association is
@@ -373,7 +373,7 @@ if active_record4?
         #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)
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Writer, :newspaper)
       end
 
       # when we attempt to access category, there is an infinite overflow because load_target is hijacked leading to
@@ -404,9 +404,9 @@ if active_record4?
           student.teachers.map(&:name)
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Student, :teachers)
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Student, :teachers)
       end
 
       it "should detect preload associations" do
@@ -414,25 +414,25 @@ if active_record4?
           student.teachers.map(&:name)
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
 
       it "should detect unused preload associations" do
         Student.includes(:teachers).map(&:name)
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should be_unused_preload_associations_for(Student, :teachers)
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Student, :teachers)
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
 
       it "should detect no unused preload associations" do
         Student.all.map(&:name)
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
     end
   end
@@ -453,9 +453,9 @@ if active_record4?
           firm.clients.map(&:name)
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Firm, :clients)
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Firm, :clients)
       end
 
       it "should detect preload associations" do
@@ -463,25 +463,25 @@ if active_record4?
           firm.clients.map(&:name)
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
 
       it "should not detect preload associations" do
         Firm.all.map(&:name)
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
 
       it "should detect unused preload associations" do
         Firm.includes(:clients).map(&:name)
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should be_unused_preload_associations_for(Firm, :clients)
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Firm, :clients)
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
     end
   end
@@ -502,9 +502,9 @@ if active_record4?
           company.address.name
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Company, :address)
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Company, :address)
       end
 
       it "should detect preload association" do
@@ -512,25 +512,25 @@ if active_record4?
           company.address.name
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
 
       it "should not detect preload association" do
         Company.all.map(&:name)
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
 
       it "should detect unused preload association" do
         Company.includes(:address).map(&:name)
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should be_unused_preload_associations_for(Company, :address)
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Company, :address)
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
     end
   end
@@ -549,9 +549,9 @@ if active_record4?
       Post.all
       Post.first.comments.map(&:name)
       Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-      Bullet::Detector::Association.should_not be_has_unused_preload_associations
+      expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-      Bullet::Detector::Association.should be_completely_preloading_associations
+      expect(Bullet::Detector::Association).to be_completely_preloading_associations
     end
   end
 
@@ -571,9 +571,9 @@ if active_record4?
           page.author.name
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Page, :author)
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Page, :author)
       end
 
       it "should detect preload associations" do
@@ -581,25 +581,25 @@ if active_record4?
           page.author.name
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
 
       it "should detect unused preload associations" do
         Page.includes(:author).map(&:name)
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should be_unused_preload_associations_for(Page, :author)
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Page, :author)
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
 
       it "should not detect preload associations" do
         Page.all.map(&:name)
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
     end