bullet 5.8.1 → 6.1.0

data/spec/bullet/detector/unused_eager_loading_spec.rb

@@ -13,39 +13,45 @@ module Bullet
 
       context '.call_associations' do
         it 'should get empty array if eager_loadings' do
-          expect(UnusedEagerLoading.send(:call_associations, @post.bullet_key, Set.new([:association]))).to be_empty
+          expect(UnusedEagerLoading.send(:call_associations, @post.bullet_key, Set.new(%i[association]))).to be_empty
         end
 
         it 'should get call associations if object and association are both in eager_loadings and call_object_associations' do
           UnusedEagerLoading.add_eager_loadings([@post], :association)
           UnusedEagerLoading.add_call_object_associations(@post, :association)
-          expect(UnusedEagerLoading.send(:call_associations, @post.bullet_key, Set.new([:association]))).to eq([:association])
+          expect(UnusedEagerLoading.send(:call_associations, @post.bullet_key, Set.new(%i[association]))).to eq(
+            %i[association]
+          )
         end
 
         it 'should not get call associations if not exist in call_object_associations' do
           UnusedEagerLoading.add_eager_loadings([@post], :association)
-          expect(UnusedEagerLoading.send(:call_associations, @post.bullet_key, Set.new([:association]))).to be_empty
+          expect(UnusedEagerLoading.send(:call_associations, @post.bullet_key, Set.new(%i[association]))).to be_empty
         end
       end
 
       context '.diff_object_associations' do
         it 'should return associations not exist in call_association' do
-          expect(UnusedEagerLoading.send(:diff_object_associations, @post.bullet_key, Set.new([:association]))).to eq([:association])
+          expect(UnusedEagerLoading.send(:diff_object_associations, @post.bullet_key, Set.new(%i[association]))).to eq(
+            %i[association]
+          )
         end
 
         it 'should return empty if associations exist in call_association' do
           UnusedEagerLoading.add_eager_loadings([@post], :association)
           UnusedEagerLoading.add_call_object_associations(@post, :association)
-          expect(UnusedEagerLoading.send(:diff_object_associations, @post.bullet_key, Set.new([:association]))).to be_empty
+          expect(
+            UnusedEagerLoading.send(:diff_object_associations, @post.bullet_key, Set.new(%i[association]))
+          ).to be_empty
         end
       end
 
       context '.check_unused_preload_associations' do
-        let(:paths) { ['/dir1', '/dir1/subdir'] }
+        let(:paths) { %w[/dir1 /dir1/subdir] }
         it 'should create notification if object_association_diff is not empty' do
           UnusedEagerLoading.add_object_associations(@post, :association)
           allow(UnusedEagerLoading).to receive(:caller_in_project).and_return(paths)
-          expect(UnusedEagerLoading).to receive(:create_notification).with(paths, 'Post', [:association])
+          expect(UnusedEagerLoading).to receive(:create_notification).with(paths, 'Post', %i[association])
           UnusedEagerLoading.check_unused_preload_associations
         end
 
@@ -53,8 +59,10 @@ module Bullet
           UnusedEagerLoading.add_object_associations(@post, :association)
           UnusedEagerLoading.add_eager_loadings([@post], :association)
           UnusedEagerLoading.add_call_object_associations(@post, :association)
-          expect(UnusedEagerLoading.send(:diff_object_associations, @post.bullet_key, Set.new([:association]))).to be_empty
-          expect(UnusedEagerLoading).not_to receive(:create_notification).with('Post', [:association])
+          expect(
+            UnusedEagerLoading.send(:diff_object_associations, @post.bullet_key, Set.new(%i[association]))
+          ).to be_empty
+          expect(UnusedEagerLoading).not_to receive(:create_notification).with('Post', %i[association])
           UnusedEagerLoading.check_unused_preload_associations
         end
       end
@@ -62,14 +70,23 @@ module Bullet
       context '.add_eager_loadings' do
         it 'should add objects, associations pair when eager_loadings are empty' do
           UnusedEagerLoading.add_eager_loadings([@post, @post2], :associations)
-          expect(UnusedEagerLoading.send(:eager_loadings)).to be_include([@post.bullet_key, @post2.bullet_key], :associations)
+          expect(UnusedEagerLoading.send(:eager_loadings)).to be_include(
+            [@post.bullet_key, @post2.bullet_key],
+            :associations
+          )
         end
 
         it 'should add objects, associations pair for existing eager_loadings' do
           UnusedEagerLoading.add_eager_loadings([@post, @post2], :association1)
           UnusedEagerLoading.add_eager_loadings([@post, @post2], :association2)
-          expect(UnusedEagerLoading.send(:eager_loadings)).to be_include([@post.bullet_key, @post2.bullet_key], :association1)
-          expect(UnusedEagerLoading.send(:eager_loadings)).to be_include([@post.bullet_key, @post2.bullet_key], :association2)
+          expect(UnusedEagerLoading.send(:eager_loadings)).to be_include(
+            [@post.bullet_key, @post2.bullet_key],
+            :association1
+          )
+          expect(UnusedEagerLoading.send(:eager_loadings)).to be_include(
+            [@post.bullet_key, @post2.bullet_key],
+            :association2
+          )
         end
 
         it 'should merge objects, associations pair for existing eager_loadings' do

data/spec/bullet/ext/object_spec.rb

@@ -17,23 +17,28 @@ describe Object do
     end
   end
 
-  context 'primary_key_value' do
+  context 'bullet_primary_key_value' do
     it 'should return id' do
       post = Post.first
-      expect(post.primary_key_value).to eq(post.id)
+      expect(post.bullet_primary_key_value).to eq(post.id)
     end
 
     it 'should return primary key value' do
       post = Post.first
       Post.primary_key = 'name'
-      expect(post.primary_key_value).to eq(post.name)
+      expect(post.bullet_primary_key_value).to eq(post.name)
       Post.primary_key = 'id'
     end
 
     it 'should return value for multiple primary keys' do
       post = Post.first
       allow(Post).to receive(:primary_keys).and_return(%i[category_id writer_id])
-      expect(post.primary_key_value).to eq("#{post.category_id},#{post.writer_id}")
+      expect(post.bullet_primary_key_value).to eq("#{post.category_id},#{post.writer_id}")
+    end
+
+    it 'it should return nil for unpersisted records' do
+      post = Post.new(id: 123)
+      expect(post.bullet_primary_key_value).to be_nil
     end
   end
 end

data/spec/bullet/notification/base_spec.rb

@@ -26,9 +26,7 @@ module Bullet
         end
 
         it 'should leverage ENV parameter' do
-          temp_env_variable('USER', 'bogus') do
-            expect(subject.whoami).to eq('user: bogus')
-          end
+          temp_env_variable('USER', 'bogus') { expect(subject.whoami).to eq('user: bogus') }
         end
 
         it 'should return blank if no user available' do

data/spec/bullet/notification/n_plus_one_query_spec.rb

@@ -7,9 +7,24 @@ module Bullet
     describe NPlusOneQuery do
       subject { NPlusOneQuery.new([%w[caller1 caller2]], Post, %i[comments votes], 'path') }
 
-      it { expect(subject.body_with_caller).to eq("  Post => [:comments, :votes]\n  Add to your finder: :includes => [:comments, :votes]\nCall stack\n  caller1\n  caller2\n") }
-      it { expect([subject.body_with_caller, subject.body_with_caller]).to eq(["  Post => [:comments, :votes]\n  Add to your finder: :includes => [:comments, :votes]\nCall stack\n  caller1\n  caller2\n", "  Post => [:comments, :votes]\n  Add to your finder: :includes => [:comments, :votes]\nCall stack\n  caller1\n  caller2\n"]) }
-      it { expect(subject.body).to eq("  Post => [:comments, :votes]\n  Add to your finder: :includes => [:comments, :votes]") }
+      it do
+        expect(subject.body_with_caller).to eq(
+          "  Post => [:comments, :votes]\n  Add to your query: .includes([:comments, :votes])\nCall stack\n  caller1\n  caller2\n"
+        )
+      end
+      it do
+        expect([subject.body_with_caller, subject.body_with_caller]).to eq(
+          [
+            "  Post => [:comments, :votes]\n  Add to your query: .includes([:comments, :votes])\nCall stack\n  caller1\n  caller2\n",
+            "  Post => [:comments, :votes]\n  Add to your query: .includes([:comments, :votes])\nCall stack\n  caller1\n  caller2\n"
+          ]
+        )
+      end
+      it do
+        expect(subject.body).to eq(
+          "  Post => [:comments, :votes]\n  Add to your query: .includes([:comments, :votes])"
+        )
+      end
       it { expect(subject.title).to eq('USE eager loading in path') }
     end
   end

data/spec/bullet/notification/unused_eager_loading_spec.rb

@@ -7,7 +7,11 @@ module Bullet
     describe UnusedEagerLoading do
       subject { UnusedEagerLoading.new([''], Post, %i[comments votes], 'path') }
 
-      it { expect(subject.body).to eq("  Post => [:comments, :votes]\n  Remove from your finder: :includes => [:comments, :votes]") }
+      it do
+        expect(subject.body).to eq(
+          "  Post => [:comments, :votes]\n  Remove from your query: .includes([:comments, :votes])"
+        )
+      end
       it { expect(subject.title).to eq('AVOID eager loading in path') }
     end
   end

data/spec/bullet/rack_spec.rb

@@ -45,9 +45,9 @@ module Bullet
         expect(middleware).not_to be_empty(response)
       end
 
-      it 'should be true if response is not found' do
+      it 'should be false if response is not found' do
         response = ['Not Found']
-        expect(middleware).to be_empty(response)
+        expect(middleware).not_to be_empty(response)
       end
 
       it 'should be true if response body is empty' do
@@ -67,11 +67,13 @@ module Bullet
 
         it 'should change response body if notification is active' do
           expect(Bullet).to receive(:notification?).and_return(true)
+          allow(Bullet).to receive(:skip_html_injection?).and_return(false)
           expect(Bullet).to receive(:gather_inline_notifications).and_return('<bullet></bullet>')
+          expect(middleware).to receive(:xhr_script).and_return('')
           expect(Bullet).to receive(:perform_out_of_channel_notifications)
-          status, headers, response = middleware.call('Content-Type' => 'text/html')
+          _, headers, response = middleware.call('Content-Type' => 'text/html')
           expect(headers['Content-Length']).to eq('56')
-          expect(response).to eq(['<html><head></head><body><bullet></bullet></body></html>'])
+          expect(response).to eq(%w[<html><head></head><body><bullet></bullet></body></html>])
         end
 
         it 'should set the right Content-Length if response body contains accents' do
@@ -80,8 +82,22 @@ module Bullet
           app.response = response
           expect(Bullet).to receive(:notification?).and_return(true)
           expect(Bullet).to receive(:gather_inline_notifications).and_return('<bullet></bullet>')
-          status, headers, response = middleware.call('Content-Type' => 'text/html')
-          expect(headers['Content-Length']).to eq('58')
+          _, headers, response = middleware.call('Content-Type' => 'text/html')
+          expect(headers['Content-Length']).to eq((58 + middleware.send(:xhr_script).length).to_s)
+        end
+
+        context 'when skip_html_injection is enabled' do
+          it 'should not try to inject html' do
+            expected_response = Support::ResponseDouble.new 'Actual body'
+            app.response = expected_response
+            allow(Bullet).to receive(:notification?).and_return(true)
+            allow(Bullet).to receive(:skip_html_injection?).and_return(true)
+            expect(Bullet).to receive(:gather_inline_notifications).never
+            expect(middleware).to receive(:xhr_script).never
+            expect(Bullet).to receive(:perform_out_of_channel_notifications)
+            _, _, response = middleware.call('Content-Type' => 'text/html')
+            expect(response).to eq(expected_response)
+          end
         end
       end
 
@@ -95,6 +111,14 @@ module Bullet
       end
     end
 
+    context '#set_header' do
+      it 'should truncate headers to under 8kb' do
+        long_header = ['a' * 1_024] * 10
+        expected_res = (['a' * 1_024] * 7).to_json
+        expect(middleware.set_header({}, 'Dummy-Header', long_header)).to eq(expected_res)
+      end
+    end
+
     describe '#response_body' do
       let(:response) { double }
       let(:body_string) { '<html><body>My Body</body></html>' }

data/spec/bullet/registry/association_spec.rb

@@ -16,11 +16,11 @@ module Bullet
 
       context '#similarly_associated' do
         it 'should return similarly associated keys' do
-          expect(subject.similarly_associated('key1', Set.new(['value']))).to eq(%w[key1 key2])
+          expect(subject.similarly_associated('key1', Set.new(%w[value]))).to eq(%w[key1 key2])
         end
 
         it 'should return empty if key does not exist' do
-          expect(subject.similarly_associated('key3', Set.new(['value']))).to be_empty
+          expect(subject.similarly_associated('key3', Set.new(%w[value]))).to be_empty
         end
       end
     end

data/spec/bullet/registry/base_spec.rb

@@ -9,7 +9,7 @@ module Bullet
 
       context '#[]' do
         it 'should get value by key' do
-          expect(subject['key']).to eq(Set.new(['value']))
+          expect(subject['key']).to eq(Set.new(%w[value]))
         end
       end
 

data/spec/bullet_spec.rb

@@ -17,9 +17,7 @@ describe Bullet, focused: true do
       end
 
       context 'disable Bullet' do
-        before do
-          Bullet.enable = false
-        end
+        before { Bullet.enable = false }
 
         it 'should be disabled' do
           expect(subject).to_not be_enable
@@ -27,8 +25,8 @@ describe Bullet, focused: true do
 
         context 'enable Bullet again without patching again the orms' do
           before do
-            expect(Bullet::Mongoid).not_to receive(:enable) if defined? Bullet::Mongoid
-            expect(Bullet::ActiveRecord).not_to receive(:enable) if defined? Bullet::ActiveRecord
+            expect(Bullet::Mongoid).not_to receive(:enable) if defined?(Bullet::Mongoid)
+            expect(Bullet::ActiveRecord).not_to receive(:enable) if defined?(Bullet::ActiveRecord)
             Bullet.enable = true
           end
 
@@ -42,9 +40,7 @@ describe Bullet, focused: true do
 
   describe '#start?' do
     context 'when bullet is disabled' do
-      before(:each) do
-        Bullet.enable = false
-      end
+      before(:each) { Bullet.enable = false }
 
       it 'should not be started' do
         expect(Bullet).not_to be_start
@@ -53,28 +49,19 @@ describe Bullet, focused: true do
   end
 
   describe '#debug' do
-    before(:each) do
-      $stdout = StringIO.new
-    end
+    before(:each) { $stdout = StringIO.new }
 
-    after(:each) do
-      $stdout = STDOUT
-    end
+    after(:each) { $stdout = STDOUT }
 
     context 'when debug is enabled' do
-      before(:each) do
-        ENV['BULLET_DEBUG'] = 'true'
-      end
+      before(:each) { ENV['BULLET_DEBUG'] = 'true' }
 
-      after(:each) do
-        ENV['BULLET_DEBUG'] = 'false'
-      end
+      after(:each) { ENV['BULLET_DEBUG'] = 'false' }
 
       it 'should output debug information' do
         Bullet.debug('debug_message', 'this is helpful information')
 
-        expect($stdout.string)
-          .to eq("[Bullet][debug_message] this is helpful information\n")
+        expect($stdout.string).to eq("[Bullet][debug_message] this is helpful information\n")
       end
     end
 
@@ -125,13 +112,7 @@ describe Bullet, focused: true do
     end
 
     context 'when called with Rack environment hash' do
-      let(:env) {
-        {
-          'REQUEST_METHOD' => 'GET',
-          'PATH_INFO' => '/path',
-          'QUERY_STRING' => 'foo=bar'
-        }
-      }
+      let(:env) { { 'REQUEST_METHOD' => 'GET', 'PATH_INFO' => '/path', 'QUERY_STRING' => 'foo=bar' } }
 
       context "when env['REQUEST_URI'] is nil" do
         before { env['REQUEST_URI'] = nil }

data/spec/integration/active_record/association_spec.rb

@@ -6,9 +6,7 @@ if active_record?
   describe Bullet::Detector::Association, 'has_many' do
     context 'post => comments' do
       it 'should detect non preload post => comments' do
-        Post.all.each do |post|
-          post.comments.map(&:name)
-        end
+        Post.all.each { |post| post.comments.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -16,9 +14,7 @@ if active_record?
       end
 
       it 'should detect non preload post => comments for find_by_sql' do
-        Post.find_by_sql('SELECT * FROM posts').each do |post|
-          post.comments.map(&:name)
-        end
+        Post.find_by_sql('SELECT * FROM posts').each { |post| post.comments.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -26,9 +22,7 @@ if active_record?
       end
 
       it 'should detect preload with post => comments' do
-        Post.includes(:comments).each do |post|
-          post.comments.map(&:name)
-        end
+        Post.includes(:comments).each { |post| post.comments.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -65,9 +59,7 @@ if active_record?
       end
 
       it 'should detect non preload post => comments with empty?' do
-        Post.all.each do |post|
-          post.comments.empty?
-        end
+        Post.all.each { |post| post.comments.empty? }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -76,9 +68,7 @@ if active_record?
 
       it 'should detect non preload post => comments with include?' do
         comment = Comment.last
-        Post.all.each do |post|
-          post.comments.include?(comment)
-        end
+        Post.all.each { |post| post.comments.include?(comment) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -86,9 +76,7 @@ if active_record?
       end
 
       it 'should not detect unused preload person => pets with empty?' do
-        Person.all.each do |person|
-          person.pets.empty?
-        end
+        Person.all.each { |person| person.pets.empty? }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -98,11 +86,7 @@ if active_record?
 
     context 'category => posts => comments' do
       it 'should detect non preload category => posts => comments' do
-        Category.all.each do |category|
-          category.posts.each do |post|
-            post.comments.map(&:name)
-          end
-        end
+        Category.all.each { |category| category.posts.each { |post| post.comments.map(&:name) } }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -111,11 +95,7 @@ if active_record?
       end
 
       it 'should detect preload category => posts, but no post => comments' do
-        Category.includes(:posts).each do |category|
-          category.posts.each do |post|
-            post.comments.map(&:name)
-          end
-        end
+        Category.includes(:posts).each { |category| category.posts.each { |post| post.comments.map(&:name) } }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -124,11 +104,7 @@ if active_record?
       end
 
       it 'should detect preload with category => posts => comments' do
-        Category.includes(posts: :comments).each do |category|
-          category.posts.each do |post|
-            post.comments.map(&:name)
-          end
-        end
+        Category.includes(posts: :comments).each { |category| category.posts.each { |post| post.comments.map(&:name) } }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -137,9 +113,7 @@ if active_record?
 
       it 'should detect preload with category => posts => comments with posts.id > 0' do
         Category.includes(posts: :comments).where('posts.id > 0').references(:posts).each do |category|
-          category.posts.each do |post|
-            post.comments.map(&:name)
-          end
+          category.posts.each { |post| post.comments.map(&:name) }
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
@@ -156,9 +130,7 @@ if active_record?
       end
 
       it 'should detect unused preload with post => commnets, no category => posts' do
-        Category.includes(posts: :comments).each do |category|
-          category.posts.map(&:name)
-        end
+        Category.includes(posts: :comments).each { |category| category.posts.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Post, :comments)
 
@@ -212,9 +184,7 @@ if active_record?
       end
 
       it 'should detect unused preload with category => entries, but not with category => posts' do
-        Category.includes(%i[posts entries]).each do |category|
-          category.posts.map(&:name)
-        end
+        Category.includes(%i[posts entries]).each { |category| category.posts.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         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)
@@ -225,9 +195,7 @@ if active_record?
 
     context 'post => comment' do
       it 'should detect unused preload with post => comments' do
-        Post.includes(:comments).each do |post|
-          post.comments.first&.name
-        end
+        Post.includes(:comments).each { |post| post.comments.first&.name }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_unused_preload_associations_for(Post, :comments)
 
@@ -246,7 +214,7 @@ if active_record?
         category = Category.first
         category.draft_post.destroy!
         post = category.draft_post
-        post.update_attributes!(link: true)
+        post.update!(link: true)
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -272,9 +240,7 @@ if active_record?
 
     context 'scope for_category_name' do
       it 'should detect preload with post => category' do
-        Post.in_category_name('first').references(:categories).each do |post|
-          post.category.name
-        end
+        Post.in_category_name('first').references(:categories).each { |post| post.category.name }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -292,9 +258,7 @@ if active_record?
 
     context 'scope preload_comments' do
       it 'should detect preload post => comments with scope' do
-        Post.preload_comments.each do |post|
-          post.comments.map(&:name)
-        end
+        Post.preload_comments.each { |post| post.comments.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -314,9 +278,7 @@ if active_record?
   describe Bullet::Detector::Association, 'belongs_to' do
     context 'comment => post' do
       it 'should detect non preload with comment => post' do
-        Comment.all.each do |comment|
-          comment.post.name
-        end
+        Comment.all.each { |comment| comment.post.name }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -331,10 +293,8 @@ if active_record?
         expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
 
-      it 'should dtect preload with comment => post' do
-        Comment.includes(:post).each do |comment|
-          comment.post.name
-        end
+      it 'should detect preload with comment => post' do
+        Comment.includes(:post).each { |comment| comment.post.name }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -362,29 +322,16 @@ if active_record?
 
         new_post.trigger_after_save = true
         new_post.save!
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
         expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
-
-      it 'should not detect "manual" preload' do
-        comment = Comment.all.to_a.first
-        post = Post.find(comment.post_id)
-        # "manually" preload with out-of-band data
-        comment.post = post
-        # loading it should not trigger anything
-        comment.post
-
-        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
-        expect(Bullet::Detector::Association).to be_completely_preloading_associations
-      end
     end
 
     context 'comment => post => category' do
       it 'should detect non preload association with comment => post' do
-        Comment.all.each do |comment|
-          comment.post.category.name
-        end
+        Comment.all.each { |comment| comment.post.category.name }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -401,9 +348,7 @@ if active_record?
       end
 
       it 'should detect non preload association with post => category' do
-        Comment.includes(:post).each do |comment|
-          comment.post.category.name
-        end
+        Comment.includes(:post).each { |comment| comment.post.category.name }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -411,9 +356,7 @@ if active_record?
       end
 
       it 'should not detect unpreload association' do
-        Comment.includes(post: :category).each do |comment|
-          comment.post.category.name
-        end
+        Comment.includes(post: :category).each { |comment| comment.post.category.name }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -423,9 +366,8 @@ if active_record?
 
     context 'comment => author, post => writer' do
       it 'should detect non preloaded writer' do
-        Comment.includes(%i[author post]).where(['base_users.id = ?', BaseUser.first]).references(:base_users).each do |comment|
-          comment.post.writer.name
-        end
+        Comment.includes(%i[author post]).where(['base_users.id = ?', BaseUser.first]).references(:base_users)
+          .each { |comment| comment.post.writer.name }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -433,9 +375,10 @@ if active_record?
       end
 
       it 'should detect unused preload with comment => author' do
-        Comment.includes([:author, { post: :writer }]).where(['base_users.id = ?', BaseUser.first]).references(:base_users).each do |comment|
-          comment.post.writer.name
-        end
+        Comment.includes([:author, { post: :writer }]).where(['base_users.id = ?', BaseUser.first]).references(
+          :base_users
+        )
+          .each { |comment| comment.post.writer.name }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -453,11 +396,7 @@ if active_record?
       end
 
       it 'should not raise a stack error from posts to category' do
-        expect {
-          Comment.includes(post: :category).each do |com|
-            com.post.category
-          end
-        }.not_to raise_error
+        expect { Comment.includes(post: :category).each { |com| com.post.category } }.not_to raise_error
       end
     end
   end
@@ -465,9 +404,7 @@ if active_record?
   describe Bullet::Detector::Association, 'has_and_belongs_to_many' do
     context 'students <=> teachers' do
       it 'should detect non preload associations' do
-        Student.all.each do |student|
-          student.teachers.map(&:name)
-        end
+        Student.all.each { |student| student.teachers.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -475,9 +412,7 @@ if active_record?
       end
 
       it 'should detect preload associations' do
-        Student.includes(:teachers).each do |student|
-          student.teachers.map(&:name)
-        end
+        Student.includes(:teachers).each { |student| student.teachers.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -501,9 +436,7 @@ if active_record?
       end
 
       it 'should detect non preload student => teachers with empty?' do
-        Student.all.each do |student|
-          student.teachers.empty?
-        end
+        Student.all.each { |student| student.teachers.empty? }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -515,9 +448,7 @@ if active_record?
   describe Bullet::Detector::Association, 'has_many :through' do
     context 'firm => clients' do
       it 'should detect non preload associations' do
-        Firm.all.each do |firm|
-          firm.clients.map(&:name)
-        end
+        Firm.all.each { |firm| firm.clients.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -525,9 +456,7 @@ if active_record?
       end
 
       it 'should detect preload associations' do
-        Firm.includes(:clients).each do |firm|
-          firm.clients.map(&:name)
-        end
+        Firm.includes(:clients).each { |firm| firm.clients.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -553,9 +482,7 @@ if active_record?
 
     context 'firm => clients => groups' do
       it 'should detect non preload associations' do
-        Firm.all.each do |firm|
-          firm.groups.map(&:name)
-        end
+        Firm.all.each { |firm| firm.groups.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -563,9 +490,7 @@ if active_record?
       end
 
       it 'should detect preload associations' do
-        Firm.includes(:groups).each do |firm|
-          firm.groups.map(&:name)
-        end
+        Firm.includes(:groups).each { |firm| firm.groups.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -593,9 +518,7 @@ if active_record?
   describe Bullet::Detector::Association, 'has_one' do
     context 'company => address' do
       it 'should detect non preload association' do
-        Company.all.each do |company|
-          company.address.name
-        end
+        Company.all.each { |company| company.address.name }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -603,9 +526,7 @@ if active_record?
       end
 
       it 'should detect preload association' do
-        Company.includes(:address).each do |company|
-          company.address.name
-        end
+        Company.includes(:address).each { |company| company.address.name }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -699,9 +620,7 @@ if active_record?
   describe Bullet::Detector::Association, 'STI' do
     context 'page => author' do
       it 'should detect non preload associations' do
-        Page.all.each do |page|
-          page.author.name
-        end
+        Page.all.each { |page| page.author.name }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -709,9 +628,7 @@ if active_record?
       end
 
       it 'should detect preload associations' do
-        Page.includes(:author).each do |page|
-          page.author.name
-        end
+        Page.includes(:author).each { |page| page.author.name }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -740,9 +657,7 @@ if active_record?
       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
+        Post.all.each { |post| post.comments.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
 
         expect(Bullet::Detector::Association).not_to be_detecting_unpreloaded_association_for(Post, :comments)
@@ -771,9 +686,7 @@ if active_record?
       end
 
       it 'should still detect n plus one query' do
-        Post.all.each do |post|
-          post.comments.map(&:name)
-        end
+        Post.all.each { |post| post.comments.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
 
         expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :comments)
@@ -786,9 +699,7 @@ if active_record?
       after { Bullet.clear_whitelist }
 
       it 'should not detect n plus one query' do
-        Post.all.each do |post|
-          post.comments.map(&:name)
-        end
+        Post.all.each { |post| post.comments.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
 
         expect(Bullet::Detector::Association).not_to be_detecting_unpreloaded_association_for(Post, :comments)
@@ -817,9 +728,7 @@ if active_record?
       end
 
       it 'should still detect n plus one query' do
-        Post.all.each do |post|
-          post.comments.map(&:name)
-        end
+        Post.all.each { |post| post.comments.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
 
         expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :comments)