rubocop-rspec 2.10.0 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d0bedaa464141123a49b02ad1a31ed8a63b9960304014c0ef5e52f96fb78176
-  data.tar.gz: e310236f596a19629629c70d9f94fcb46a39183c43908b5864860efb2abd7602
+  metadata.gz: 06d6fd83af093abc4da74f5791334c364b86c8238610e53890f4b197f97ce1b6
+  data.tar.gz: 3e40ac4c4e15bee0892061da115755ad8a9cc872218b8cf2d8fe166ea40c6f83
 SHA512:
-  metadata.gz: 7cd82a374f1cd9362070fe6561f9c04927a2ac33f5e1b5ee97a80bc443b0a4c3c90a75d93778e7bf6f439ff759b60857cdeccc2a7b51bfdc8feebccc519e36c8
-  data.tar.gz: 19bbbdd2d38ef4802be62f44a18e95e83caaf6899c654dff281fe7058fc9bdf6f776cf0491b825b274f67450388a7aef292c2ee51033f6ae96a9d8671829c5e4
+  metadata.gz: d84bfa56ac9503ad57e0dea9e5207469a3acf8d086e1ef0bf3f8239a9a704f4ce40e7ce82e10596699d948217ff55347098e0421af042e3653e6e3ea0b7e3593
+  data.tar.gz: c643ac0b7e06972fb90347dff8684b4c94e08ca3e9a85a5406bf87c3ce6f88f4395e878dce7fae224049127cc53dcb4639e6fb5d5d6134da9fd4dff6013480ca

data/CHANGELOG.md

@@ -2,6 +2,28 @@
 
 ## Master (Unreleased)
 
+## 2.12.0 (2022-07-02)
+
+* Fix incorrect path suggested by `RSpec/FilePath` cop when second argument contains spaces. ([@tejasbubane][])
+* Fix autocorrect for EmptyLineSeparation. ([@johnny-miyake][])
+* Add new `RSpec/Capybara/SpecificMatcher` cop. ([@ydah][])
+* Fixed false offense detection in `FactoryBot/CreateList` when a n.times block is including method calls in the factory create arguments. ([@ngouy][])
+* Fix error in `RSpec/RSpec/FactoryBot/CreateList` cop for empty block. ([@tejasbubane][])
+* Update `RSpec/MultipleExpectations` cop documentation with examples of aggregate_failures use. ([@edgibbs][])
+* Declare autocorrect as unsafe for `RSpec/VerifiedDoubleReference`. ([@Drowze][])
+* Add new `RSpec/Rails/HaveHttpStatus` cop. ([@akiomik][])
+
+## 2.11.1 (2022-05-18)
+
+* Fix a regression in `RSpec/ExpectChange` flagging chained method calls. ([@pirj][])
+
+## 2.11.0 (2022-05-18)
+
+* Drop Ruby 2.5 support. ([@ydah][])
+* Add new `RSpec/ChangeByZero` cop. ([@ydah][])
+* Improve `RSpec/ExpectChange` to detect namespaced and top-level constants. ([@M-Yamashita01][])
+* Introduce an amendment to `Metrics/BlockLength` to exclude spec files. ([@luke-hill][])
+
 ## 2.10.0 (2022-04-19)
 
 * Fix a false positive for `RSpec/EmptyExampleGroup` when expectations in case statement. ([@ydah][])
@@ -681,3 +703,10 @@ Compatibility release so users can upgrade RuboCop to 0.51.0. No new features.
 [@oshiro3]: https://github.com/oshiro3
 [@ydah]: https://github.com/ydah
 [@t3h2mas]: https://github.com/t3h2mas
+[@M-Yamashita01]: https://github.com/M-Yamashita01
+[@luke-hill]: https://github.com/luke-hill
+[@johnny-miyake]: https://github.com/johnny-miyake
+[@ngouy]: https://github.com/ngouy
+[@edgibbs]: https://github.com/edgibbs
+[@Drowze]: https://github.com/Drowze
+[@akiomik]: https://github.com/akiomik

data/config/default.yml

@@ -110,6 +110,14 @@ RSpec:
       - subject
       - subject!
 
+Metrics/BlockLength:
+  inherit_mode:
+    merge:
+      - Exclude
+  Exclude:
+    - "**/*_spec.rb"
+    - "**/spec/**/*"
+
 RSpec/AlignLeftLetBrace:
   Description: Checks that left braces for adjacent single line lets are aligned.
   Enabled: false
@@ -176,6 +184,12 @@ RSpec/BeforeAfterAll:
   StyleGuide: https://rspec.rubystyle.guide/#avoid-hooks-with-context-scope
   Reference: https://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/BeforeAfterAll
 
+RSpec/ChangeByZero:
+  Description: Prefer negated matchers over `to change.by(0)`.
+  Enabled: pending
+  VersionAdded: 2.11.0
+  Reference: https://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/ChangeByZero
+
 RSpec/ContextMethod:
   Description: "`context` should not be used for specifying methods."
   Enabled: true
@@ -256,7 +270,7 @@ RSpec/DescribedClassModuleWrapping:
   Reference: https://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/DescribedClassModuleWrapping
 
 RSpec/Dialect:
-  Description: This cop enforces custom RSpec dialects.
+  Description: Enforces custom RSpec dialects.
   Enabled: false
   PreferredMethods: {}
   VersionAdded: '1.33'
@@ -769,11 +783,13 @@ RSpec/VariableName:
 RSpec/VerifiedDoubleReference:
   Description: Checks for consistent verified double reference style.
   Enabled: pending
+  SafeAutoCorrect: false
   EnforcedStyle: constant
   SupportedStyles:
     - constant
     - string
   VersionAdded: 2.10.0
+  VersionChanged: '2.12'
   Reference: https://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/VerifiedDoubleReference
 
 RSpec/VerifiedDoubles:
@@ -787,13 +803,13 @@ RSpec/VerifiedDoubles:
   Reference: https://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/VerifiedDoubles
 
 RSpec/VoidExpect:
-  Description: This cop checks void `expect()`.
+  Description: Checks void `expect()`.
   Enabled: true
   VersionAdded: '1.16'
   Reference: https://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/VoidExpect
 
 RSpec/Yield:
-  Description: This cop checks for calling a block within a stub.
+  Description: Checks for calling a block within a stub.
   Enabled: true
   VersionAdded: '1.32'
   Reference: https://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/Yield
@@ -818,6 +834,12 @@ RSpec/Capybara/FeatureMethods:
   VersionChanged: '2.0'
   Reference: https://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/Capybara/FeatureMethods
 
+RSpec/Capybara/SpecificMatcher:
+  Description: Checks for there is a more specific matcher offered by Capybara.
+  Enabled: pending
+  VersionAdded: '2.12'
+  Reference: https://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/Capybara/SpecificMatcher
+
 RSpec/Capybara/VisibilityMatcher:
   Description: Checks for boolean visibility in Capybara finders.
   Enabled: true
@@ -887,6 +909,13 @@ RSpec/Rails/AvoidSetupHook:
   VersionAdded: '2.4'
   Reference: https://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/Rails/AvoidSetupHook
 
+RSpec/Rails/HaveHttpStatus:
+  Description: Checks that tests use `have_http_status` instead of equality matchers.
+  Enabled: pending
+  SafeAutoCorrect: false
+  VersionAdded: '2.12'
+  Reference: https://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/Rails/HaveHttpStatus
+
 RSpec/Rails/HttpStatus:
   Description: Enforces use of symbolic or numeric value to describe HTTP status.
   Enabled: true

data/lib/rubocop/cop/rspec/capybara/feature_methods.rb

@@ -46,7 +46,7 @@ module RuboCop
 
           MSG = 'Use `%<replacement>s` instead of `%<method>s`.'
 
-          # https://git.io/v7Kwr
+          # https://github.com/teamcapybara/capybara/blob/e283c1aeaa72441f5403963577e16333bf111a81/lib/capybara/rspec/features.rb#L31-L36
           MAP = {
             background: :before,
             scenario:   :it,

data/lib/rubocop/cop/rspec/capybara/specific_matcher.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module RSpec
+      module Capybara
+        # Checks for there is a more specific matcher offered by Capybara.
+        #
+        # @example
+        #
+        #   # bad
+        #   expect(page).to have_selector('button')
+        #   expect(page).to have_no_selector('button.cls')
+        #   expect(page).to have_css('button')
+        #   expect(page).to have_no_css('a.cls', exact_text: 'foo')
+        #   expect(page).to have_css('table.cls')
+        #   expect(page).to have_css('select')
+        #
+        #   # good
+        #   expect(page).to have_button
+        #   expect(page).to have_no_button(class: 'cls')
+        #   expect(page).to have_button
+        #   expect(page).to have_no_link('foo', class: 'cls')
+        #   expect(page).to have_table(class: 'cls')
+        #   expect(page).to have_select
+        #
+        class SpecificMatcher < Base
+          MSG = 'Prefer `%<good_matcher>s` over `%<bad_matcher>s`.'
+          RESTRICT_ON_SEND = %i[have_selector have_no_selector have_css
+                                have_no_css].freeze
+          SPECIFIC_MATCHER = {
+            'button' => 'button',
+            'a' => 'link',
+            'table' => 'table',
+            'select' => 'select'
+          }.freeze
+
+          # @!method first_argument(node)
+          def_node_matcher :first_argument, <<-PATTERN
+            (send nil? _ (str $_) ... )
+          PATTERN
+
+          def on_send(node)
+            return unless (arg = first_argument(node))
+            return unless (matcher = specific_matcher(arg))
+            return if acceptable_pattern?(arg)
+
+            add_offense(node, message: message(node, matcher))
+          end
+
+          private
+
+          def specific_matcher(arg)
+            splitted_arg = arg[/^\w+/, 0]
+            SPECIFIC_MATCHER[splitted_arg]
+          end
+
+          def acceptable_pattern?(arg)
+            arg.match?(/\[.+=\w+\]/)
+          end
+
+          def message(node, matcher)
+            format(MSG,
+                   good_matcher: good_matcher(node, matcher),
+                   bad_matcher: node.method_name)
+          end
+
+          def good_matcher(node, matcher)
+            node.method_name
+              .to_s
+              .gsub(/selector|css/, matcher.to_s)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module RSpec
+      # Prefer negated matchers over `to change.by(0)`.
+      #
+      # @example
+      #   # bad
+      #   expect { run }.to change(Foo, :bar).by(0)
+      #   expect { run }.to change { Foo.bar }.by(0)
+      #
+      #   # bad - compound expectations
+      #   expect { run }
+      #     .to change(Foo, :bar).by(0)
+      #     .and change(Foo, :baz).by(0)
+      #   expect { run }
+      #     .to change { Foo.bar }.by(0)
+      #     .and change { Foo.baz }.by(0)
+      #
+      #   # good
+      #   expect { run }.not_to change(Foo, :bar)
+      #   expect { run }.not_to change { Foo.bar }
+      #
+      #   # good - compound expectations
+      #   define_negated_matcher :not_change, :change
+      #   expect { run }
+      #     .to not_change(Foo, :bar)
+      #     .and not_change(Foo, :baz)
+      #   expect { run }
+      #     .to not_change { Foo.bar }
+      #     .and not_change { Foo.baz }
+      #
+      class ChangeByZero < Base
+        extend AutoCorrector
+        MSG = 'Prefer `not_to change` over `to change.by(0)`.'
+        MSG_COMPOUND = 'Prefer negated matchers with compound expectations ' \
+                          'over `change.by(0)`.'
+        RESTRICT_ON_SEND = %i[change].freeze
+
+        # @!method expect_change_with_arguments(node)
+        def_node_matcher :expect_change_with_arguments, <<-PATTERN
+          (send
+            (send nil? :change ...) :by
+            (int 0))
+        PATTERN
+
+        # @!method expect_change_with_block(node)
+        def_node_matcher :expect_change_with_block, <<-PATTERN
+          (send
+            (block
+              (send nil? :change)
+              (args)
+              (send (...) $_)) :by
+            (int 0))
+        PATTERN
+
+        def on_send(node)
+          expect_change_with_arguments(node.parent) do
+            check_offense(node.parent)
+          end
+
+          expect_change_with_block(node.parent.parent) do
+            check_offense(node.parent.parent)
+          end
+        end
+
+        private
+
+        def check_offense(node)
+          expression = node.loc.expression
+          if compound_expectations?(node)
+            add_offense(expression, message: MSG_COMPOUND)
+          else
+            add_offense(expression) do |corrector|
+              autocorrect(corrector, node)
+            end
+          end
+        end
+
+        def compound_expectations?(node)
+          %i[and or].include?(node.parent.method_name)
+        end
+
+        def autocorrect(corrector, node)
+          corrector.replace(node.parent.loc.selector, 'not_to')
+          range = node.loc.dot.with(end_pos: node.loc.expression.end_pos)
+          corrector.remove(range)
+        end
+      end
+    end
+  end
+end

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

@@ -11,7 +11,7 @@ module RuboCop
       # This cop can be configured using the `EnforcedStyle` and `SkipBlocks`
       # options.
       #
-      # @example `EnforcedStyle: described_class`
+      # @example `EnforcedStyle: described_class` (default)
       #   # bad
       #   describe MyClass do
       #     subject { MyClass.do_something }
@@ -78,9 +78,8 @@ module RuboCop
         PATTERN
 
         # @!method contains_described_class?(node)
-        def_node_search :contains_described_class?, <<-PATTERN
-          (send nil? :described_class)
-        PATTERN
+        def_node_search :contains_described_class?,
+                        '(send nil? :described_class)'
 
         def on_block(node)
           # In case the explicit style is used, we need to remember what's
@@ -129,17 +128,13 @@ module RuboCop
         end
 
         def scope_change?(node)
-          scope_changing_syntax?(node)          ||
+          scope_changing_syntax?(node) ||
             common_instance_exec_closure?(node) ||
             skippable_block?(node)
         end
 
         def skippable_block?(node)
-          node.block_type? && !rspec_block?(node) && skip_blocks?
-        end
-
-        def skip_blocks?
-          cop_config['SkipBlocks']
+          node.block_type? && !rspec_block?(node) && cop_config['SkipBlocks']
         end
 
         def offensive?(node)
@@ -152,6 +147,7 @@ module RuboCop
 
         def offensive_described_class?(node)
           return unless node.const_type?
+
           # E.g. `described_class::CONSTANT`
           return if contains_described_class?(node)
 
@@ -172,14 +168,13 @@ module RuboCop
         # @return [Array<Symbol>]
         # @example
         #   # nil represents base constant
-        #   collapse_namespace([], :C)                 # => [:C]
-        #   collapse_namespace([:A, :B], [:C)          # => [:A, :B, :C]
-        #   collapse_namespace([:A, :B], [:B, :C)      # => [:A, :B, :C]
-        #   collapse_namespace([:A, :B], [nil, :C)     # => [nil, :C]
-        #   collapse_namespace([:A, :B], [nil, :B, :C) # => [nil, :B, :C]
+        #   collapse_namespace([], [:C])                # => [:C]
+        #   collapse_namespace([:A, :B], [:C])          # => [:A, :B, :C]
+        #   collapse_namespace([:A, :B], [:B, :C])      # => [:A, :B, :C]
+        #   collapse_namespace([:A, :B], [nil, :C])     # => [nil, :C]
+        #   collapse_namespace([:A, :B], [nil, :B, :C]) # => [nil, :B, :C]
         def collapse_namespace(namespace, const)
-          return const if namespace.empty?
-          return const if const.first.nil?
+          return const if namespace.empty? || const.first.nil?
 
           start = [0, (namespace.length - const.length)].max
           max = namespace.length
@@ -196,9 +191,7 @@ module RuboCop
         #   const_name(s(:const, s(:const, nil, :M), :C)) # => [:M, :C]
         #   const_name(s(:const, s(:cbase), :C))          # => [nil, :C]
         def const_name(node)
-          # rubocop:disable InternalAffairs/NodeDestructuring
-          namespace, name = *node
-          # rubocop:enable InternalAffairs/NodeDestructuring
+          namespace, name = *node # rubocop:disable InternalAffairs/NodeDestructuring
           if !namespace
             [name]
           elsif namespace.const_type?

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module RSpec
-      # This cop enforces custom RSpec dialects.
+      # Enforces custom RSpec dialects.
       #
       # A dialect can be based on the following RSpec methods:
       #

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

@@ -36,11 +36,9 @@ module RuboCop
         def on_block(node)
           empty_hook?(node) do |hook|
             add_offense(hook) do |corrector|
-              range = range_with_surrounding_space(
-                range: node.loc.expression,
-                side: :left
+              corrector.remove(
+                range_with_surrounding_space(node.loc.expression, side: :left)
               )
-              corrector.remove(range)
             end
           end
         end

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

@@ -6,7 +6,7 @@ module RuboCop
       # Checks for long examples.
       #
       # A long example is usually more difficult to understand. Consider
-      # extracting out some behaviour, e.g. with a `let` block, or a helper
+      # extracting out some behavior, e.g. with a `let` block, or a helper
       # method.
       #
       # @example

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

@@ -14,7 +14,7 @@ module RuboCop
       #
       # This cop can be configured using the `EnforcedStyle` option
       #
-      # @example `EnforcedStyle: always_allow`
+      # @example `EnforcedStyle: always_allow` (default)
       #   # bad
       #   it('') { is_expected.to be_good }
       #   it '' do

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

@@ -5,6 +5,8 @@ module RuboCop
     module RSpec
       # Checks for `expect(...)` calls containing literal values.
       #
+      # Autocorrection is performed when the expected is not a literal.
+      #
       # @example
       #   # bad
       #   expect(5).to eq(price)

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

@@ -10,14 +10,7 @@ module RuboCop
       #
       # This cop can be configured using the `EnforcedStyle` option.
       #
-      # @example `EnforcedStyle: block`
-      #   # bad
-      #   expect { run }.to change(Foo, :bar)
-      #
-      #   # good
-      #   expect { run }.to change { Foo.bar }
-      #
-      # @example `EnforcedStyle: method_call`
+      # @example `EnforcedStyle: method_call` (default)
       #   # bad
       #   expect { run }.to change { Foo.bar }
       #   expect { run }.to change { foo.baz }
@@ -29,6 +22,13 @@ module RuboCop
       #   expect { run }.to change { Foo.bar(:count) }
       #   expect { run }.to change { user.reload.name }
       #
+      # @example `EnforcedStyle: block`
+      #   # bad
+      #   expect { run }.to change(Foo, :bar)
+      #
+      #   # good
+      #   expect { run }.to change { Foo.bar }
+      #
       class ExpectChange < Base
         extend AutoCorrector
         include ConfigurableEnforcedStyle
@@ -39,7 +39,7 @@ module RuboCop
 
         # @!method expect_change_with_arguments(node)
         def_node_matcher :expect_change_with_arguments, <<-PATTERN
-          (send nil? :change $_ (sym $_))
+          (send nil? :change $_ ({sym str} $_))
         PATTERN
 
         # @!method expect_change_with_block(node)
@@ -47,7 +47,13 @@ module RuboCop
           (block
             (send nil? :change)
             (args)
-            (send ({const send} nil? $_) $_)
+            (send
+              ${
+                (send nil? _)  # change { user.name }
+                const          # change { User.count }
+              }
+              $_
+            )
           )
         PATTERN
 
@@ -67,9 +73,9 @@ module RuboCop
           return unless style == :method_call
 
           expect_change_with_block(node) do |receiver, message|
-            msg = format(MSG_BLOCK, obj: receiver, attr: message)
+            msg = format(MSG_BLOCK, obj: receiver.source, attr: message)
             add_offense(node, message: msg) do |corrector|
-              replacement = "change(#{receiver}, :#{message})"
+              replacement = "change(#{receiver.source}, :#{message})"
               corrector.replace(node, replacement)
             end
           end

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

@@ -24,7 +24,7 @@ module RuboCop
           # rubocop:disable InternalAffairs/NodeDestructuring
           variable_name, _rhs = *node
           # rubocop:enable InternalAffairs/NodeDestructuring
-          name = variable_name[1..-1]
+          name = variable_name[1..]
           return unless name.eql?('stdout') || name.eql?('stderr')
 
           add_offense(node.loc.name, message: format(MSG, name: name))

data/lib/rubocop/cop/rspec/factory_bot/create_list.rb

@@ -8,15 +8,21 @@ module RuboCop
         #
         # This cop can be configured using the `EnforcedStyle` option
         #
-        # @example `EnforcedStyle: create_list`
+        # @example `EnforcedStyle: create_list` (default)
         #   # bad
         #   3.times { create :user }
         #
         #   # good
         #   create_list :user, 3
         #
-        #   # good
-        #   3.times { |n| create :user, created_at: n.months.ago }
+        #   # bad
+        #   3.times { create :user, age: 18 }
+        #
+        #   # good - index is used to alter the created models attributes
+        #   3.times { |n| create :user, age: n }
+        #
+        #   # good - contains a method call, may return different values
+        #   3.times { create :user, age: rand }
         #
         # @example `EnforcedStyle: n_times`
         #   # bad
@@ -33,15 +39,28 @@ module RuboCop
           MSG_N_TIMES = 'Prefer %<number>s.times.'
           RESTRICT_ON_SEND = %i[create_list].freeze
 
-          # @!method n_times_block_without_arg?(node)
-          def_node_matcher :n_times_block_without_arg?, <<-PATTERN
+          # @!method n_times_block?(node)
+          def_node_matcher :n_times_block?, <<-PATTERN
             (block
               (send (int _) :times)
-              (args)
               ...
             )
           PATTERN
 
+          # @!method n_times_block_with_arg_and_used?(node)
+          def_node_matcher :n_times_block_with_arg_and_used?, <<-PATTERN
+            (block
+              (send (int _) :times)
+              (args (arg _value))
+                `_value
+            )
+          PATTERN
+
+          # @!method arguments_include_method_call?(node)
+          def_node_matcher :arguments_include_method_call?, <<-PATTERN
+            (send ${nil? #factory_bot?} :create (sym $_) `$(send ...))
+          PATTERN
+
           # @!method factory_call(node)
           def_node_matcher :factory_call, <<-PATTERN
             (send ${nil? #factory_bot?} :create (sym $_) $...)
@@ -54,7 +73,11 @@ module RuboCop
 
           def on_block(node)
             return unless style == :create_list
-            return unless n_times_block_without_arg?(node)
+
+            return unless n_times_block?(node)
+            return if n_times_block_with_arg_and_used?(node)
+            return unless node.body
+            return if arguments_include_method_call?(node.body)
             return unless contains_only_factory?(node.body)
 
             add_offense(node.send_node, message: MSG_CREATE_LIST) do |corrector|
@@ -193,7 +216,7 @@ module RuboCop
               if node.body.begin_type?
                 format_multiline_block(node)
               else
-                format_singeline_block(node)
+                format_singleline_block(node)
               end
             end
 
@@ -205,7 +228,7 @@ module RuboCop
               "#{indent_end}end"
             end
 
-            def format_singeline_block(node)
+            def format_singleline_block(node)
               " { #{node.arguments.source} #{node.body.source} }"
             end
           end

data/lib/rubocop/cop/rspec/factory_bot/syntax_methods.rb

@@ -7,7 +7,7 @@ module RuboCop
         # Use shorthands from `FactoryBot::Syntax::Methods` in your specs.
         #
         # @safety
-        #   The auto-correction is marked as unsafe because the cop
+        #   The autocorrection is marked as unsafe because the cop
         #   cannot verify whether you already include
         #   `FactoryBot::Syntax::Methods` in your test suite.
         #

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

@@ -117,8 +117,9 @@ module RuboCop
 
         def name_pattern(method_name)
           return unless method_name&.str_type?
+          return if ignore_methods?
 
-          ".*#{method_name.str_content.gsub(/\W/, '')}" unless ignore_methods?
+          ".*#{method_name.str_content.gsub(/\s/, '_').gsub(/\W/, '')}"
         end
 
         def expected_path(constant)

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

@@ -69,10 +69,8 @@ module RuboCop
         end
 
         def with_surrounding(focus)
-          range_with_space = range_with_surrounding_space(
-            range: focus.loc.expression,
-            side: :left
-          )
+          range_with_space =
+            range_with_surrounding_space(focus.loc.expression, side: :left)
 
           range_with_surrounding_comma(range_with_space, :left)
         end

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

@@ -10,7 +10,7 @@ module RuboCop
       # styles: "implicit", "each", and "example." All styles have
       # the same behavior.
       #
-      # @example when configuration is `EnforcedStyle: implicit`
+      # @example `EnforcedStyle: implicit` (default)
       #   # bad
       #   before(:each) do
       #     # ...
@@ -26,7 +26,7 @@ module RuboCop
       #     # ...
       #   end
       #
-      # @example when configuration is `EnforcedStyle: each`
+      # @example `EnforcedStyle: each`
       #   # bad
       #   before(:example) do
       #     # ...
@@ -42,7 +42,7 @@ module RuboCop
       #     # ...
       #   end
       #
-      # @example when configuration is `EnforcedStyle: example`
+      # @example `EnforcedStyle: example`
       #   # bad
       #   before(:each) do
       #     # ...

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

@@ -8,7 +8,7 @@ module RuboCop
       # This cop can be configured using the `EnforcedStyle` option
       # and supports the `--auto-gen-config` flag.
       #
-      # @example `EnforcedStyle: is_expected`
+      # @example `EnforcedStyle: is_expected` (default)
       #
       #   # bad
       #   it { should be_truthy }

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

@@ -5,14 +5,14 @@ module RuboCop
     module RSpec
       # Checks that only one `it_behaves_like` style is used.
       #
-      # @example when configuration is `EnforcedStyle: it_behaves_like`
+      # @example `EnforcedStyle: it_behaves_like` (default)
       #   # bad
       #   it_should_behave_like 'a foo'
       #
       #   # good
       #   it_behaves_like 'a foo'
       #
-      # @example when configuration is `EnforcedStyle: it_should_behave_like`
+      # @example `EnforcedStyle: it_should_behave_like`
       #   # bad
       #   it_behaves_like 'a foo'
       #

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

@@ -10,7 +10,7 @@ module RuboCop
       #
       # If several examples may define a `DummyClass`, instead of being a
       # blank slate class as it will be in the first example, subsequent
-      # examples will be reopening it and modifying its behaviour in
+      # examples will be reopening it and modifying its behavior in
       # unpredictable ways.
       # Even worse when a class that exists in the codebase is reopened.
       #

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

@@ -8,7 +8,7 @@ module RuboCop
       # This cop can be configured in your configuration using the
       # `EnforcedStyle` option and supports `--auto-gen-config`.
       #
-      # @example `EnforcedStyle: allow`
+      # @example `EnforcedStyle: allow` (default)
       #
       #   # bad
       #   expect(foo).to receive(:bar)

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

@@ -8,21 +8,27 @@ module RuboCop
       # This cop can be configured in your configuration using the
       # `EnforcedStyle` option and supports `--auto-gen-config`.
       #
-      # @example `EnforcedStyle: have_received`
+      # @example `EnforcedStyle: have_received` (default)
       #
       #   # bad
       #   expect(foo).to receive(:bar)
+      #   do_something
       #
       #   # good
+      #   allow(foo).to receive(:bar) # or use instance_spy
+      #   do_something
       #   expect(foo).to have_received(:bar)
       #
       # @example `EnforcedStyle: receive`
       #
       #   # bad
+      #   allow(foo).to receive(:bar)
+      #   do_something
       #   expect(foo).to have_received(:bar)
       #
       #   # good
       #   expect(foo).to receive(:bar)
+      #   do_something
       #
       class MessageSpies < Base
         include ConfigurableEnforcedStyle

data/lib/rubocop/cop/rspec/mixin/empty_line_separation.rb

@@ -4,7 +4,10 @@ module RuboCop
   module Cop
     module RSpec
       # Helps determine the offending location if there is not an empty line
-      # following the node. Allows comments to follow directly after.
+      # following the node. Allows comments to follow directly after
+      # in the following cases.
+      # - `rubocop:enable` directive
+      # - followed by empty line(s)
       module EmptyLineSeparation
         include FinalEndLocation
         include RangeHelp
@@ -21,13 +24,19 @@ module RuboCop
         end
 
         def missing_separating_line(node)
-          line = final_end_location(node).line
+          line = final_end_line = final_end_location(node).line
 
-          line += 1 while comment_line?(processed_source[line])
+          while comment_line?(processed_source[line])
+            line += 1
+            comment = processed_source.comment_at_line(line)
+            if DirectiveComment.new(comment).enabled?
+              enable_directive_line = line
+            end
+          end
 
           return if processed_source[line].blank?
 
-          yield offending_loc(line)
+          yield offending_loc(enable_directive_line || final_end_line)
         end
 
         def offending_loc(last_line)

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

@@ -31,6 +31,26 @@ module RuboCop
       #     end
       #   end
       #
+      # @example `aggregate_failures: true` (default)
+      #
+      #  # good - the cop ignores when RSpec aggregates failures
+      #   describe UserCreator do
+      #     it 'builds a user', :aggregate_failures do
+      #       expect(user.name).to eq("John")
+      #       expect(user.age).to eq(22)
+      #     end
+      #   end
+      #
+      # @example `aggregate_failures: false`
+      #
+      #  # Detected as an offense
+      #   describe UserCreator do
+      #     it 'builds a user', aggregate_failures: false do
+      #       expect(user.name).to eq("John")
+      #       expect(user.age).to eq(22)
+      #     end
+      #   end
+      #
       # @example configuration
       #
       #   # .rubocop.yml

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

@@ -5,7 +5,8 @@ module RuboCop
     module RSpec
       # Checks for consistent method usage for negating expectations.
       #
-      # @example
+      # @example `EnforcedStyle: not_to` (default)
+      #
       #   # bad
       #   it '...' do
       #     expect(false).to_not be_true
@@ -15,6 +16,18 @@ module RuboCop
       #   it '...' do
       #     expect(false).not_to be_true
       #   end
+      #
+      # @example `EnforcedStyle: to_not`
+      #
+      #   # bad
+      #   it '...' do
+      #     expect(false).not_to be_true
+      #   end
+      #
+      #   # good
+      #   it '...' do
+      #     expect(false).to_not be_true
+      #   end
       class NotToNot < Base
         extend AutoCorrector
         include ConfigurableEnforcedStyle

data/lib/rubocop/cop/rspec/rails/have_http_status.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module RSpec
+      module Rails
+        # Checks that tests use `have_http_status` instead of equality matchers.
+        #
+        # @example
+        #   # bad
+        #   expect(response.status).to be(200)
+        #
+        #   # good
+        #   expect(response).to have_http_status(200)
+        #
+        class HaveHttpStatus < Base
+          extend AutoCorrector
+
+          MSG =
+            'Prefer `expect(response).%<to>s have_http_status(%<status>i)` ' \
+            'over `expect(response.status).%<to>s %<match>s`.'
+
+          # @!method match_status(node)
+          def_node_matcher :match_status, <<-PATTERN
+            (send
+              (send nil? :expect
+                $(send (send nil? :response) :status)
+              )
+              $#Runners.all
+              $(send nil? {:be :eq :eql :equal} (int $_))
+            )
+          PATTERN
+
+          def on_send(node)
+            match_status(node) do |response_status, to, match, status|
+              message = format(MSG, to: to, match: match.source, status: status)
+              add_offense(node, message: message) do |corrector|
+                corrector.replace(response_status.source_range, 'response')
+                corrector.replace(match.loc.selector, 'have_http_status')
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -11,6 +11,17 @@ module RuboCop
       #
       # This cop can be configured using the `EnforcedStyle` option
       #
+      # @example `EnforcedStyle: and_return` (default)
+      #   # bad
+      #   allow(Foo).to receive(:bar) { "baz" }
+      #   expect(Foo).to receive(:bar) { "baz" }
+      #
+      #   # good
+      #   allow(Foo).to receive(:bar).and_return("baz")
+      #   expect(Foo).to receive(:bar).and_return("baz")
+      #   # also good as the returned value is dynamic
+      #   allow(Foo).to receive(:bar) { bar.baz }
+      #
       # @example `EnforcedStyle: block`
       #   # bad
       #   allow(Foo).to receive(:bar).and_return("baz")
@@ -22,17 +33,6 @@ module RuboCop
       #   # also good as the returned value is dynamic
       #   allow(Foo).to receive(:bar).and_return(bar.baz)
       #
-      # @example `EnforcedStyle: and_return`
-      #   # bad
-      #   allow(Foo).to receive(:bar) { "baz" }
-      #   expect(Foo).to receive(:bar) { "baz" }
-      #
-      #   # good
-      #   allow(Foo).to receive(:bar).and_return("baz")
-      #   expect(Foo).to receive(:bar).and_return("baz")
-      #   # also good as the returned value is dynamic
-      #   allow(Foo).to receive(:bar) { bar.baz }
-      #
       class ReturnFromStub < Base
         extend AutoCorrector
         include ConfigurableEnforcedStyle

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

@@ -35,7 +35,7 @@ module RuboCop
             occurrences.each do |occurrence|
               lines_except_current = lines - [occurrence.first_line]
               message = format(MSG, hook_name: occurrences.first.method_name,
-                               lines: lines_msg(lines_except_current))
+                                    lines: lines_msg(lines_except_current))
               add_offense(occurrence, message: message)
             end
           end

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

@@ -47,7 +47,7 @@ module RuboCop
         def correct_variable(variable)
           case variable.type
           when :dsym
-            variable.source[1..-1]
+            variable.source[1..]
           when :sym
             variable.value.to_s.inspect
           else

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module RSpec
-      # This cop checks void `expect()`.
+      # Checks void `expect()`.
       #
       # @example
       #   # bad

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module RSpec
-      # This cop checks for calling a block within a stub.
+      # Checks for calling a block within a stub.
       #
       # @example
       #   # bad
@@ -44,7 +44,7 @@ module RuboCop
 
         def autocorrect(corrector, node, range)
           corrector.replace(
-            range_with_surrounding_space(range: range, side: :left),
+            range_with_surrounding_space(range, side: :left),
             generate_replacement(node.body)
           )
         end

data/lib/rubocop/cop/rspec_cops.rb

@@ -2,6 +2,7 @@
 
 require_relative 'rspec/capybara/current_path_expectation'
 require_relative 'rspec/capybara/feature_methods'
+require_relative 'rspec/capybara/specific_matcher'
 require_relative 'rspec/capybara/visibility_matcher'
 
 require_relative 'rspec/factory_bot/attribute_defined_statically'
@@ -10,6 +11,7 @@ require_relative 'rspec/factory_bot/factory_class_name'
 require_relative 'rspec/factory_bot/syntax_methods'
 
 require_relative 'rspec/rails/avoid_setup_hook'
+require_relative 'rspec/rails/have_http_status'
 begin
   require_relative 'rspec/rails/http_status'
 rescue LoadError
@@ -25,6 +27,7 @@ require_relative 'rspec/be_eq'
 require_relative 'rspec/be_eql'
 require_relative 'rspec/be_nil'
 require_relative 'rspec/before_after_all'
+require_relative 'rspec/change_by_zero'
 require_relative 'rspec/context_method'
 require_relative 'rspec/context_wording'
 require_relative 'rspec/describe_class'

data/lib/rubocop/rspec/config_formatter.rb

@@ -8,6 +8,7 @@ module RuboCop
     class ConfigFormatter
       EXTENSION_ROOT_DEPARTMENT = %r{^(RSpec/)}.freeze
       SUBDEPARTMENTS = %(RSpec/Capybara RSpec/FactoryBot RSpec/Rails)
+      AMENDMENTS = %(Metrics/BlockLength)
       COP_DOC_BASE_URL = 'https://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/'
 
       def initialize(config, descriptions)
@@ -18,6 +19,7 @@ module RuboCop
       def dump
         YAML.dump(unified_config)
           .gsub(EXTENSION_ROOT_DEPARTMENT, "\n\\1")
+          .gsub(*AMENDMENTS, "\n\\0")
           .gsub(/^(\s+)- /, '\1  - ')
       end
 
@@ -26,6 +28,7 @@ module RuboCop
       def unified_config
         cops.each_with_object(config.dup) do |cop, unified|
           next if SUBDEPARTMENTS.include?(cop)
+          next if AMENDMENTS.include?(cop)
 
           unified[cop].merge!(descriptions.fetch(cop))
           unified[cop]['Reference'] = COP_DOC_BASE_URL + cop.sub('RSpec/', '')

data/lib/rubocop/rspec/node.rb

@@ -4,7 +4,7 @@ module RuboCop
   module RSpec
     # RuboCop RSpec specific extensions of RuboCop::AST::Node
     module Node
-      # In various cops we want to regard const as literal althought it's not
+      # In various cops we want to regard const as literal although it's not
       # strictly literal.
       def recursive_literal_or_const?
         case type

data/lib/rubocop/rspec/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rspec
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.12.0
 platform: ruby
 authors:
 - John Backus
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-19 00:00:00.000000000 Z
+date: 2022-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: '1.31'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: '1.31'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -141,7 +141,9 @@ files:
 - lib/rubocop/cop/rspec/before_after_all.rb
 - lib/rubocop/cop/rspec/capybara/current_path_expectation.rb
 - lib/rubocop/cop/rspec/capybara/feature_methods.rb
+- lib/rubocop/cop/rspec/capybara/specific_matcher.rb
 - lib/rubocop/cop/rspec/capybara/visibility_matcher.rb
+- lib/rubocop/cop/rspec/change_by_zero.rb
 - lib/rubocop/cop/rspec/context_method.rb
 - lib/rubocop/cop/rspec/context_wording.rb
 - lib/rubocop/cop/rspec/describe_class.rb
@@ -206,6 +208,7 @@ files:
 - lib/rubocop/cop/rspec/pending.rb
 - lib/rubocop/cop/rspec/predicate_matcher.rb
 - lib/rubocop/cop/rspec/rails/avoid_setup_hook.rb
+- lib/rubocop/cop/rspec/rails/have_http_status.rb
 - lib/rubocop/cop/rspec/rails/http_status.rb
 - lib/rubocop/cop/rspec/receive_counts.rb
 - lib/rubocop/cop/rspec/receive_never.rb
@@ -262,14 +265,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.1
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Code style checking for RSpec files