fixup! Change namespaces accordingly to path changes

lib/rubocop/cop/rspec/describe_class.rb

@@ -22,7 +22,7 @@ module RSpec
       #   describe "A feature example", type: :feature do
       #   end
       class DescribeClass < Cop
-        include RuboCop::RSpec::TopLevelDescribe
+        include TopLevelDescribe
 
         MSG = 'The first argument to describe should be '\
               'the class or module being tested.'

lib/rubocop/cop/rspec/describe_method.rb

@@ -17,7 +17,7 @@ module RSpec
       #   describe MyClass, '.my_class_method' do
       #   end
       class DescribeMethod < Cop
-        include RuboCop::RSpec::TopLevelDescribe
+        include TopLevelDescribe
 
         MSG = 'The second argument to describe should be the method '\
               "being tested. '#instance' or '.class'."

lib/rubocop/cop/rspec/empty_line_after_example.rb

@@ -42,7 +42,7 @@ module RSpec
       #   end
       #
       class EmptyLineAfterExample < Cop
-        include RuboCop::RSpec::BlankLineSeparation
+        include BlankLineSeparation
 
         MSG = 'Add an empty line after `%<example>s`.'
 

lib/rubocop/cop/rspec/empty_line_after_example_group.rb

@@ -24,7 +24,7 @@ module RSpec
       #   end
       #
       class EmptyLineAfterExampleGroup < Cop
-        include RuboCop::RSpec::BlankLineSeparation
+        include BlankLineSeparation
 
         MSG = 'Add an empty line after `%<example_group>s`.'
 

lib/rubocop/cop/rspec/empty_line_after_final_let.rb

@@ -17,7 +17,7 @@ module RSpec
       #
       #   it { does_something }
       class EmptyLineAfterFinalLet < Cop
-        include RuboCop::RSpec::BlankLineSeparation
+        include BlankLineSeparation
 
         MSG = 'Add an empty line after the last `let` block.'
 

lib/rubocop/cop/rspec/empty_line_after_hook.rb

@@ -34,7 +34,7 @@ module RSpec
       #   it { does_something }
       #
       class EmptyLineAfterHook < Cop
-        include RuboCop::RSpec::BlankLineSeparation
+        include BlankLineSeparation
 
         MSG = 'Add an empty line after `%<hook>s`.'
 

lib/rubocop/cop/rspec/empty_line_after_subject.rb

@@ -15,7 +15,7 @@ module RSpec
       #
       #   let(:foo) { bar }
       class EmptyLineAfterSubject < Cop
-        include RuboCop::RSpec::BlankLineSeparation
+        include BlankLineSeparation
 
         MSG = 'Add empty line after `subject`.'
 

lib/rubocop/cop/rspec/file_path.rb

@@ -57,7 +57,7 @@ module RSpec
       #   my_class_spec.rb         # describe MyClass, '#method'
       #
       class FilePath < Cop
-        include RuboCop::RSpec::TopLevelDescribe
+        include TopLevelDescribe
 
         MSG = 'Spec path should end with `%<suffix>s`.'
 

lib/rubocop/cop/rspec/instance_variable.rb

@@ -47,7 +47,7 @@ module RSpec
       #   end
       #
       class InstanceVariable < Cop
-        include RuboCop::RSpec::TopLevelGroup
+        include TopLevelGroup
 
         MSG = 'Avoid instance variables – use let, ' \
               'a method call, or a local variable (if possible).'

lib/rubocop/cop/rspec/mixin/blank_line_separation.rb

@@ -1,42 +1,44 @@
 # frozen_string_literal: true
 
 module RuboCop
-  module RSpec
-    # Helps determine the offending location if there is not a blank line
-    # following the node. Allows comments to follow directly after.
-    module BlankLineSeparation
-      include FinalEndLocation
-      include RuboCop::Cop::RangeHelp
+  module Cop
+    module RSpec
+      # Helps determine the offending location if there is not a blank line
+      # following the node. Allows comments to follow directly after.
+      module BlankLineSeparation
+        include FinalEndLocation
+        include RangeHelp
 
-      def missing_separating_line(node)
-        line = final_end_location(node).line
+        def missing_separating_line(node)
+          line = final_end_location(node).line
 
-        line += 1 while comment_line?(processed_source[line])
+          line += 1 while comment_line?(processed_source[line])
 
-        return if processed_source[line].blank?
+          return if processed_source[line].blank?
 
-        yield offending_loc(line)
-      end
+          yield offending_loc(line)
+        end
 
-      def offending_loc(last_line)
-        offending_line = processed_source[last_line - 1]
+        def offending_loc(last_line)
+          offending_line = processed_source[last_line - 1]
 
-        content_length = offending_line.lstrip.length
-        start          = offending_line.length - content_length
+          content_length = offending_line.lstrip.length
+          start          = offending_line.length - content_length
 
-        source_range(processed_source.buffer, last_line, start, content_length)
-      end
+          source_range(processed_source.buffer, last_line, start, content_length)
+        end
 
-      def last_child?(node)
-        return true unless node.parent&.begin_type?
+        def last_child?(node)
+          return true unless node.parent&.begin_type?
 
-        node.equal?(node.parent.children.last)
-      end
+          node.equal?(node.parent.children.last)
+        end
 
-      def autocorrect(node)
-        lambda do |corrector|
-          missing_separating_line(node) do |location|
-            corrector.insert_after(location.end, "\n")
+        def autocorrect(node)
+          lambda do |corrector|
+            missing_separating_line(node) do |location|
+              corrector.insert_after(location.end, "\n")
+            end
           end
         end
       end

lib/rubocop/cop/rspec/mixin/final_end_location.rb

@@ -1,16 +1,18 @@
 # frozen_string_literal: true
 
 module RuboCop
-  module RSpec
-    # Helps find the true end location of nodes which might contain heredocs.
-    module FinalEndLocation
-      def final_end_location(start_node)
-        heredoc_endings =
-          start_node.each_node(:str, :dstr, :xstr)
-            .select(&:heredoc?)
-            .map { |node| node.loc.heredoc_end }
+  module Cop
+    module RSpec
+      # Helps find the true end location of nodes which might contain heredocs.
+      module FinalEndLocation
+        def final_end_location(start_node)
+          heredoc_endings =
+            start_node.each_node(:str, :dstr, :xstr)
+              .select(&:heredoc?)
+              .map { |node| node.loc.heredoc_end }
 
-        [start_node.loc.end, *heredoc_endings].max_by(&:line)
+          [start_node.loc.end, *heredoc_endings].max_by(&:line)
+        end
       end
     end
   end

lib/rubocop/cop/rspec/mixin/top_level_describe.rb

@@ -1,50 +1,52 @@
 # frozen_string_literal: true
 
 module RuboCop
-  module RSpec
-    # Helper methods for top level describe cops
-    module TopLevelDescribe
-      extend NodePattern::Macros
+  module Cop
+    module RSpec
+      # Helper methods for top level describe cops
+      module TopLevelDescribe
+        extend NodePattern::Macros
 
-      def on_send(node)
-        return unless respond_to?(:on_top_level_describe)
-        return unless top_level_describe?(node)
+        def on_send(node)
+          return unless respond_to?(:on_top_level_describe)
+          return unless top_level_describe?(node)
 
-        on_top_level_describe(node, node.arguments)
-      end
+          on_top_level_describe(node, node.arguments)
+        end
 
-      private
+        private
 
-      def top_level_describe?(node)
-        return false unless node.method_name == :describe
+        def top_level_describe?(node)
+          return false unless node.method_name == :describe
 
-        top_level_nodes.include?(node)
-      end
+          top_level_nodes.include?(node)
+        end
 
-      def top_level_nodes
-        nodes = describe_statement_children(root_node)
-        # If we have no top level describe statements, we need to check any
-        # blocks on the top level (e.g. after a require).
-        if nodes.empty?
-          nodes = root_node.each_child_node(:block).flat_map do |child|
-            describe_statement_children(child)
+        def top_level_nodes
+          nodes = describe_statement_children(root_node)
+          # If we have no top level describe statements, we need to check any
+          # blocks on the top level (e.g. after a require).
+          if nodes.empty?
+            nodes = root_node.each_child_node(:block).flat_map do |child|
+              describe_statement_children(child)
+            end
           end
-        end
 
-        nodes
-      end
+          nodes
+        end
 
-      def root_node
-        processed_source.ast
-      end
+        def root_node
+          processed_source.ast
+        end
 
-      def single_top_level_describe?
-        top_level_nodes.one?
-      end
+        def single_top_level_describe?
+          top_level_nodes.one?
+        end
 
-      def describe_statement_children(node)
-        node.each_child_node(:send).select do |element|
-          element.method_name == :describe
+        def describe_statement_children(node)
+          node.each_child_node(:send).select do |element|
+            element.method_name == :describe
+          end
         end
       end
     end

lib/rubocop/cop/rspec/mixin/top_level_group.rb

@@ -1,43 +1,45 @@
 # frozen_string_literal: true
 
 module RuboCop
-  module RSpec
-    # Helper methods for top level example group cops
-    module TopLevelGroup
-      extend RuboCop::NodePattern::Macros
-      include RuboCop::RSpec::Language
+  module Cop
+    module RSpec
+      # Helper methods for top level example group cops
+      module TopLevelGroup
+        extend RuboCop::NodePattern::Macros
+        include RuboCop::RSpec::Language
 
-      def_node_matcher :example_or_shared_group?,
-                       (ExampleGroups::ALL + SharedGroups::ALL).block_pattern
+        def_node_matcher :example_or_shared_group?,
+                         (ExampleGroups::ALL + SharedGroups::ALL).block_pattern
 
-      def on_block(node)
-        return unless respond_to?(:on_top_level_group)
-        return unless top_level_group?(node)
+        def on_block(node)
+          return unless respond_to?(:on_top_level_group)
+          return unless top_level_group?(node)
 
-        on_top_level_group(node)
-      end
+          on_top_level_group(node)
+        end
 
-      private
+        private
 
-      def top_level_group?(node)
-        top_level_groups.include?(node)
-      end
+        def top_level_group?(node)
+          top_level_groups.include?(node)
+        end
 
-      def top_level_groups
-        @top_level_groups ||=
-          top_level_nodes.select { |n| example_or_shared_group?(n) }
-      end
+        def top_level_groups
+          @top_level_groups ||=
+            top_level_nodes.select { |n| example_or_shared_group?(n) }
+        end
 
-      def top_level_nodes
-        if root_node.begin_type?
-          root_node.children
-        else
-          [root_node]
+        def top_level_nodes
+          if root_node.begin_type?
+            root_node.children
+          else
+            [root_node]
+          end
         end
-      end
 
-      def root_node
-        processed_source.ast
+        def root_node
+          processed_source.ast
+        end
       end
     end
   end

lib/rubocop/cop/rspec/mixin/variable.rb

@@ -1,16 +1,18 @@
 # frozen_string_literal: true
 
 module RuboCop
-  module RSpec
-    # Helps check offenses with variable definitions
-    module Variable
-      include Language
-      extend RuboCop::NodePattern::Macros
+  module Cop
+    module RSpec
+      # Helps check offenses with variable definitions
+      module Variable
+        include RuboCop::RSpec::Language
+        extend RuboCop::NodePattern::Macros
 
-      def_node_matcher :variable_definition?, <<~PATTERN
-        (send #{RSPEC} #{(Helpers::ALL + Subject::ALL).node_pattern_union}
-          $({sym str dsym dstr} ...) ...)
-      PATTERN
+        def_node_matcher :variable_definition?, <<~PATTERN
+          (send #{RSPEC} #{(Helpers::ALL + Subject::ALL).node_pattern_union}
+            $({sym str dsym dstr} ...) ...)
+        PATTERN
+      end
     end
   end
 end

lib/rubocop/cop/rspec/multiple_describes.rb

@@ -23,7 +23,7 @@ module RSpec
       #     end
       #   end
       class MultipleDescribes < Cop
-        include RuboCop::RSpec::TopLevelDescribe
+        include TopLevelDescribe
 
         MSG = 'Do not use multiple top level describes - '\
               'try to nest them.'

lib/rubocop/cop/rspec/nested_groups.rb

@@ -87,7 +87,7 @@ module RSpec
       #
       class NestedGroups < Cop
         include ConfigurableMax
-        include RuboCop::RSpec::TopLevelDescribe
+        include TopLevelDescribe
 
         MSG = 'Maximum example group nesting exceeded [%<total>d/%<max>d].'
 

lib/rubocop/cop/rspec/subject_stub.rb

@@ -22,7 +22,7 @@ module RSpec
       #   end
       #
       class SubjectStub < Cop
-        include RuboCop::RSpec::TopLevelGroup
+        include TopLevelGroup
 
         MSG = 'Do not stub methods of the object under test.'