1 files changed, 10 insertions, 24 deletions
diff --git a/spec/rubocop/cop/gitlab/httparty_spec.rb b/spec/rubocop/cop/gitlab/httparty_spec.rb
index b112ac84bff..fcd18b0eb9b 100644
--- a/spec/rubocop/cop/gitlab/httparty_spec.rb
+++ b/spec/rubocop/cop/gitlab/httparty_spec.rb
@@ -2,46 +2,30 @@
 
 require 'fast_spec_helper'
 require 'rubocop'
-require 'rubocop/rspec/support'
 require_relative '../../../../rubocop/cop/gitlab/httparty'
 
 RSpec.describe RuboCop::Cop::Gitlab::HTTParty do # rubocop:disable RSpec/FilePath
-  include CopHelper
-
   subject(:cop) { described_class.new }
 
-  shared_examples('registering include offense') do |options|
-    let(:offending_lines) { options[:offending_lines] }
-
+  shared_examples('registering include offense') do
     it 'registers an offense when the class includes HTTParty' do
-      inspect_source(source)
-
-      aggregate_failures do
-        expect(cop.offenses.size).to eq(offending_lines.size)
-        expect(cop.offenses.map(&:line)).to eq(offending_lines)
-      end
+      expect_offense(source)
     end
   end
 
-  shared_examples('registering call offense') do |options|
-    let(:offending_lines) { options[:offending_lines] }
-
+  shared_examples('registering call offense') do
     it 'registers an offense when the class calls HTTParty' do
-      inspect_source(source)
-
-      aggregate_failures do
-        expect(cop.offenses.size).to eq(offending_lines.size)
-        expect(cop.offenses.map(&:line)).to eq(offending_lines)
-      end
+      expect_offense(source)
     end
   end
 
   context 'when source is a regular module' do
-    it_behaves_like 'registering include offense', offending_lines: [2] do
+    it_behaves_like 'registering include offense' do
       let(:source) do
         <<~RUBY
           module M
             include HTTParty
+            ^^^^^^^^^^^^^^^^ Avoid including `HTTParty` directly. [...]
           end
         RUBY
       end
@@ -49,11 +33,12 @@ RSpec.describe RuboCop::Cop::Gitlab::HTTParty do # rubocop:disable RSpec/FilePat
   end
 
   context 'when source is a regular class' do
-    it_behaves_like 'registering include offense', offending_lines: [2] do
+    it_behaves_like 'registering include offense' do
       let(:source) do
         <<~RUBY
           class Foo
             include HTTParty
+            ^^^^^^^^^^^^^^^^ Avoid including `HTTParty` directly. [...]
           end
         RUBY
       end
@@ -61,12 +46,13 @@ RSpec.describe RuboCop::Cop::Gitlab::HTTParty do # rubocop:disable RSpec/FilePat
   end
 
   context 'when HTTParty is called' do
-    it_behaves_like 'registering call offense', offending_lines: [3] do
+    it_behaves_like 'registering call offense' do
       let(:source) do
         <<~RUBY
           class Foo
             def bar
               HTTParty.get('http://example.com')
+              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Avoid calling `HTTParty` directly. [...]
             end
           end
         RUBY