Merge branch 'rs-fix-codeclimate-build' into 'master'

Require rubocop-rspec in the correct location

See merge request !12174

rubocop/cop/rspec/single_line_hook.rb

+require 'rubocop-rspec'
+
 module RuboCop
   module Cop
     module RSpec
@@ -17,7 +19,7 @@ module RuboCop
       #   after(:each) do
       #     undo_something
       #   end
-      class SingleLineHook < RuboCop::Cop::RSpec::Cop
+      class SingleLineHook < Cop
         MESSAGE = "Don't use single-line hook blocks.".freeze
 
         def_node_search :rspec_hook?, <<~PATTERN

spec/rubocop/cop/rspec/single_line_hook_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 require 'rubocop'
 require 'rubocop/rspec/support'
-require 'rubocop-rspec'
 
 require_relative '../../../../rubocop/cop/rspec/single_line_hook'