1 files changed, 18 insertions, 23 deletions
diff --git a/spec/rubocop/cop/migration/add_limit_to_text_columns_spec.rb b/spec/rubocop/cop/migration/add_limit_to_text_columns_spec.rb
index 149fb0a48eb..f4695ff8d2d 100644
--- a/spec/rubocop/cop/migration/add_limit_to_text_columns_spec.rb
+++ b/spec/rubocop/cop/migration/add_limit_to_text_columns_spec.rb
@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
 require 'fast_spec_helper'
-require 'rubocop'
 require_relative '../../../../rubocop/cop/migration/add_limit_to_text_columns'
 
 RSpec.describe RuboCop::Cop::Migration::AddLimitToTextColumns do
-  include CopHelper
-
   subject(:cop) { described_class.new }
 
-  context 'in migration' do
+  context 'when in migration' do
+    let(:msg) { 'Text columns should always have a limit set (255 is suggested)[...]' }
+
     before do
       allow(cop).to receive(:in_migration?).and_return(true)
     end
@@ -25,31 +24,29 @@ RSpec.describe RuboCop::Cop::Migration::AddLimitToTextColumns do
               create_table :test_text_limits, id: false do |t|
                 t.integer :test_id, null: false
                 t.text :name
-                  ^^^^ #{described_class::MSG}
+                  ^^^^ #{msg}
               end
 
               create_table_with_constraints :test_text_limits_create do |t|
                 t.integer :test_id, null: false
                 t.text :title
                 t.text :description
-                  ^^^^ #{described_class::MSG}
+                  ^^^^ #{msg}
 
                 t.text_limit :title, 100
               end
 
               add_column :test_text_limits, :email, :text
-              ^^^^^^^^^^ #{described_class::MSG}
+              ^^^^^^^^^^ #{msg}
 
               add_column_with_default :test_text_limits, :role, :text, default: 'default'
-              ^^^^^^^^^^^^^^^^^^^^^^^ #{described_class::MSG}
+              ^^^^^^^^^^^^^^^^^^^^^^^ #{msg}
 
               change_column_type_concurrently :test_text_limits, :test_id, :text
-              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ #{described_class::MSG}
+              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ #{msg}
             end
           end
         RUBY
-
-        expect(cop.offenses.map(&:cop_name)).to all(eq('Migration/AddLimitToTextColumns'))
       end
     end
 
@@ -111,7 +108,7 @@ RSpec.describe RuboCop::Cop::Migration::AddLimitToTextColumns do
     end
 
     # Make sure that the cop is properly checking for an `add_text_limit`
-    # over the same {table, attribute} as the one that triggered the offence
+    # over the same {table, attribute} as the one that triggered the offense
     context 'when the limit is defined for a same name attribute but different table' do
       it 'registers an offense' do
         expect_offense(<<~RUBY)
@@ -123,17 +120,17 @@ RSpec.describe RuboCop::Cop::Migration::AddLimitToTextColumns do
               create_table :test_text_limits, id: false do |t|
                 t.integer :test_id, null: false
                 t.text :name
-                  ^^^^ #{described_class::MSG}
+                  ^^^^ #{msg}
               end
 
               add_column :test_text_limits, :email, :text
-              ^^^^^^^^^^ #{described_class::MSG}
+              ^^^^^^^^^^ #{msg}
 
               add_column_with_default :test_text_limits, :role, :text, default: 'default'
-              ^^^^^^^^^^^^^^^^^^^^^^^ #{described_class::MSG}
+              ^^^^^^^^^^^^^^^^^^^^^^^ #{msg}
 
               change_column_type_concurrently :test_text_limits, :test_id, :text
-              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ #{described_class::MSG}
+              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ #{msg}
 
               add_text_limit :wrong_table, :name, 255
               add_text_limit :wrong_table, :email, 255
@@ -142,8 +139,6 @@ RSpec.describe RuboCop::Cop::Migration::AddLimitToTextColumns do
             end
           end
         RUBY
-
-        expect(cop.offenses.map(&:cop_name)).to all(eq('Migration/AddLimitToTextColumns'))
       end
     end
 
@@ -176,18 +171,18 @@ RSpec.describe RuboCop::Cop::Migration::AddLimitToTextColumns do
             DOWNTIME = false
 
             def up
-              drop_table :no_offence_on_down
+              drop_table :no_offense_on_down
             end
 
             def down
-              create_table :no_offence_on_down, id: false do |t|
+              create_table :no_offense_on_down, id: false do |t|
                 t.integer :test_id, null: false
                 t.text :name
               end
 
-              add_column :no_offence_on_down, :email, :text
+              add_column :no_offense_on_down, :email, :text
 
-              add_column_with_default :no_offence_on_down, :role, :text, default: 'default'
+              add_column_with_default :no_offense_on_down, :role, :text, default: 'default'
             end
           end
         RUBY
@@ -195,7 +190,7 @@ RSpec.describe RuboCop::Cop::Migration::AddLimitToTextColumns do
     end
   end
 
-  context 'outside of migration' do
+  context 'when outside of migration' do
     it 'registers no offense' do
       expect_no_offenses(<<~RUBY)
         class TestTextLimits < ActiveRecord::Migration[6.0]