2 files changed, 14 insertions, 19 deletions
diff --git a/spec/rubocop/cop/api/base_spec.rb b/spec/rubocop/cop/api/base_spec.rb
index de05ab93874..ec646b9991b 100644
--- a/spec/rubocop/cop/api/base_spec.rb
+++ b/spec/rubocop/cop/api/base_spec.rb
@@ -2,12 +2,9 @@
 
 require 'fast_spec_helper'
 require 'rubocop'
-require 'rubocop/rspec/support'
 require_relative '../../../../rubocop/cop/api/base'
 
 RSpec.describe RuboCop::Cop::API::Base do
-  include CopHelper
-
   subject(:cop) { described_class.new }
 
   let(:corrected) do
@@ -17,7 +14,7 @@ RSpec.describe RuboCop::Cop::API::Base do
     CORRECTED
   end
 
-  ['Grape::API', '::Grape::API', 'Grape::API::Instance', '::Grape::API::Instance'].each do |offense|
+  %w[Grape::API ::Grape::API Grape::API::Instance ::Grape::API::Instance].each do |offense|
     it "adds an offense when inheriting from #{offense}" do
       expect_offense(<<~CODE)
         class SomeAPI < #{offense}
diff --git a/spec/rubocop/cop/api/grape_array_missing_coerce_spec.rb b/spec/rubocop/cop/api/grape_array_missing_coerce_spec.rb
index c7bb8255398..b50866b54b3 100644
--- a/spec/rubocop/cop/api/grape_array_missing_coerce_spec.rb
+++ b/spec/rubocop/cop/api/grape_array_missing_coerce_spec.rb
@@ -5,36 +5,38 @@ require 'rubocop'
 require_relative '../../../../rubocop/cop/api/grape_array_missing_coerce'
 
 RSpec.describe RuboCop::Cop::API::GrapeArrayMissingCoerce do
-  include CopHelper
+  let(:msg) do
+    "This Grape parameter defines an Array but is missing a coerce_with definition. " \
+    "For more details, see " \
+    "https://github.com/ruby-grape/grape/blob/master/UPGRADING.md#ensure-that-array-types-have-explicit-coercions"
+  end
 
   subject(:cop) { described_class.new }
 
   it 'adds an offense with a required parameter' do
-    inspect_source(<<~CODE)
+    expect_offense(<<~TYPE)
       class SomeAPI < Grape::API::Instance
         params do
           requires :values, type: Array[String]
+          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ #{msg}
         end
       end
-    CODE
-
-    expect(cop.offenses.size).to eq(1)
+    TYPE
   end
 
   it 'adds an offense with an optional parameter' do
-    inspect_source(<<~CODE)
+    expect_offense(<<~TYPE)
       class SomeAPI < Grape::API::Instance
         params do
           optional :values, type: Array[String]
+          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ #{msg}
         end
       end
-    CODE
-
-    expect(cop.offenses.size).to eq(1)
+    TYPE
   end
 
   it 'does not add an offense' do
-    inspect_source(<<~CODE)
+    expect_no_offenses(<<~CODE)
       class SomeAPI < Grape::API::Instance
         params do
           requires :values, type: Array[String], coerce_with: ->(val) { val.split(',').map(&:strip) }
@@ -44,19 +46,15 @@ RSpec.describe RuboCop::Cop::API::GrapeArrayMissingCoerce do
         end
       end
     CODE
-
-    expect(cop.offenses.size).to be_zero
   end
 
   it 'does not add an offense for unrelated classes' do
-    inspect_source(<<~CODE)
+    expect_no_offenses(<<~CODE)
       class SomeClass
         params do
           requires :values, type: Array[String]
         end
       end
     CODE
-
-    expect(cop.offenses.size).to be_zero
   end
 end