1 files changed, 14 insertions, 21 deletions
diff --git a/spec/rubocop/cop/migration/update_column_in_batches_spec.rb b/spec/rubocop/cop/migration/update_column_in_batches_spec.rb
index 8049cba12d0..a12ae94c22b 100644
--- a/spec/rubocop/cop/migration/update_column_in_batches_spec.rb
+++ b/spec/rubocop/cop/migration/update_column_in_batches_spec.rb
@@ -2,9 +2,6 @@
 
 require 'fast_spec_helper'
 
-require 'rubocop'
-require 'rubocop/rspec/support'
-
 require_relative '../../../../rubocop/cop/migration/update_column_in_batches'
 
 RSpec.describe RuboCop::Cop::Migration::UpdateColumnInBatches do
@@ -31,9 +28,7 @@ RSpec.describe RuboCop::Cop::Migration::UpdateColumnInBatches do
 
   context 'outside of a migration' do
     it 'does not register any offenses' do
-      inspect_source(migration_code)
-
-      expect(cop.offenses).to be_empty
+      expect_no_offenses(migration_code)
     end
   end
 
@@ -53,14 +48,14 @@ RSpec.describe RuboCop::Cop::Migration::UpdateColumnInBatches do
     let(:relative_spec_filepath) { Pathname.new(spec_filepath).relative_path_from(tmp_rails_root) }
 
     it 'registers an offense when using update_column_in_batches' do
-      inspect_source(migration_code, @migration_file)
-
-      aggregate_failures do
-        expect(cop.offenses.size).to eq(1)
-        expect(cop.offenses.map(&:line)).to eq([2])
-        expect(cop.offenses.first.message)
-          .to include("`#{relative_spec_filepath}`")
-      end
+      expect_offense(<<~RUBY, @migration_file)
+        def up
+          update_column_in_batches(:projects, :name, "foo") do |table, query|
+          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Migration running `update_column_in_batches` [...]
+            query.where(table[:name].eq(nil))
+          end
+        end
+      RUBY
     end
   end
 
@@ -76,20 +71,18 @@ RSpec.describe RuboCop::Cop::Migration::UpdateColumnInBatches do
     end
 
     it 'does not register any offenses' do
-      inspect_source(migration_code, @migration_file)
-
-      expect(cop.offenses).to be_empty
+      expect_no_offenses(migration_code)
     end
   end
 
-  context 'in a migration' do
+  context 'when in migration' do
     let(:migration_filepath) { File.join(tmp_rails_root, 'db', 'migrate', '20121220064453_my_super_migration.rb') }
 
     it_behaves_like 'a migration file with no spec file'
     it_behaves_like 'a migration file with a spec file'
   end
 
-  context 'in a post migration' do
+  context 'when in a post migration' do
     let(:migration_filepath) { File.join(tmp_rails_root, 'db', 'post_migrate', '20121220064453_my_super_migration.rb') }
 
     it_behaves_like 'a migration file with no spec file'
@@ -99,14 +92,14 @@ RSpec.describe RuboCop::Cop::Migration::UpdateColumnInBatches do
   context 'EE migrations' do
     let(:spec_filepath) { File.join(tmp_rails_root, 'ee', 'spec', 'migrations', 'my_super_migration_spec.rb') }
 
-    context 'in a migration' do
+    context 'when in a migration' do
       let(:migration_filepath) { File.join(tmp_rails_root, 'ee', 'db', 'migrate', '20121220064453_my_super_migration.rb') }
 
       it_behaves_like 'a migration file with no spec file'
       it_behaves_like 'a migration file with a spec file'
     end
 
-    context 'in a post migration' do
+    context 'when in a post migration' do
       let(:migration_filepath) { File.join(tmp_rails_root, 'ee', 'db', 'post_migrate', '20121220064453_my_super_migration.rb') }
 
       it_behaves_like 'a migration file with no spec file'