rubocop-rspec 1.42.0 → 1.43.0

data/lib/rubocop/cop/rspec/scattered_let.rb

@@ -26,7 +26,7 @@ module RuboCop
       #     let!(:baz) { 3 }
       #   end
       #
-      class ScatteredLet < Cop
+      class ScatteredLet < Base
         extend AutoCorrector
 
         MSG = 'Group all let/let! blocks in the example group together.'

data/lib/rubocop/cop/rspec/scattered_setup.rb

@@ -22,7 +22,7 @@ module RuboCop
       #     end
       #   end
       #
-      class ScatteredSetup < Cop
+      class ScatteredSetup < Base
         MSG = 'Do not define multiple `%<hook_name>s` hooks in the same '\
               'example group (also defined on %<lines>s).'
 

data/lib/rubocop/cop/rspec/shared_context.rb

@@ -50,7 +50,7 @@ module RuboCop
       #     end
       #   end
       #
-      class SharedContext < Cop
+      class SharedContext < Base
         extend AutoCorrector
 
         MSG_EXAMPLES = "Use `shared_examples` when you don't "\

data/lib/rubocop/cop/rspec/shared_examples.rb

@@ -20,7 +20,7 @@ module RuboCop
       #   shared_examples_for 'foo bar baz'
       #   include_examples 'foo bar baz'
       #
-      class SharedExamples < Cop
+      class SharedExamples < Base
         extend AutoCorrector
 
         def_node_matcher :shared_examples,

data/lib/rubocop/cop/rspec/single_argument_message_chain.rb

@@ -16,7 +16,7 @@ module RuboCop
       #   allow(foo).to receive(:bar, :baz)
       #   allow(foo).to receive("bar.baz")
       #
-      class SingleArgumentMessageChain < Cop
+      class SingleArgumentMessageChain < Base
         extend AutoCorrector
 
         MSG = 'Use `%<recommended>s` instead of calling '\

data/lib/rubocop/cop/rspec/subject_stub.rb

@@ -21,7 +21,7 @@ module RuboCop
       #     end
       #   end
       #
-      class SubjectStub < Cop
+      class SubjectStub < Base
         include RuboCop::RSpec::TopLevelGroup
 
         MSG = 'Do not stub methods of the object under test.'
@@ -39,7 +39,7 @@ module RuboCop
         #       name # => :thing
         #     end
         #
-        #   @param node [RuboCop::Node]
+        #   @param node [RuboCop::AST::Node]
         #
         #   @yield [Symbol] subject name
         def_node_matcher :subject, <<-PATTERN

data/lib/rubocop/cop/rspec/unspecified_exception.rb

@@ -30,7 +30,7 @@ module RuboCop
       #     }.to raise_error(/err/)
       #
       #     expect { do_something }.not_to raise_error
-      class UnspecifiedException < Cop
+      class UnspecifiedException < Base
         MSG = 'Specify the exception being captured'
 
         def_node_matcher :empty_raise_error_or_exception, <<-PATTERN

data/lib/rubocop/cop/rspec/variable_definition.rb

@@ -7,22 +7,22 @@ module RuboCop
       #
       # @example EnforcedStyle: symbols (default)
       #   # bad
-      #   let('user_name') { 'Adam' }
       #   subject('user') { create_user }
+      #   let('user_name') { 'Adam' }
       #
       #   # good
-      #   let(:user_name) { 'Adam' }
       #   subject(:user) { create_user }
+      #   let(:user_name) { 'Adam' }
       #
       # @example EnforcedStyle: strings
       #   # bad
-      #   let(:user_name) { 'Adam' }
       #   subject(:user) { create_user }
+      #   let(:user_name) { 'Adam' }
       #
       #   # good
-      #   let('user_name') { 'Adam' }
       #   subject('user') { create_user }
-      class VariableDefinition < Cop
+      #   let('user_name') { 'Adam' }
+      class VariableDefinition < Base
         include ConfigurableEnforcedStyle
         include RuboCop::RSpec::Variable
 
@@ -44,7 +44,7 @@ module RuboCop
         end
 
         def string?(node)
-          node.str_type? || node.dstr_type?
+          node.str_type?
         end
 
         def symbol?(node)

data/lib/rubocop/cop/rspec/variable_name.rb

@@ -5,25 +5,43 @@ module RuboCop
     module RSpec
       # Checks that memoized helper names use the configured style.
       #
+      # Variables can be excluded from checking using the `IgnoredPatterns`
+      # option.
+      #
       # @example EnforcedStyle: snake_case (default)
       #   # bad
-      #   let(:userName) { 'Adam' }
-      #   subject(:userName) { 'Adam' }
+      #   subject(:userName1) { 'Adam' }
+      #   let(:userName2) { 'Adam' }
       #
       #   # good
-      #   let(:user_name) { 'Adam' }
-      #   subject(:user_name) { 'Adam' }
+      #   subject(:user_name_1) { 'Adam' }
+      #   let(:user_name_2) { 'Adam' }
       #
       # @example EnforcedStyle: camelCase
       #   # bad
-      #   let(:user_name) { 'Adam' }
-      #   subject(:user_name) { 'Adam' }
+      #   subject(:user_name_1) { 'Adam' }
+      #   let(:user_name_2) { 'Adam' }
       #
       #   # good
-      #   let(:userName) { 'Adam' }
-      #   subject(:userName) { 'Adam' }
-      class VariableName < Cop
+      #   subject(:userName1) { 'Adam' }
+      #   let(:userName2) { 'Adam' }
+      #
+      # @example IgnoredPatterns configuration
+      #
+      #   # rubocop.yml
+      #   # RSpec/VariableName:
+      #   #   EnforcedStyle: snake_case
+      #   #   IgnoredPatterns:
+      #   #     - ^userFood
+      #
+      # @example
+      #   # okay because it matches the `^userFood` regex in `IgnoredPatterns`
+      #   subject(:userFood_1) { 'spaghetti' }
+      #   let(:userFood_2) { 'fettuccine' }
+      #
+      class VariableName < Base
         include ConfigurableNaming
+        include IgnoredPattern
         include RuboCop::RSpec::Variable
 
         MSG = 'Use %<style>s for variable names.'
@@ -31,6 +49,7 @@ module RuboCop
         def on_send(node)
           variable_definition?(node) do |variable|
             return if variable.dstr_type? || variable.dsym_type?
+            return if matches_ignored_pattern?(variable.value)
 
             check_name(node, variable.value, variable.loc.expression)
           end

data/lib/rubocop/cop/rspec/verified_doubles.rb

@@ -22,7 +22,7 @@ module RuboCop
       #   let(:foo) do
       #     instance_double("ClassName", method_name: 'returned value')
       #   end
-      class VerifiedDoubles < Cop
+      class VerifiedDoubles < Base
         MSG = 'Prefer using verifying doubles over normal doubles.'
 
         def_node_matcher :unverified_double, <<-PATTERN

data/lib/rubocop/cop/rspec/void_expect.rb

@@ -11,7 +11,7 @@ module RuboCop
       #
       #   # good
       #   expect(something).to be(1)
-      class VoidExpect < Cop
+      class VoidExpect < Base
         MSG = 'Do not use `expect()` without `.to` or `.not_to`. ' \
               'Chain the methods or remove it.'
 

data/lib/rubocop/cop/rspec/yield.rb

@@ -11,7 +11,7 @@ module RuboCop
       #
       #   # good
       #   expect(foo).to be(:bar).and_yield(1)
-      class Yield < Cop
+      class Yield < Base
         extend AutoCorrector
         include RangeHelp
 

data/lib/rubocop/cop/rspec_cops.rb

@@ -65,6 +65,7 @@ require_relative 'rspec/message_spies'
 require_relative 'rspec/missing_example_group_argument'
 require_relative 'rspec/multiple_describes'
 require_relative 'rspec/multiple_expectations'
+require_relative 'rspec/multiple_memoized_helpers'
 require_relative 'rspec/multiple_subjects'
 require_relative 'rspec/named_subject'
 require_relative 'rspec/nested_groups'

data/lib/rubocop/rspec/corrector/move_node.rb

@@ -16,19 +16,21 @@ module RuboCop
           @processed_source = processed_source # used by RangeHelp
         end
 
-        def move_before(other) # rubocop:disable Metrics/AbcSize
+        def move_before(other)
           position = other.loc.expression
-          indent = "\n" + ' ' * other.loc.column
+          indent = ' ' * other.loc.column
+          newline_indent = "\n#{indent}"
 
-          corrector.insert_before(position, source(original) + indent)
+          corrector.insert_before(position, source(original) + newline_indent)
           corrector.remove(node_range_with_surrounding_space(original))
         end
 
         def move_after(other)
           position = final_end_location(other)
-          indent = "\n" + ' ' * other.loc.column
+          indent = ' ' * other.loc.column
+          newline_indent = "\n#{indent}"
 
-          corrector.insert_after(position, indent + source(original))
+          corrector.insert_after(position, newline_indent + source(original))
           corrector.remove(node_range_with_surrounding_space(original))
         end
 

data/lib/rubocop/rspec/description_extractor.rb

@@ -21,7 +21,7 @@ module RuboCop
 
       # Decorator of a YARD code object for working with documented rspec cops
       class CodeObject
-        COP_CLASS_NAME = 'RuboCop::Cop::RSpec::Cop'
+        COP_CLASS_NAME = 'RuboCop::Cop::RSpec::Base'
         RSPEC_NAMESPACE = 'RuboCop::Cop::RSpec'
 
         def initialize(yardoc)

data/lib/rubocop/rspec/{blank_line_separation.rb → empty_line_separation.rb}

@@ -2,12 +2,23 @@
 
 module RuboCop
   module RSpec
-    # Helps determine the offending location if there is not a blank line
+    # Helps determine the offending location if there is not an empty line
     # following the node. Allows comments to follow directly after.
-    module BlankLineSeparation
+    module EmptyLineSeparation
       include FinalEndLocation
       include RuboCop::Cop::RangeHelp
 
+      def missing_separating_line_offense(node)
+        return if last_child?(node)
+
+        missing_separating_line(node) do |location|
+          msg = yield(node.method_name)
+          add_offense(location, message: msg) do |corrector|
+            corrector.insert_after(location.end, "\n")
+          end
+        end
+      end
+
       def missing_separating_line(node)
         line = final_end_location(node).line
 

data/lib/rubocop/rspec/example_group.rb

@@ -36,9 +36,9 @@ module RuboCop
       #
       # Searches node and halts when a scope change is detected
       #
-      # @param node [RuboCop::Node] node to recursively search
+      # @param node [RuboCop::AST::Node] node to recursively search
       #
-      # @return [Array<RuboCop::Node>] discovered nodes
+      # @return [Array<RuboCop::AST::Node>] discovered nodes
       def find_all_in_scope(node, predicate)
         node.each_child_node.flat_map do |child|
           find_all(child, predicate)

data/lib/rubocop/rspec/language.rb

@@ -4,8 +4,6 @@ module RuboCop
   module RSpec
     # RSpec public API methods that are commonly used in cops
     module Language
-      RSPEC = '{(const {nil? cbase} :RSpec) nil?}'
-
       # Set of method selectors
       class SelectorSet
         def initialize(selectors)
@@ -29,7 +27,7 @@ module RuboCop
         end
 
         def block_pass_pattern
-          "(send #{RSPEC} #{node_pattern_union} _ block_pass)"
+          "(send #rspec? #{node_pattern_union} _ block_pass)"
         end
 
         def block_or_block_pass_pattern
@@ -37,7 +35,11 @@ module RuboCop
         end
 
         def send_pattern
-          "(send #{RSPEC} #{node_pattern_union} ...)"
+          "(send #rspec? #{node_pattern_union} ...)"
+        end
+
+        def send_or_block_or_block_pass_pattern
+          "{#{send_pattern} #{block_pattern} #{block_pass_pattern}}"
         end
 
         def node_pattern_union

data/lib/rubocop/rspec/language/node_pattern.rb

@@ -7,6 +7,8 @@ module RuboCop
       module NodePattern
         extend RuboCop::NodePattern::Macros
 
+        def_node_matcher :rspec?, '{(const {nil? cbase} :RSpec) nil?}'
+
         def_node_matcher :example_group?, ExampleGroups::ALL.block_pattern
         def_node_matcher :shared_group?, SharedGroups::ALL.block_pattern
 
@@ -14,7 +16,7 @@ module RuboCop
         def_node_matcher :spec_group?, spec_groups.block_pattern
 
         def_node_matcher :example_group_with_body?, <<-PATTERN
-          (block #{ExampleGroups::ALL.send_pattern} args [!nil?])
+          (block #{ExampleGroups::ALL.send_pattern} args !nil?)
         PATTERN
 
         def_node_matcher :example?, Examples::ALL.block_pattern
@@ -23,6 +25,9 @@ module RuboCop
 
         def_node_matcher :let?, Helpers::ALL.block_or_block_pass_pattern
 
+        def_node_matcher :include?,
+                         Includes::ALL.send_or_block_or_block_pass_pattern
+
         def_node_matcher :subject?, Subject::ALL.block_pattern
       end
     end

data/lib/rubocop/rspec/top_level_describe.rb

@@ -16,7 +16,7 @@ module RuboCop
       private
 
       def top_level_describe?(node)
-        return false unless node.method_name == :describe
+        return false unless node.method?(:describe)
 
         top_level_nodes.include?(node)
       end
@@ -44,7 +44,7 @@ module RuboCop
 
       def describe_statement_children(node)
         node.each_child_node(:send).select do |element|
-          element.method_name == :describe
+          element.method?(:describe)
         end
       end
     end

data/lib/rubocop/rspec/top_level_group.rb

@@ -10,29 +10,40 @@ module RuboCop
       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_new_investigation
+        super
 
-        on_top_level_group(node)
+        return unless root_node
+
+        top_level_groups.each do |node|
+          example_group?(node, &method(:on_top_level_example_group))
+          on_top_level_group(node)
+        end
+      end
+
+      def top_level_groups
+        @top_level_groups ||=
+          top_level_nodes(root_node).select { |n| example_or_shared_group?(n) }
       end
 
       private
 
+      # Dummy methods to be overridden in the consumer
+      def on_top_level_example_group; end
+
+      def on_top_level_group; 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_nodes
-        if root_node.begin_type?
-          root_node.children
+      def top_level_nodes(node)
+        if node.begin_type?
+          node.children
+        elsif node.module_type? || node.class_type?
+          top_level_nodes(node.body)
         else
-          [root_node]
+          [node]
         end
       end
 

data/lib/rubocop/rspec/variable.rb

@@ -8,7 +8,7 @@ module RuboCop
       extend RuboCop::NodePattern::Macros
 
       def_node_matcher :variable_definition?, <<~PATTERN
-        (send #{RSPEC} #{(Helpers::ALL + Subject::ALL).node_pattern_union}
+        (send nil? #{(Helpers::ALL + Subject::ALL).node_pattern_union}
           $({sym str dsym dstr} ...) ...)
       PATTERN
     end

data/lib/rubocop/rspec/version.rb

@@ -4,7 +4,7 @@ module RuboCop
   module RSpec
     # Version information for the RSpec RuboCop plugin.
     module Version
-      STRING = '1.42.0'
+      STRING = '1.43.0'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rspec
 version: !ruby/object:Gem::Version
-  version: 1.42.0
+  version: 1.43.0
 platform: ruby
 authors:
 - John Backus
@@ -10,22 +10,22 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-09 00:00:00.000000000 Z
+date: 2020-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.87.0
+        version: '0.87'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.87.0
+        version: '0.87'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -68,6 +68,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -119,6 +133,7 @@ files:
 - lib/rubocop/cop/rspec/align_right_let_brace.rb
 - lib/rubocop/cop/rspec/any_instance.rb
 - lib/rubocop/cop/rspec/around_block.rb
+- lib/rubocop/cop/rspec/base.rb
 - lib/rubocop/cop/rspec/be.rb
 - lib/rubocop/cop/rspec/be_eql.rb
 - lib/rubocop/cop/rspec/before_after_all.rb
@@ -173,6 +188,7 @@ files:
 - lib/rubocop/cop/rspec/missing_example_group_argument.rb
 - lib/rubocop/cop/rspec/multiple_describes.rb
 - lib/rubocop/cop/rspec/multiple_expectations.rb
+- lib/rubocop/cop/rspec/multiple_memoized_helpers.rb
 - lib/rubocop/cop/rspec/multiple_subjects.rb
 - lib/rubocop/cop/rspec/named_subject.rb
 - lib/rubocop/cop/rspec/nested_groups.rb
@@ -203,11 +219,11 @@ files:
 - lib/rubocop/cop/rspec_cops.rb
 - lib/rubocop/rspec.rb
 - lib/rubocop/rspec/align_let_brace.rb
-- lib/rubocop/rspec/blank_line_separation.rb
 - lib/rubocop/rspec/concept.rb
 - lib/rubocop/rspec/config_formatter.rb
 - lib/rubocop/rspec/corrector/move_node.rb
 - lib/rubocop/rspec/description_extractor.rb
+- lib/rubocop/rspec/empty_line_separation.rb
 - lib/rubocop/rspec/example.rb
 - lib/rubocop/rspec/example_group.rb
 - lib/rubocop/rspec/factory_bot.rb