rubocop-rspec 2.0.0.pre → 2.3.0

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

@@ -23,8 +23,11 @@ module RuboCop
       class SharedExamples < Base
         extend AutoCorrector
 
+        # @!method shared_examples(node)
         def_node_matcher :shared_examples,
-                         (SharedGroups::ALL + Includes::ALL).send_pattern
+                         send_pattern(
+                           '{#SharedGroups.all #Includes.all}'
+                         )
 
         def on_send(node)
           shared_examples(node) do

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

@@ -19,13 +19,16 @@ module RuboCop
       class SingleArgumentMessageChain < Base
         extend AutoCorrector
 
-        MSG = 'Use `%<recommended>s` instead of calling '\
+        MSG = 'Use `%<recommended>s` instead of calling ' \
               '`%<called>s` with a single argument.'
+        RESTRICT_ON_SEND = %i[receive_message_chain stub_chain].freeze
 
+        # @!method message_chain(node)
         def_node_matcher :message_chain, <<-PATTERN
           (send _ {:receive_message_chain :stub_chain} $_)
         PATTERN
 
+        # @!method single_key_hash?(node)
         def_node_matcher :single_key_hash?, '(hash pair)'
 
         def on_send(node)

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

@@ -39,6 +39,7 @@ module RuboCop
           }
         PATTERN
 
+        # @!method configured_response?(node)
         def_node_matcher :configured_response?, <<~PATTERN
           { :and_return :and_raise :and_throw :and_yield
             :and_call_original :and_wrap_original }
@@ -60,7 +61,7 @@ module RuboCop
         #   @yield [RuboCop::AST::Node] expectation, method name, matcher
         def_node_matcher :expectation, <<~PATTERN
           (send
-            $(send nil? $#{Expectations::ALL.node_pattern_union} ...)
+            $(send nil? $#Expectations.all ...)
             :to $_)
         PATTERN
 

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

@@ -13,16 +13,26 @@ module RuboCop
       #
       # @example
       #   # bad
-      #   describe Foo do
-      #     subject(:bar) { baz }
+      #   describe Article do
+      #     subject(:article) { Article.new }
       #
-      #     before do
-      #       allow(bar).to receive(:qux?).and_return(true)
+      #     it 'indicates that the author is unknown' do
+      #       allow(article).to receive(:author).and_return(nil)
+      #       expect(article.description).to include('by an unknown author')
+      #     end
+      #   end
+      #
+      #   # good
+      #   describe Article do
+      #     subject(:article) { Article.new(author: nil) }
+      #
+      #     it 'indicates that the author is unknown' do
+      #       expect(article.description).to include('by an unknown author')
       #     end
       #   end
       #
       class SubjectStub < Base
-        include RuboCop::RSpec::TopLevelGroup
+        include TopLevelGroup
 
         MSG = 'Do not stub methods of the object under test.'
 
@@ -66,11 +76,12 @@ module RuboCop
               (send nil? { :expect :allow } (send nil? {% :subject}))
               (send nil? :is_expected)
             }
-            #{Runners::ALL.node_pattern_union}
+            #Runners.all
             #message_expectation_matcher?
           )
         PATTERN
 
+        # @!method message_expectation_matcher?(node)
         def_node_search :message_expectation_matcher?, <<-PATTERN
           (send nil? {
             :receive :receive_messages :receive_message_chain :have_received

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

@@ -32,7 +32,9 @@ module RuboCop
       #     expect { do_something }.not_to raise_error
       class UnspecifiedException < Base
         MSG = 'Specify the exception being captured'
+        RESTRICT_ON_SEND = %i[to].freeze
 
+        # @!method empty_raise_error_or_exception(node)
         def_node_matcher :empty_raise_error_or_exception, <<-PATTERN
           (send
             (block

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

@@ -24,7 +24,7 @@ module RuboCop
       #   let('user_name') { 'Adam' }
       class VariableDefinition < Base
         include ConfigurableEnforcedStyle
-        include RuboCop::RSpec::Variable
+        include Variable
 
         MSG = 'Use %<style>s for variable names.'
 

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

@@ -42,7 +42,7 @@ module RuboCop
       class VariableName < Base
         include ConfigurableNaming
         include IgnoredPattern
-        include RuboCop::RSpec::Variable
+        include Variable
 
         MSG = 'Use %<style>s for variable names.'
 

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

@@ -24,7 +24,9 @@ module RuboCop
       #   end
       class VerifiedDoubles < Base
         MSG = 'Prefer using verifying doubles over normal doubles.'
+        RESTRICT_ON_SEND = %i[double spy].freeze
 
+        # @!method unverified_double(node)
         def_node_matcher :unverified_double, <<-PATTERN
           {(send nil? {:double :spy} $...)}
         PATTERN

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

@@ -14,11 +14,14 @@ module RuboCop
       class VoidExpect < Base
         MSG = 'Do not use `expect()` without `.to` or `.not_to`. ' \
               'Chain the methods or remove it.'
+        RESTRICT_ON_SEND = %i[expect].freeze
 
+        # @!method expect?(node)
         def_node_matcher :expect?, <<-PATTERN
           (send nil? :expect ...)
         PATTERN
 
+        # @!method expect_block?(node)
         def_node_matcher :expect_block?, <<-PATTERN
           (block #expect? (args) _body)
         PATTERN

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

@@ -17,10 +17,13 @@ module RuboCop
 
         MSG = 'Use `.and_yield`.'
 
+        # @!method method_on_stub?(node)
         def_node_search :method_on_stub?, '(send nil? :receive ...)'
 
+        # @!method block_arg(node)
         def_node_matcher :block_arg, '(args (blockarg $_))'
 
+        # @!method block_call?(node)
         def_node_matcher :block_call?, '(send (lvar %) :call ...)'
 
         def on_block(node)

data/lib/rubocop/cop/rspec_cops.rb

@@ -52,7 +52,6 @@ require_relative 'rspec/implicit_expect'
 require_relative 'rspec/implicit_subject'
 require_relative 'rspec/instance_spy'
 require_relative 'rspec/instance_variable'
-require_relative 'rspec/invalid_predicate_matcher'
 require_relative 'rspec/it_behaves_like'
 require_relative 'rspec/iterated_expectation'
 require_relative 'rspec/leading_subject'

data/lib/rubocop/rspec/align_let_brace.rb

@@ -4,7 +4,7 @@ module RuboCop
   module RSpec
     # Shared behavior for aligning braces for single line lets
     class AlignLetBrace
-      include RuboCop::RSpec::Language::NodePattern
+      include RuboCop::RSpec::Language
 
       def initialize(root, token)
         @root  = root

data/lib/rubocop/rspec/concept.rb

@@ -4,9 +4,9 @@ module RuboCop
   module RSpec
     # Wrapper for RSpec DSL methods
     class Concept
+      extend RuboCop::NodePattern::Macros
+      extend Language::NodePattern
       include Language
-      include Language::NodePattern
-      extend NodePattern::Macros
 
       def initialize(node)
         @node = node

data/lib/rubocop/rspec/config_formatter.rb

@@ -6,7 +6,7 @@ module RuboCop
   module RSpec
     # Builds a YAML config file from two config hashes
     class ConfigFormatter
-      NAMESPACES = /^(RSpec|Capybara|FactoryBot|Rails)/.freeze
+      EXTENSION_ROOT_DEPARTMENT = %r{^(RSpec/)}.freeze
       STYLE_GUIDE_BASE_URL = 'https://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/'
 
       def initialize(config, descriptions)
@@ -15,7 +15,9 @@ module RuboCop
       end
 
       def dump
-        YAML.dump(unified_config).gsub(NAMESPACES, "\n\\1")
+        YAML.dump(unified_config)
+          .gsub(EXTENSION_ROOT_DEPARTMENT, "\n\\1")
+          .gsub(/^(\s+)- /, '\1  - ')
       end
 
       private
@@ -29,7 +31,7 @@ module RuboCop
       end
 
       def cops
-        (descriptions.keys | config.keys).grep(NAMESPACES)
+        (descriptions.keys | config.keys).grep(EXTENSION_ROOT_DEPARTMENT)
       end
 
       attr_reader :config, :descriptions

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

@@ -6,7 +6,8 @@ module RuboCop
       # Helper methods to move a node
       class MoveNode
         include RuboCop::Cop::RangeHelp
-        include RuboCop::RSpec::FinalEndLocation
+        include RuboCop::Cop::RSpec::CommentsHelp
+        include RuboCop::Cop::RSpec::FinalEndLocation
 
         attr_reader :original, :corrector, :processed_source
 
@@ -17,20 +18,16 @@ module RuboCop
         end
 
         def move_before(other)
-          position = other.loc.expression
-          indent = ' ' * other.loc.column
-          newline_indent = "\n#{indent}"
+          position = start_line_position(other)
 
-          corrector.insert_before(position, source(original) + newline_indent)
+          corrector.insert_before(position, "#{source(original)}\n")
           corrector.remove(node_range_with_surrounding_space(original))
         end
 
         def move_after(other)
-          position = final_end_location(other)
-          indent = ' ' * other.loc.column
-          newline_indent = "\n#{indent}"
+          position = end_line_position(other)
 
-          corrector.insert_after(position, newline_indent + source(original))
+          corrector.insert_after(position, "\n#{source(original)}")
           corrector.remove(node_range_with_surrounding_space(original))
         end
 
@@ -41,7 +38,7 @@ module RuboCop
         end
 
         def node_range(node)
-          node.loc.expression.with(end_pos: final_end_location(node).end_pos)
+          source_range_with_comment(node)
         end
 
         def node_range_with_surrounding_space(node)

data/lib/rubocop/rspec/example.rb

@@ -4,8 +4,13 @@ module RuboCop
   module RSpec
     # Wrapper for RSpec examples
     class Example < Concept
+      # @!method extract_doc_string(node)
       def_node_matcher :extract_doc_string,     '(send _ _ $_ ...)'
+
+      # @!method extract_metadata(node)
       def_node_matcher :extract_metadata,       '(send _ _ _ $...)'
+
+      # @!method extract_implementation(node)
       def_node_matcher :extract_implementation, '(block send args $_)'
 
       def doc_string

data/lib/rubocop/rspec/example_group.rb

@@ -10,9 +10,14 @@ module RuboCop
       #
       #   Selectors which indicate that we should stop searching
       #
-      def_node_matcher :scope_change?, (
-        ExampleGroups::ALL + SharedGroups::ALL + Includes::ALL
-      ).block_pattern
+      def_node_matcher :scope_change?,
+                       block_pattern(<<~PATTERN)
+                         {
+                           #SharedGroups.all
+                           #ExampleGroups.all
+                           #Includes.all
+                         }
+                       PATTERN
 
       def lets
         find_all_in_scope(node, :let?)
@@ -23,11 +28,15 @@ module RuboCop
       end
 
       def examples
-        find_all_in_scope(node, :example?).map(&Example.public_method(:new))
+        find_all_in_scope(node, :example?).map do |node|
+          Example.new(node)
+        end
       end
 
       def hooks
-        find_all_in_scope(node, :hook?).map(&Hook.public_method(:new))
+        find_all_in_scope(node, :hook?).map do |node|
+          Hook.new(node)
+        end
       end
 
       private
@@ -37,6 +46,7 @@ module RuboCop
       # Searches node and halts when a scope change is detected
       #
       # @param node [RuboCop::AST::Node] node to recursively search
+      # @param predicate [Symbol] method to call with node as argument
       #
       # @return [Array<RuboCop::AST::Node>] discovered nodes
       def find_all_in_scope(node, predicate)

data/lib/rubocop/rspec/hook.rb

@@ -4,6 +4,7 @@ module RuboCop
   module RSpec
     # Wrapper for RSpec hook
     class Hook < Concept
+      # @!method extract_metadata(node)
       def_node_matcher :extract_metadata, <<~PATTERN
         (block
           (send _ _ #valid_scope? ? $...) ...
@@ -44,7 +45,7 @@ module RuboCop
       private
 
       def valid_scope?(node)
-        node&.sym_type? && Hooks::Scopes::ALL.include?(node.value)
+        node&.sym_type? && Language::HookScopes.all(node.value)
       end
 
       def transform_metadata(meta)

data/lib/rubocop/rspec/inject.rb

@@ -6,9 +6,11 @@ module RuboCop
     # bit of our configuration.
     module Inject
       def self.defaults!
-        path = CONFIG_DEFAULT.to_s
+        project_root = Pathname.new(__dir__).parent.parent.parent.expand_path
+        config_default = project_root.join('config', 'default.yml')
+        path = config_default.to_s
         hash = ConfigLoader.send(:load_yaml_configuration, path)
-        config = Config.new(hash, path)
+        config = RuboCop::Config.new(hash, path)
         puts "configuration from #{path}" if ConfigLoader.debug?
         config = ConfigLoader.merge_with_default(config, path)
         ConfigLoader.instance_variable_set(:@default_configuration, config)

data/lib/rubocop/rspec/language.rb

@@ -2,152 +2,196 @@
 
 module RuboCop
   module RSpec
-    # RSpec public API methods that are commonly used in cops
+    # Contains node matchers for common RSpec DSL.
+    #
+    # RSpec allows for configuring aliases for commonly used DSL elements, e.g.
+    # example groups and hooks. It is possible to configure RuboCop RSpec to
+    # be able to properly detect these elements in the `RSpec/Language` section
+    # of the RuboCop YAML configuration file.
+    #
+    # In addition to providing useful matchers, this class is responsible for
+    # using the configured aliases.
     module Language
-      # Set of method selectors
-      class SelectorSet
-        def initialize(selectors)
-          @selectors = selectors.freeze
-          freeze
-        end
-
-        def ==(other)
-          selectors.eql?(other.selectors)
-        end
-
-        def +(other)
-          self.class.new(selectors + other.selectors)
-        end
-
-        def include?(selector)
-          selectors.include?(selector)
-        end
+      extend RuboCop::NodePattern::Macros
+      extend NodePattern
 
-        def block_pattern
-          "(block #{send_pattern} ...)"
-        end
-
-        def block_pass_pattern
-          "(send #rspec? #{node_pattern_union} _ block_pass)"
-        end
+      class << self
+        attr_accessor :config
+      end
 
-        def block_or_block_pass_pattern
-          "{#{block_pattern} #{block_pass_pattern}}"
+      # @!method rspec?(node)
+      def_node_matcher :rspec?, '{(const {nil? cbase} :RSpec) nil?}'
+
+      # @!method example_group?(node)
+      def_node_matcher :example_group?, block_pattern('#ExampleGroups.all')
+
+      # @!method shared_group?(node)
+      def_node_matcher :shared_group?, block_pattern('#SharedGroups.all')
+
+      # @!method spec_group?(node)
+      def_node_matcher :spec_group?,
+                       block_pattern('{#SharedGroups.all #ExampleGroups.all}')
+
+      # @!method example_group_with_body?(node)
+      def_node_matcher :example_group_with_body?, <<-PATTERN
+        (block #{send_pattern('#ExampleGroups.all')} args !nil?)
+      PATTERN
+
+      # @!method example?(node)
+      def_node_matcher :example?, block_pattern('#Examples.all')
+
+      # @!method hook?(node)
+      def_node_matcher :hook?, block_pattern('#Hooks.all')
+
+      # @!method let?(node)
+      def_node_matcher :let?, <<-PATTERN
+        {
+          #{block_pattern('#Helpers.all')}
+          (send #rspec? #Helpers.all _ block_pass)
+        }
+      PATTERN
+
+      # @!method include?(node)
+      def_node_matcher :include?, <<-PATTERN
+        {
+          #{send_pattern('#Includes.all')}
+          #{block_pattern('#Includes.all')}
+        }
+      PATTERN
+
+      # @!method subject?(node)
+      def_node_matcher :subject?, block_pattern('#Subjects.all')
+
+      module ExampleGroups # :nodoc:
+        class << self
+          def all(element)
+            regular(element) ||
+              skipped(element) ||
+              focused(element)
+          end
+
+          def regular(element)
+            Language.config['ExampleGroups']['Regular'].include?(element.to_s)
+          end
+
+          def focused(element)
+            Language.config['ExampleGroups']['Focused'].include?(element.to_s)
+          end
+
+          def skipped(element)
+            Language.config['ExampleGroups']['Skipped'].include?(element.to_s)
+          end
         end
+      end
 
-        def send_pattern
-          "(send #rspec? #{node_pattern_union} ...)"
+      module Examples # :nodoc:
+        class << self
+          def all(element)
+            regular(element) ||
+              focused(element) ||
+              skipped(element) ||
+              pending(element)
+          end
+
+          def regular(element)
+            Language.config['Examples']['Regular'].include?(element.to_s)
+          end
+
+          def focused(element)
+            Language.config['Examples']['Focused'].include?(element.to_s)
+          end
+
+          def skipped(element)
+            Language.config['Examples']['Skipped'].include?(element.to_s)
+          end
+
+          def pending(element)
+            Language.config['Examples']['Pending'].include?(element.to_s)
+          end
         end
+      end
 
-        def send_or_block_or_block_pass_pattern
-          "{#{send_pattern} #{block_pattern} #{block_pass_pattern}}"
+      module Expectations # :nodoc:
+        def self.all(element)
+          Language.config['Expectations'].include?(element.to_s)
         end
+      end
 
-        def node_pattern_union
-          "{#{node_pattern}}"
+      module Helpers # :nodoc:
+        def self.all(element)
+          Language.config['Helpers'].include?(element.to_s)
         end
+      end
 
-        def node_pattern
-          selectors.map(&:inspect).join(' ')
+      module Hooks # :nodoc:
+        def self.all(element)
+          Language.config['Hooks'].include?(element.to_s)
         end
+      end
 
-        def to_a
-          selectors
+      module HookScopes # :nodoc:
+        def self.all(element)
+          Language.config['HookScopes'].include?(element.to_s)
         end
-
-        protected
-
-        attr_reader :selectors
       end
 
-      module ExampleGroups
-        GROUPS  = SelectorSet.new(%i[describe context feature example_group])
-        SKIPPED = SelectorSet.new(%i[xdescribe xcontext xfeature])
-        FOCUSED = SelectorSet.new(%i[fdescribe fcontext ffeature])
+      module Includes # :nodoc:
+        class << self
+          def all(element)
+            examples(element) ||
+              context(element)
+          end
 
-        ALL = GROUPS + SKIPPED + FOCUSED
-      end
+          def examples(element)
+            Language.config['Includes']['Examples'].include?(element.to_s)
+          end
 
-      module SharedGroups
-        EXAMPLES = SelectorSet.new(%i[shared_examples shared_examples_for])
-        CONTEXT = SelectorSet.new(%i[shared_context])
-
-        ALL = EXAMPLES + CONTEXT
+          def context(element)
+            Language.config['Includes']['Context'].include?(element.to_s)
+          end
+        end
       end
 
-      module Includes
-        EXAMPLES = SelectorSet.new(
-          %i[
-            it_behaves_like
-            it_should_behave_like
-            include_examples
-          ]
-        )
-        CONTEXT = SelectorSet.new(%i[include_context])
-
-        ALL = EXAMPLES + CONTEXT
+      module Runners # :nodoc:
+        def self.all(element)
+          Language.config['Runners'].include?(element.to_s)
+        end
       end
 
-      module Examples
-        EXAMPLES = SelectorSet.new(%i[it specify example scenario its])
-        FOCUSED  = SelectorSet.new(%i[fit fspecify fexample fscenario focus])
-        SKIPPED  = SelectorSet.new(%i[xit xspecify xexample xscenario skip])
-        PENDING  = SelectorSet.new(%i[pending])
+      module SharedGroups # :nodoc:
+        class << self
+          def all(element)
+            examples(element) ||
+              context(element)
+          end
 
-        ALL = EXAMPLES + FOCUSED + SKIPPED + PENDING
-      end
+          def examples(element)
+            Language.config['SharedGroups']['Examples'].include?(element.to_s)
+          end
 
-      module Hooks
-        ALL = SelectorSet.new(
-          %i[
-            prepend_before
-            before
-            append_before
-            around
-            prepend_after
-            after
-            append_after
-          ]
-        )
-
-        module Scopes
-          ALL = SelectorSet.new(
-            %i[
-              each
-              example
-              context
-              all
-              suite
-            ]
-          )
+          def context(element)
+            Language.config['SharedGroups']['Context'].include?(element.to_s)
+          end
         end
       end
 
-      module Helpers
-        ALL = SelectorSet.new(%i[let let!])
-      end
-
-      module Subject
-        ALL = SelectorSet.new(%i[subject subject!])
-      end
-
-      module Expectations
-        ALL = SelectorSet.new(%i[expect is_expected expect_any_instance_of])
+      module Subjects # :nodoc:
+        def self.all(element)
+          Language.config['Subjects'].include?(element.to_s)
+        end
       end
 
-      module Runners
-        ALL = SelectorSet.new(%i[to to_not not_to])
+      # This is used in Dialect and DescribeClass cops to detect RSpec blocks.
+      module ALL # :nodoc:
+        def self.all(element)
+          [ExampleGroups, Examples, Expectations, Helpers, Hooks, Includes,
+           Runners, SharedGroups, Subjects]
+            .find { |concept| concept.all(element) }
+        end
       end
 
-      ALL =
-        ExampleGroups::ALL +
-        SharedGroups::ALL  +
-        Examples::ALL      +
-        Hooks::ALL         +
-        Helpers::ALL       +
-        Subject::ALL       +
-        Expectations::ALL  +
-        Runners::ALL
+      private_constant :ExampleGroups, :Examples, :Expectations, :Hooks,
+                       :Includes, :Runners, :SharedGroups, :ALL
     end
   end
 end