bullet 4.7.1 → 4.8.0

data/spec/bullet/ext/object_spec.rb

@@ -4,13 +4,13 @@ describe Object do
   context "bullet_ar_key" do
     it "should return class and id composition" do
       post = Post.first
-      post.bullet_ar_key.should == "Post:#{post.id}"
+      expect(post.bullet_ar_key).to eq("Post:#{post.id}")
     end
 
     if mongoid?
       it "should return class with namesapce and id composition" do
         post = Mongoid::Post.first
-        post.bullet_ar_key.should == "Mongoid::Post:#{post.id}"
+        expect(post.bullet_ar_key).to eq("Mongoid::Post:#{post.id}")
       end
     end
   end

data/spec/bullet/ext/string_spec.rb

@@ -3,11 +3,11 @@ require 'spec_helper'
 describe String do
   context "bullet_class_name" do
     it "should only return class name" do
-      "Post:1".bullet_class_name.should == "Post"
+      expect("Post:1".bullet_class_name).to eq("Post")
     end
 
     it "should return class name with namespace" do
-      "Mongoid::Post:1234567890".bullet_class_name.should == "Mongoid::Post"
+      expect("Mongoid::Post:1234567890".bullet_class_name).to eq("Mongoid::Post")
     end
   end
 end

data/spec/bullet/notification/base_spec.rb

@@ -7,49 +7,54 @@ module Bullet
 
       context "#title" do
         it "should raise NoMethodError" do
-          lambda { subject.title }.should raise_error(NoMethodError)
+          expect { subject.title }.to raise_error(NoMethodError)
         end
       end
 
       context "#body" do
         it "should raise NoMethodError" do
-          lambda { subject.body }.should raise_error(NoMethodError)
+          expect { subject.body }.to raise_error(NoMethodError)
         end
       end
 
       context "#whoami" do
         it "should display user name" do
           user = `whoami`.chomp
-          subject.whoami.should == "user: #{user}"
+          expect(subject.whoami).to eq("user: #{user}")
         end
       end
 
       context "#body_with_caller" do
         it "should return body" do
-          subject.stub(:body => "body")
-          subject.body_with_caller.should == "body"
+          allow(subject).to receive(:body).and_return("body")
+          expect(subject.body_with_caller).to eq("body")
         end
       end
 
       context "#standard_notice" do
         it "should return title + body" do
-          subject.stub(:title => "title", :body => "body")
-          subject.standard_notice.should == "title\nbody"
+          allow(subject).to receive(:title).and_return("title")
+          allow(subject).to receive(:body).and_return("body")
+          expect(subject.standard_notice).to eq("title\nbody")
         end
       end
 
       context "#full_notice" do
         it "should return whoami + url + title + body_with_caller" do
-          subject.stub(:whoami => "whoami", :url => "url", :title => "title", :body_with_caller => "body_with_caller")
-          subject.full_notice.should == "whoami\nurl\ntitle\nbody_with_caller"
+          allow(subject).to receive(:whoami).and_return("whoami")
+          allow(subject).to receive(:url).and_return("url")
+          allow(subject).to receive(:title).and_return("title")
+          allow(subject).to receive(:body_with_caller).and_return("body_with_caller")
+          expect(subject.full_notice).to eq("whoami\nurl\ntitle\nbody_with_caller")
         end
       end
 
       context "#notify_inline" do
         it "should send full_notice to notifier" do
           notifier = double
-          subject.stub(:notifier => notifier, :full_notice => "full_notice")
-          notifier.should_receive(:inline_notify).with("full_notice")
+          allow(subject).to receive(:notifier).and_return(notifier)
+          allow(subject).to receive(:full_notice).and_return("full_notice")
+          expect(notifier).to receive(:inline_notify).with("full_notice")
           subject.notify_inline
         end
       end
@@ -57,8 +62,9 @@ module Bullet
       context "#notify_out_of_channel" do
         it "should send full_out_of_channel to notifier" do
           notifier = double
-          subject.stub(:notifier => notifier, :full_notice => "full_notice")
-          notifier.should_receive(:out_of_channel_notify).with("full_notice")
+          allow(subject).to receive(:notifier).and_return(notifier)
+          allow(subject).to receive(:full_notice).and_return("full_notice")
+          expect(notifier).to receive(:out_of_channel_notify).with("full_notice")
           subject.notify_out_of_channel
         end
       end

data/spec/bullet/notification/counter_cache_spec.rb

@@ -5,8 +5,8 @@ module Bullet
     describe CounterCache do
       subject { CounterCache.new(Post, [:comments, :votes]) }
 
-      its(:body) { should == "  Post => [:comments, :votes]" }
-      its(:title) { should == "Need Counter Cache" }
+      it { expect(subject.body).to eq("  Post => [:comments, :votes]") }
+      it { expect(subject.title).to eq("Need Counter Cache") }
     end
   end
 end

data/spec/bullet/notification/n_plus_one_query_spec.rb

@@ -5,9 +5,9 @@ module Bullet
     describe NPlusOneQuery do
       subject { NPlusOneQuery.new([["caller1", "caller2"]], Post, [:comments, :votes], "path") }
 
-      its(:body_with_caller) { should == "  Post => [:comments, :votes]\n  Add to your finder: :include => [:comments, :votes]\nN+1 Query method call stack\n  caller1\n  caller2" }
-      its(:body) { should == "  Post => [:comments, :votes]\n  Add to your finder: :include => [:comments, :votes]" }
-      its(:title) { should == "N+1 Query in path" }
+      it { expect(subject.body_with_caller).to eq("  Post => [:comments, :votes]\n  Add to your finder: :include => [:comments, :votes]\nN+1 Query method call stack\n  caller1\n  caller2") }
+      it { expect(subject.body).to eq("  Post => [:comments, :votes]\n  Add to your finder: :include => [:comments, :votes]") }
+      it { expect(subject.title).to eq("N+1 Query in path") }
     end
   end
 end

data/spec/bullet/notification/unused_eager_loading_spec.rb

@@ -5,8 +5,8 @@ module Bullet
     describe UnusedEagerLoading do
       subject { UnusedEagerLoading.new(Post, [:comments, :votes], "path") }
 
-      its(:body) { should == "  Post => [:comments, :votes]\n  Remove from your finder: :include => [:comments, :votes]" }
-      its(:title) { should == "Unused Eager Loading in path" }
+      it { expect(subject.body).to eq("  Post => [:comments, :votes]\n  Remove from your finder: :include => [:comments, :votes]") }
+      it { expect(subject.title).to eq("Unused Eager Loading in path") }
     end
   end
 end

data/spec/bullet/notification_collector_spec.rb

@@ -7,25 +7,25 @@ module Bullet
     context "#add" do
       it "should add a value" do
         subject.add("value1")
-        subject.collection.should be_include("value1")
+        expect(subject.collection).to be_include("value1")
       end
     end
 
     context "#reset" do
       it "should reset collector" do
         subject.reset
-        subject.collection.should be_empty
+        expect(subject.collection).to be_empty
       end
     end
 
     context "#notifications_present?" do
       it "should be true if collection is not empty" do
-        subject.should be_notifications_present
+        expect(subject).to be_notifications_present
       end
 
       it "should be false if collection is empty" do
         subject.reset
-        subject.should_not be_notifications_present
+        expect(subject).not_to be_notifications_present
       end
     end
   end

data/spec/bullet/rack_spec.rb

@@ -10,56 +10,56 @@ module Bullet
       it "should be true if Content-Type is text/html and http body contains html tag" do
         headers = {"Content-Type" => "text/html"}
         response = double(:body => "<html><head></head><body></body></html>")
-        middleware.should be_html_request(headers, response)
+        expect(middleware).to be_html_request(headers, response)
       end
 
       it "should be true if Content-Type is text/html and http body contains html tag with attributes" do
         headers = {"Content-Type" => "text/html"}
         response = double(:body => "<html attr='hello'><head></head><body></body></html>")
-        middleware.should be_html_request(headers, response)
+        expect(middleware).to be_html_request(headers, response)
       end
 
       it "should be false if there is no Content-Type header" do
         headers = {}
         response = double(:body => "<html><head></head><body></body></html>")
-        middleware.should_not be_html_request(headers, response)
+        expect(middleware).not_to be_html_request(headers, response)
       end
 
       it "should be false if Content-Type is javascript" do
         headers = {"Content-Type" => "text/javascript"}
         response = double(:body => "<html><head></head><body></body></html>")
-        middleware.should_not be_html_request(headers, response)
+        expect(middleware).not_to be_html_request(headers, response)
       end
 
       it "should be false if response body doesn't contain html tag" do
         headers = {"Content-Type" => "text/html"}
         response = double(:body => "<div>Partial</div>")
-        middleware.should_not be_html_request(headers, response)
+        expect(middleware).not_to be_html_request(headers, response)
       end
     end
 
     context "empty?" do
       it "should be false if response is a string and not empty" do
         response = double(:body => "<html><head></head><body></body></html>")
-        middleware.should_not be_empty(response)
+        expect(middleware).not_to be_empty(response)
       end
 
       it "should be true if response is not found" do
         response = ["Not Found"]
-        middleware.should be_empty(response)
+        expect(middleware).to be_empty(response)
       end
 
       it "should be true if response body is empty" do
         response = double(:body => "")
-        middleware.should be_empty(response)
+        expect(middleware).to be_empty(response)
       end
     end
 
     context "#call" do
       context "when Bullet is enabled" do
         it "should invoke Bullet.start_request and Bullet.end_request" do
-          Bullet.should_receive(:start_request)
-          Bullet.should_receive(:end_request)
+          expect(Bullet).to receive(:start_request)
+          expect(Bullet).to receive(:end_request)
           middleware.call([])
         end
 
@@ -67,34 +67,34 @@ module Bullet
           expected_response = Support::ResponseDouble.new "Actual body"
           app.response = expected_response
           status, headers, response = middleware.call([])
-          response.should == expected_response
+          expect(response).to eq(expected_response)
         end
 
         it "should change response body if notification is active" do
-          Bullet.should_receive(:notification?).and_return(true)
-          Bullet.should_receive(:gather_inline_notifications).and_return("<bullet></bullet>")
-          Bullet.should_receive(:perform_out_of_channel_notifications)
+          expect(Bullet).to receive(:notification?).and_return(true)
+          expect(Bullet).to receive(:gather_inline_notifications).and_return("<bullet></bullet>")
+          expect(Bullet).to receive(:perform_out_of_channel_notifications)
           status, headers, response = middleware.call([200, {"Content-Type" => "text/html"}])
-          headers["Content-Length"].should == "56"
-          response.should == ["<html><head></head><body></body></html><bullet></bullet>"]
+          expect(headers["Content-Length"]).to eq("56")
+          expect(response).to eq(["<html><head></head><body></body></html><bullet></bullet>"])
         end
 
         it "should set the right Content-Length if response body contains accents" do
           response = Support::ResponseDouble.new
           response.body = "<html><head></head><body>é</body></html>"
           app.response = response
-          Bullet.should_receive(:notification?).and_return(true)
-          Bullet.should_receive(:gather_inline_notifications).and_return("<bullet></bullet>")
+          expect(Bullet).to receive(:notification?).and_return(true)
+          expect(Bullet).to receive(:gather_inline_notifications).and_return("<bullet></bullet>")
           status, headers, response = middleware.call([200, {"Content-Type" => "text/html"}])
-          headers["Content-Length"].should == "58"
+          expect(headers["Content-Length"]).to eq("58")
         end
       end
 
       context "when Bullet is disabled" do
-        before(:each) { Bullet.stub(:enable? => false) }
+        before(:each) { allow(Bullet).to receive(:enable?).and_return(false) }
 
         it "should not call Bullet.start_request" do
-          Bullet.should_not_receive(:start_request)
+          expect(Bullet).not_to receive(:start_request)
           middleware.call([])
         end
       end

data/spec/bullet/registry/association_spec.rb

@@ -8,17 +8,17 @@ module Bullet
       context "#merge" do
         it "should merge key/value" do
           subject.merge("key0", "value0")
-          subject["key0"].should be_include("value0")
+          expect(subject["key0"]).to be_include("value0")
         end
       end
 
       context "#similarly_associated" do
         it "should return similarly associated keys" do
-          subject.similarly_associated("key1", Set.new(["value"])).should == ["key1", "key2"]
+          expect(subject.similarly_associated("key1", Set.new(["value"]))).to eq(["key1", "key2"])
         end
 
         it "should return empty if key does not exist" do
-          subject.similarly_associated("key3", Set.new(["value"])).should be_empty
+          expect(subject.similarly_associated("key3", Set.new(["value"]))).to be_empty
         end
       end
     end

data/spec/bullet/registry/base_spec.rb

@@ -7,36 +7,36 @@ module Bullet
 
       context "#[]" do
         it "should get value by key" do
-          subject["key"].should == Set.new(["value"])
+          expect(subject["key"]).to eq(Set.new(["value"]))
         end
       end
 
       context "#delete" do
         it "should delete key" do
           subject.delete("key")
-          subject["key"].should be_nil
+          expect(subject["key"]).to be_nil
         end
       end
 
       context "#add" do
         it "should add value with string" do
           subject.add("key", "new_value")
-          subject["key"].should == Set.new(["value", "new_value"])
+          expect(subject["key"]).to eq(Set.new(["value", "new_value"]))
         end
 
         it "should add value with array" do
           subject.add("key", ["value1", "value2"])
-          subject["key"].should == Set.new(["value", "value1", "value2"])
+          expect(subject["key"]).to eq(Set.new(["value", "value1", "value2"]))
         end
       end
 
       context "#include?" do
         it "should include key/value" do
-          subject.include?("key", "value").should be_true
+          expect(subject.include?("key", "value")).to eq true
         end
 
         it "should not include wrong key/value" do
-          subject.include?("key", "val").should be_false
+          expect(subject.include?("key", "val")).to eq false
         end
       end
     end

data/spec/bullet/registry/object_spec.rb

@@ -10,14 +10,14 @@ module Bullet
 
       context "#include?" do
         it "should include the object" do
-          subject.should be_include(post.bullet_ar_key)
+          expect(subject).to be_include(post.bullet_ar_key)
         end
       end
 
       context "#add" do
         it "should add an object" do
           subject.add(another_post.bullet_ar_key)
-          subject.should be_include(another_post.bullet_ar_key)
+          expect(subject).to be_include(another_post.bullet_ar_key)
         end
       end
     end

data/spec/integration/active_record3/association_spec.rb

@@ -17,9 +17,9 @@ if active_record3?
           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_record3?
           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_record3?
           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_record3?
           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_record3?
           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_record3?
           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_record3?
           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_record3?
           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_record3?
           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_record3?
           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_record3?
           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_record3?
           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_record3?
           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_record3?
           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').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
 
@@ -236,17 +236,17 @@ if active_record3?
           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_record3?
           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_record3?
           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_record3?
           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_record3?
           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_record3?
           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_record3?
           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_record3?
           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,17 +373,17 @@ if active_record3?
         #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
       # a repeating loop of calls in this test
       it "should not raise a stack error from posts to category" do
-        lambda {
+        expect {
           Comment.includes({:post => :category}).each do |com|
             com.post.category
           end
-        }.should_not raise_error(SystemStackError)
+        }.not_to raise_error
       end
     end
   end
@@ -404,9 +404,9 @@ if active_record3?
           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_record3?
           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_record3?
           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_record3?
           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_record3?
           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_record3?
           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_record3?
       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_record3?
           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_record3?
           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