rubocop-rspec 2.19.0 → 2.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44e3a236fcd4869222a8e50780c5ef50671968fe82661b22f34d93315116c36b
-  data.tar.gz: 22c11a55d5d29ae10f2ec8fc4a3c95a3bd7f2b1bb5a0b049a9e47d3328178e7d
+  metadata.gz: 5a388b40471f85e4da35358c9c9c0ab8bdce272c171b989553a174ea5f2fa04f
+  data.tar.gz: 251c7b2c7f83daeb4f3e3f4e10f1b0f37763088ac792982e27052da26c1645ea
 SHA512:
-  metadata.gz: bbfab487662a025737c213ab0f9c0a4c54d1d93fe3a3c05a344b20dcd2f83900aef723f07d0ecdade3c616afa15bee4a6cb975345ea9d8a80e3ba0a64c715a05
-  data.tar.gz: a1f112ce509e7a938a7d0377ac2fcf0a5c723fbac2299f5246ab84b4d989d8223b7a608c5952368094515085d4a106695d3baf71b5f8b02769cdbbf4965d9cd4
+  metadata.gz: 6311a48d125da92639f8bebbeebdd9b16e7968bf2b522d29310c913490977a465aa77112e39497880373be23732a2fb3cfa205b92475e2edd069c1009ae91aac
+  data.tar.gz: fd3d495d5ec63969e2d926c5c151cf888de321b74486644983c6aa72b3c18b071daafe19b0996a0fa476334d00bf05768c09ae4ce03d39bbdf436898b64809c0

data/CHANGELOG.md

@@ -2,6 +2,30 @@
 
 ## Master (Unreleased)
 
+## 2.21.0 (2023-05-05)
+
+- Fix a false positive in `RSpec/IndexedLet` with suffixes after index-like numbers. ([@pirj])
+- Fix an error for `RSpec/Rails/HaveHttpStatus` with comparison with strings containing non-numeric characters. ([@ydah])
+- Fix an error for `RSpec/MatchArray` when `match_array` with no argument. ([@ydah])
+- Add support `a_block_changing` and `changing` for `RSpec/ChangeByZero`. ([@ydah])
+- Drop Ruby 2.6 support. ([@ydah])
+
+## 2.20.0 (2023-04-18)
+
+- Add new `RSpec/IndexedLet` cop. ([@dmitrytsepelev])
+- Add new `RSpec/BeEmpty` cop. ([@ydah], [@bquorning])
+- Add autocorrect support for `RSpec/ScatteredSetup`. ([@ydah])
+- Add support `be_status` style for `RSpec/Rails/HttpStatus`. ([@ydah])
+- Add support for shared example groups to `RSpec/EmptyLineAfterExampleGroup`. ([@pirj])
+- Add support for `RSpec/HaveHttpStatus` when using `response.code`. ([@ydah])
+- Fix order of expected and actual in correction for `RSpec/Rails/MinitestAssertions` ([@mvz])
+- Fix a false positive for `RSpec/DescribedClassModuleWrapping` when RSpec.describe numblock is nested within a module. ([@ydah])
+- Fix a false positive for `RSpec/FactoryBot/ConsistentParenthesesStyle` inside `&&`, `||` and `:?` when `omit_parentheses` is on ([@dmitrytsepelev])
+- Fix a false positive for `RSpec/PendingWithoutReason` when pending/skip has a reason inside an example group. ([@ydah])
+- Fix a false negative for `RSpec/RedundantAround` when redundant numblock `around`. ([@ydah])
+- Change `RSpec/ContainExactly` to ignore calls with no arguments, and change `RSpec/MatchArray` to ignore calls with an empty array literal argument. ([@ydah], [@bquorning])
+- Make `RSpec/MatchArray` and `RSpec/ContainExactly` pending. ([@ydah])
+
 ## 2.19.0 (2023-03-06)
 
 - Fix a false positive for `RSpec/ContextWording` when context is interpolated string literal or execute string. ([@ydah])
@@ -329,7 +353,7 @@
 ## 1.37.0 (2019-11-25)
 
 - Implement `RSpec/DescribedClassModuleWrapping` to disallow RSpec statements within a module. ([@kellysutton])
-- Fix documentation rake task to support Rubocop 0.75. ([@nickcampbell18])
+- Fix documentation rake task to support RuboCop 0.75. ([@nickcampbell18])
 - Fix `RSpec/SubjectStub` to detect implicit subjects stubbed. ([@QQism])
 - Fix `RSpec/Pending` not flagging `skip` with string values. ([@pirj])
 - Add `AllowedExplicitMatchers` config option for `RSpec/PredicateMatcher`. ([@mkrawc])
@@ -660,7 +684,7 @@ Compatibility release so users can upgrade RuboCop to 0.51.0. No new features.
 - Skip `DescribeClass` cop for view specs. ([@andyw8])
 - Skip `FilePath` cop for Rails routing specs. ([@andyw8])
 - Add cop to check for focused specs. ([@renanborgescampos], [@jaredmoody])
-- Clean-up `RSpec::NotToNot` to use same configuration semantics as other Rubocop cops, add autocorrect support for `RSpec::NotToNot`. ([@baberthal])
+- Clean-up `RSpec::NotToNot` to use same configuration semantics as other RuboCop cops, add autocorrect support for `RSpec::NotToNot`. ([@baberthal])
 - Update to rubocop 0.40.0. ([@nijikon])
 
 ## 1.4.1 (2016-04-03)
@@ -758,6 +782,7 @@ Compatibility release so users can upgrade RuboCop to 0.51.0. No new features.
 [@dduugg]: https://github.com/dduugg
 [@deivid-rodriguez]: https://github.com/deivid-rodriguez
 [@dgollahon]: https://github.com/dgollahon
+[@dmitrytsepelev]: https://github.com/dmitrytsepelev
 [@drowze]: https://github.com/Drowze
 [@dswij]: https://github.com/dswij
 [@dvandersluis]: https://github.com/dvandersluis
@@ -800,6 +825,7 @@ Compatibility release so users can upgrade RuboCop to 0.51.0. No new features.
 [@mlarraz]: https://github.com/mlarraz
 [@mockdeep]: https://github.com/mockdeep
 [@mothonmars]: https://github.com/MothOnMars
+[@mvz]: https://github.com/mvz
 [@nc-holodakg]: https://github.com/nc-holodakg
 [@nevir]: https://github.com/nevir
 [@ngouy]: https://github.com/ngouy

data/config/default.yml

@@ -144,6 +144,12 @@ RSpec/Be:
   StyleGuide: https://rspec.rubystyle.guide/#be-matcher
   Reference: https://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/Be
 
+RSpec/BeEmpty:
+  Description: Prefer using `be_empty` when checking for an empty array.
+  Enabled: pending
+  VersionAdded: '2.20'
+  Reference: https://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/BeEmpty
+
 RSpec/BeEq:
   Description: Check for expectations where `be(...)` can replace `eq(...)`.
   Enabled: pending
@@ -202,8 +208,8 @@ RSpec/ClassCheck:
   Reference: https://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/ClassCheck
 
 RSpec/ContainExactly:
-  Description: Prefer `match_array` when matching array values.
-  Enabled: true
+  Description: Checks where `contain_exactly` is used.
+  Enabled: pending
   VersionAdded: '2.19'
   Reference: https://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/ContainExactly
 
@@ -503,6 +509,13 @@ RSpec/ImplicitSubject:
   VersionChanged: '2.13'
   Reference: https://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/ImplicitSubject
 
+RSpec/IndexedLet:
+  Description: Do not set up test data using indexes (e.g., `item_1`, `item_2`).
+  Enabled: pending
+  VersionAdded: '2.20'
+  Reference: https://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/IndexedLet
+  Max: 1
+
 RSpec/InstanceSpy:
   Description: Checks for `instance_double` used with `have_received`.
   Enabled: true
@@ -563,8 +576,8 @@ RSpec/LetSetup:
   Reference: https://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/LetSetup
 
 RSpec/MatchArray:
-  Description: Prefer `contain_exactly` when matching an array literal.
-  Enabled: true
+  Description: Checks where `match_array` is used.
+  Enabled: pending
   VersionAdded: '2.19'
   Reference: https://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/MatchArray
 
@@ -1048,8 +1061,9 @@ RSpec/Rails/HttpStatus:
   SupportedStyles:
     - numeric
     - symbolic
+    - be_status
   VersionAdded: '1.23'
-  VersionChanged: '2.0'
+  VersionChanged: '2.20'
   Reference: https://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/Rails/HttpStatus
 
 RSpec/Rails/InferredSpecType:

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

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module RSpec
+      # Prefer using `be_empty` when checking for an empty array.
+      #
+      # @example
+      #   # bad
+      #   expect(array).to contain_exactly
+      #   expect(array).to match_array([])
+      #
+      #   # good
+      #   expect(array).to be_empty
+      #
+      class BeEmpty < Base
+        extend AutoCorrector
+
+        MSG = 'Use `be_empty` matchers for checking an empty array.'
+        RESTRICT_ON_SEND = %i[contain_exactly match_array].freeze
+
+        # @!method expect_array_matcher?(node)
+        def_node_matcher :expect_array_matcher?, <<~PATTERN
+          (send
+            (send nil? :expect _)
+            #Runners.all
+            ${
+              (send nil? :match_array (array))
+              (send nil? :contain_exactly)
+            }
+          )
+        PATTERN
+
+        def on_send(node)
+          expect_array_matcher?(node.parent) do |expect|
+            add_offense(expect) do |corrector|
+              corrector.replace(expect, 'be_empty')
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -57,7 +57,7 @@ module RuboCop
           return unless be_nil_matcher?(node)
 
           add_offense(node, message: BE_MSG) do |corrector|
-            corrector.replace(node.source_range, 'be(nil)')
+            corrector.replace(node, 'be(nil)')
           end
         end
 
@@ -65,7 +65,7 @@ module RuboCop
           return unless nil_value_expectation?(node)
 
           add_offense(node, message: BE_NIL_MSG) do |corrector|
-            corrector.replace(node.source_range, 'be_nil')
+            corrector.replace(node, 'be_nil')
           end
         end
       end

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

@@ -59,15 +59,16 @@ module RuboCop
       #
       class ChangeByZero < Base
         extend AutoCorrector
-        MSG = 'Prefer `not_to change` over `to change.by(0)`.'
+        MSG = 'Prefer `not_to change` over `to %<method>s.by(0)`.'
         MSG_COMPOUND = 'Prefer %<preferred>s with compound expectations ' \
-                       'over `change.by(0)`.'
-        RESTRICT_ON_SEND = %i[change].freeze
+                       'over `%<method>s.by(0)`.'
+        CHANGE_METHODS = Set[:change, :a_block_changing, :changing].freeze
+        RESTRICT_ON_SEND = CHANGE_METHODS.freeze
 
         # @!method expect_change_with_arguments(node)
         def_node_matcher :expect_change_with_arguments, <<-PATTERN
           (send
-            (send nil? :change ...) :by
+            $(send nil? CHANGE_METHODS ...) :by
             (int 0))
         PATTERN
 
@@ -75,48 +76,61 @@ module RuboCop
         def_node_matcher :expect_change_with_block, <<-PATTERN
           (send
             (block
-              (send nil? :change)
+              $(send nil? CHANGE_METHODS)
               (args)
-              (send (...) $_)) :by
+              (send (...) _)) :by
             (int 0))
         PATTERN
 
         # @!method change_nodes(node)
         def_node_search :change_nodes, <<-PATTERN
-          $(send nil? :change ...)
+          $(send nil? CHANGE_METHODS ...)
         PATTERN
 
         def on_send(node)
-          expect_change_with_arguments(node.parent) do
-            check_offense(node.parent)
+          expect_change_with_arguments(node.parent) do |change|
+            register_offense(node.parent, change)
           end
 
-          expect_change_with_block(node.parent.parent) do
-            check_offense(node.parent.parent)
+          expect_change_with_block(node.parent.parent) do |change|
+            register_offense(node.parent.parent, change)
           end
         end
 
         private
 
-        def check_offense(node)
-          expression = node.source_range
+        # rubocop:disable Metrics/MethodLength
+        def register_offense(node, change_node)
           if compound_expectations?(node)
-            add_offense(expression, message: message_compound) do |corrector|
+            add_offense(node.source_range,
+                        message: message_compound(change_node)) do |corrector|
               autocorrect_compound(corrector, node)
             end
           else
-            add_offense(expression) do |corrector|
-              autocorrect(corrector, node)
+            add_offense(node.source_range,
+                        message: message(change_node)) do |corrector|
+              autocorrect(corrector, node, change_node)
             end
           end
         end
+        # rubocop:enable Metrics/MethodLength
 
         def compound_expectations?(node)
           %i[and or & |].include?(node.parent.method_name)
         end
 
-        def autocorrect(corrector, node)
+        def message(change_node)
+          format(MSG, method: change_node.method_name)
+        end
+
+        def message_compound(change_node)
+          format(MSG_COMPOUND, preferred: preferred_method,
+                               method: change_node.method_name)
+        end
+
+        def autocorrect(corrector, node, change_node)
           corrector.replace(node.parent.loc.selector, 'not_to')
+          corrector.replace(change_node.loc.selector, 'change')
           range = node.loc.dot.with(end_pos: node.source_range.end_pos)
           corrector.remove(range)
         end
@@ -135,10 +149,6 @@ module RuboCop
           cop_config['NegatedMatcher']
         end
 
-        def message_compound
-          format(MSG_COMPOUND, preferred: preferred_method)
-        end
-
         def preferred_method
           negated_matcher ? "`#{negated_matcher}`" : 'negated matchers'
         end

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

@@ -3,7 +3,11 @@
 module RuboCop
   module Cop
     module RSpec
-      # Prefer `match_array` when matching array values.
+      # Checks where `contain_exactly` is used.
+      #
+      # This cop checks for the following:
+      # - Prefer `match_array` when matching array values.
+      # - Prefer `be_empty` when using `contain_exactly` with no arguments.
       #
       # @example
       #   # bad
@@ -14,6 +18,7 @@ module RuboCop
       #
       #   # good
       #   it { is_expected.to contain_exactly(content, *array) }
+      #
       class ContainExactly < Base
         extend AutoCorrector
 
@@ -21,21 +26,27 @@ module RuboCop
         RESTRICT_ON_SEND = %i[contain_exactly].freeze
 
         def on_send(node)
+          return if node.arguments.empty?
+
+          check_populated_collection(node)
+        end
+
+        private
+
+        def check_populated_collection(node)
           return unless node.each_child_node.all?(&:splat_type?)
 
           add_offense(node) do |corrector|
-            autocorrect(node, corrector)
+            autocorrect_for_populated_array(node, corrector)
           end
         end
 
-        private
-
-        def autocorrect(node, corrector)
+        def autocorrect_for_populated_array(node, corrector)
           arrays = node.arguments.map do |splat_node|
             splat_node.children.first
           end
           corrector.replace(
-            node.source_range,
+            node,
             "match_array(#{arrays.map(&:source).join(' + ')})"
           )
         end

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

@@ -22,15 +22,15 @@ module RuboCop
       class DescribedClassModuleWrapping < Base
         MSG = 'Avoid opening modules and defining specs within them.'
 
-        # @!method find_rspec_blocks(node)
-        def_node_search :find_rspec_blocks, <<~PATTERN
-          (block (send #explicit_rspec? #ExampleGroups.all ...) ...)
+        # @!method include_rspec_blocks?(node)
+        def_node_search :include_rspec_blocks?, <<~PATTERN
+          ({block numblock} (send #explicit_rspec? #ExampleGroups.all ...) ...)
         PATTERN
 
         def on_module(node)
-          find_rspec_blocks(node) do
-            add_offense(node)
-          end
+          return unless include_rspec_blocks?(node)
+
+          add_offense(node)
         end
       end
     end

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

@@ -30,7 +30,7 @@ module RuboCop
         MSG = 'Add an empty line after `%<example_group>s`.'
 
         def on_block(node) # rubocop:disable InternalAffairs/NumblockHandler
-          return unless example_group?(node)
+          return unless spec_group?(node)
 
           missing_separating_line_offense(node) do |method|
             format(MSG, example_group: method)

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

@@ -93,8 +93,8 @@ module RuboCop
         end
 
         def swap(corrector, actual, expected)
-          corrector.replace(actual.source_range, expected.source)
-          corrector.replace(expected.source_range, actual.source)
+          corrector.replace(actual, expected.source)
+          corrector.replace(expected, actual.source)
         end
       end
     end

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

@@ -100,10 +100,10 @@ module RuboCop
             end
           end
 
+          AMBIGUOUS_TYPES = %i[send pair array and or if].freeze
+
           def ambiguous_without_parentheses?(node)
-            node.parent&.send_type? ||
-              node.parent&.pair_type? ||
-              node.parent&.array_type?
+            node.parent && AMBIGUOUS_TYPES.include?(node.parent.type)
           end
 
           def remove_parentheses(corrector, node)

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

@@ -6,7 +6,7 @@ module RuboCop
       # Checks that spec file paths are consistent and well-formed.
       #
       # By default, this checks that spec file paths are consistent with the
-      # test subject and and enforces that it reflects the described
+      # test subject and enforces that it reflects the described
       # class/module and its optionally called out method.
       #
       # With the configuration option `IgnoreMethods` the called out method will

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

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module RSpec
+      # Do not set up test data using indexes (e.g., `item_1`, `item_2`).
+      #
+      # It makes reading the test harder because it's not clear what exactly
+      # is tested by this particular example.
+      #
+      # @example `Max: 1 (default)`
+      #   # bad
+      #   let(:item_1) { create(:item) }
+      #   let(:item_2) { create(:item) }
+      #
+      #   let(:item1) { create(:item) }
+      #   let(:item2) { create(:item) }
+      #
+      #   # good
+      #
+      #   let(:visible_item) { create(:item, visible: true) }
+      #   let(:invisible_item) { create(:item, visible: false) }
+      #
+      # @example `Max: 2`
+      #   # bad
+      #   let(:item_1) { create(:item) }
+      #   let(:item_2) { create(:item) }
+      #   let(:item_3) { create(:item) }
+      #
+      #   # good
+      #   let(:item_1) { create(:item) }
+      #   let(:item_2) { create(:item) }
+      #
+      class IndexedLet < Base
+        MSG = 'This `let` statement uses index in its name. Please give it ' \
+              'a meaningful name.'
+
+        # @!method let_name(node)
+        def_node_matcher :let_name, <<~PATTERN
+          {
+            (block (send nil? #Helpers.all ({str sym} $_) ...) ...)
+            (send nil? #Helpers.all ({str sym} $_) block_pass)
+          }
+        PATTERN
+
+        def on_block(node) # rubocop:disable InternalAffairs/NumblockHandler
+          return unless spec_group?(node)
+
+          children = node.body&.child_nodes
+          return unless children
+
+          filter_indexed_lets(children).each do |let_node|
+            add_offense(let_node)
+          end
+        end
+
+        private
+
+        SUFFIX_INDEX_REGEX = /_?\d+$/.freeze
+        INDEX_REGEX = /\d+/.freeze
+
+        def filter_indexed_lets(candidates)
+          candidates
+            .filter { |node| indexed_let?(node) }
+            .group_by { |node| let_name_stripped_index(node) }
+            .values
+            .filter { |lets| lets.length > cop_config['Max'] }
+            .flatten
+        end
+
+        def indexed_let?(node)
+          let?(node) && SUFFIX_INDEX_REGEX.match?(let_name(node))
+        end
+
+        def let_name_stripped_index(node)
+          let_name(node).to_s.gsub(INDEX_REGEX, '')
+        end
+      end
+    end
+  end
+end

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

@@ -3,7 +3,11 @@
 module RuboCop
   module Cop
     module RSpec
-      # Prefer `contain_exactly` when matching an array literal.
+      # Checks where `match_array` is used.
+      #
+      # This cop checks for the following:
+      # - Prefer `contain_exactly` when matching an array with values.
+      # - Prefer `eq` when using `match_array` with an empty array literal.
       #
       # @example
       #   # bad
@@ -17,20 +21,34 @@ module RuboCop
       #
       #   # good
       #   it { is_expected.to match_array(%w(tremble in fear foolish mortals)) }
+      #
       class MatchArray < Base
         extend AutoCorrector
 
         MSG = 'Prefer `contain_exactly` when matching an array literal.'
         RESTRICT_ON_SEND = %i[match_array].freeze
 
+        # @!method match_array_with_empty_array?(node)
+        def_node_matcher :match_array_with_empty_array?, <<~PATTERN
+          (send nil? :match_array (array))
+        PATTERN
+
         def on_send(node)
-          return unless node.first_argument.array_type?
+          return unless node.first_argument&.array_type?
+          return if match_array_with_empty_array?(node)
+
+          check_populated_array(node)
+        end
+
+        private
+
+        def check_populated_array(node)
           return if node.first_argument.percent_literal?
 
           add_offense(node) do |corrector|
             array_contents = node.arguments.flat_map(&:to_a)
             corrector.replace(
-              node.source_range,
+              node,
               "contain_exactly(#{array_contents.map(&:source).join(', ')})"
             )
           end

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

@@ -70,7 +70,12 @@ module RuboCop
 
         # @!method skipped_by_example_method?(node)
         def_node_matcher :skipped_by_example_method?, <<~PATTERN
-          (send nil? ${#Examples.skipped #Examples.pending} ...)
+          (send nil? ${#Examples.skipped #Examples.pending})
+        PATTERN
+
+        # @!method skipped_by_example_method_with_block?(node)
+        def_node_matcher :skipped_by_example_method_with_block?, <<~PATTERN
+          ({block numblock} (send nil? ${#Examples.skipped #Examples.pending} ...) ...)
         PATTERN
 
         # @!method metadata_without_reason?(node)
@@ -102,7 +107,7 @@ module RuboCop
             on_skipped_by_example_method(node)
             on_skipped_by_example_group_method(node)
           elsif example?(parent)
-            on_skipped_by_in_example_method(node, parent)
+            on_skipped_by_in_example_method(node)
           end
         end
 
@@ -121,7 +126,7 @@ module RuboCop
             explicit_rspec?(node.receiver)
         end
 
-        def on_skipped_by_in_example_method(node, _direct_parent)
+        def on_skipped_by_in_example_method(node)
           skipped_in_example?(node) do |pending|
             add_offense(node, message: "Give the reason for #{pending}.")
           end
@@ -137,6 +142,10 @@ module RuboCop
           skipped_by_example_method?(node) do |pending|
             add_offense(node, message: "Give the reason for #{pending}.")
           end
+
+          skipped_by_example_method_with_block?(node.parent) do |pending|
+            add_offense(node, message: "Give the reason for #{pending}.")
+          end
         end
 
         def on_skipped_by_example_group_method(node)

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

@@ -99,7 +99,7 @@ module RuboCop
           block = block_loc ? block_loc.source : ''
 
           corrector.replace(
-            matcher.source_range,
+            matcher,
             to_predicate_matcher(predicate.method_name) + args + block
           )
         end
@@ -214,7 +214,7 @@ module RuboCop
 
         def corrector_explicit(corrector, to_node, actual, matcher, block_child)
           replacement_matcher = replacement_matcher(to_node)
-          corrector.replace(matcher.source_range, replacement_matcher)
+          corrector.replace(matcher, replacement_matcher)
           move_predicate(corrector, actual, matcher, block_child)
           corrector.replace(to_node.loc.selector, 'to')
         end
@@ -226,8 +226,7 @@ module RuboCop
           block = block_loc ? block_loc.source : ''
 
           corrector.remove(block_loc) if block_loc
-          corrector.insert_after(actual.source_range,
-                                 ".#{predicate}" + args + block)
+          corrector.insert_after(actual, ".#{predicate}" + args + block)
         end
 
         # rubocop:disable Metrics/MethodLength

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

@@ -9,6 +9,7 @@ module RuboCop
         # @example
         #   # bad
         #   expect(response.status).to be(200)
+        #   expect(response.code).to eq("200")
         #
         #   # good
         #   expect(response).to have_http_status(200)
@@ -17,8 +18,8 @@ module RuboCop
           extend AutoCorrector
 
           MSG =
-            'Prefer `expect(response).%<to>s have_http_status(%<status>i)` ' \
-            'over `expect(response.status).%<to>s %<match>s`.'
+            'Prefer `expect(response).%<to>s have_http_status(%<status>s)` ' \
+            'over `%<bad_code>s`.'
 
           RUNNERS = %i[to to_not not_to].to_set
           RESTRICT_ON_SEND = RUNNERS
@@ -27,19 +28,23 @@ module RuboCop
           def_node_matcher :match_status, <<-PATTERN
             (send
               (send nil? :expect
-                $(send (send nil? :response) :status)
+                $(send (send nil? :response) {:status :code})
               )
               $RUNNERS
-              $(send nil? {:be :eq :eql :equal} (int $_))
+              $(send nil? {:be :eq :eql :equal} ({int str} $_))
             )
           PATTERN
 
           def on_send(node)
             match_status(node) do |response_status, to, match, status|
-              message = format(MSG, to: to, match: match.source, status: status)
+              return unless status.to_s.match?(/\A\d+\z/)
+
+              message = format(MSG, to: to, status: status,
+                                    bad_code: node.source)
               add_offense(node, message: message) do |corrector|
-                corrector.replace(response_status.source_range, 'response')
+                corrector.replace(response_status, 'response')
                 corrector.replace(match.loc.selector, 'have_http_status')
+                corrector.replace(match.first_argument, status.to_s)
               end
             end
           end

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

@@ -8,6 +8,11 @@ module RuboCop
       module Rails
         # Enforces use of symbolic or numeric value to describe HTTP status.
         #
+        # This cop inspects only `have_http_status` calls.
+        # So, this cop does not check if a method starting with `be_*` is used
+        # when setting for `EnforcedStyle: symbolic` or
+        # `EnforcedStyle: numeric`.
+        #
         # @example `EnforcedStyle: symbolic` (default)
         #   # bad
         #   it { is_expected.to have_http_status 200 }
@@ -30,6 +35,19 @@ module RuboCop
         #   it { is_expected.to have_http_status :success }
         #   it { is_expected.to have_http_status :error }
         #
+        # @example `EnforcedStyle: be_status`
+        #   # bad
+        #   it { is_expected.to have_http_status :ok }
+        #   it { is_expected.to have_http_status :not_found }
+        #   it { is_expected.to have_http_status 200 }
+        #   it { is_expected.to have_http_status 404 }
+        #
+        #   # good
+        #   it { is_expected.to be_ok }
+        #   it { is_expected.to be_not_found }
+        #   it { is_expected.to have_http_status :success }
+        #   it { is_expected.to have_http_status :error }
+        #
         class HttpStatus < Base
           extend AutoCorrector
           include ConfigurableEnforcedStyle
@@ -41,12 +59,13 @@ module RuboCop
           PATTERN
 
           def on_send(node)
-            http_status(node) do |ast_node|
-              checker = checker_class.new(ast_node)
+            http_status(node) do |arg|
+              checker = checker_class.new(arg)
               return unless checker.offensive?
 
-              add_offense(checker.node, message: checker.message) do |corrector|
-                corrector.replace(checker.node, checker.preferred_style)
+              add_offense(checker.offense_range,
+                          message: checker.message) do |corrector|
+                corrector.replace(checker.offense_range, checker.prefer)
               end
             end
           end
@@ -59,13 +78,16 @@ module RuboCop
               SymbolicStyleChecker
             when :numeric
               NumericStyleChecker
+            when :be_status
+              BeStatusStyleChecker
             end
           end
 
           # :nodoc:
-          class SymbolicStyleChecker
+          class StyleCheckerBase
             MSG = 'Prefer `%<prefer>s` over `%<current>s` ' \
                   'to describe HTTP status code.'
+            ALLOWED_STATUSES = %i[error success missing redirect].freeze
 
             attr_reader :node
 
@@ -73,16 +95,36 @@ module RuboCop
               @node = node
             end
 
+            def message
+              format(MSG, prefer: prefer, current: current)
+            end
+
+            def offense_range
+              node
+            end
+
+            def allowed_symbol?
+              node.sym_type? && ALLOWED_STATUSES.include?(node.value)
+            end
+
+            def custom_http_status_code?
+              node.int_type? &&
+                !::Rack::Utils::SYMBOL_TO_STATUS_CODE.value?(node.source.to_i)
+            end
+          end
+
+          # :nodoc:
+          class SymbolicStyleChecker < StyleCheckerBase
             def offensive?
               !node.sym_type? && !custom_http_status_code?
             end
 
-            def message
-              format(MSG, prefer: preferred_style, current: number.to_s)
+            def prefer
+              symbol.inspect
             end
 
-            def preferred_style
-              symbol.inspect
+            def current
+              number.inspect
             end
 
             private
@@ -94,50 +136,64 @@ module RuboCop
             def number
               node.source.to_i
             end
-
-            def custom_http_status_code?
-              node.int_type? &&
-                !::Rack::Utils::SYMBOL_TO_STATUS_CODE.value?(node.source.to_i)
-            end
           end
 
           # :nodoc:
-          class NumericStyleChecker
-            MSG = 'Prefer `%<prefer>s` over `%<current>s` ' \
-                  'to describe HTTP status code.'
-
-            ALLOWED_STATUSES = %i[error success missing redirect].freeze
-
-            attr_reader :node
-
-            def initialize(node)
-              @node = node
-            end
-
+          class NumericStyleChecker < StyleCheckerBase
             def offensive?
               !node.int_type? && !allowed_symbol?
             end
 
-            def message
-              format(MSG, prefer: preferred_style, current: symbol.inspect)
+            def prefer
+              number.to_s
             end
 
-            def preferred_style
-              number.to_s
+            def current
+              symbol.inspect
             end
 
             private
 
+            def symbol
+              node.value
+            end
+
             def number
               ::Rack::Utils::SYMBOL_TO_STATUS_CODE[symbol]
             end
+          end
+
+          # :nodoc:
+          class BeStatusStyleChecker < StyleCheckerBase
+            def offensive?
+              (!node.sym_type? && !custom_http_status_code?) ||
+                (!node.int_type? && !allowed_symbol?)
+            end
+
+            def offense_range
+              node.parent
+            end
+
+            def prefer
+              if node.sym_type?
+                "be_#{node.value}"
+              else
+                "be_#{symbol}"
+              end
+            end
+
+            def current
+              offense_range.source
+            end
+
+            private
 
             def symbol
-              node.value
+              ::Rack::Utils::SYMBOL_TO_STATUS_CODE.key(number)
             end
 
-            def allowed_symbol?
-              node.sym_type? && ALLOWED_STATUSES.include?(node.value)
+            def number
+              node.source.to_i
             end
           end
         end

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

@@ -13,9 +13,9 @@ module RuboCop
         #   refute_equal(a, b)
         #
         #   # good
-        #   expect(a).to eq(b)
-        #   expect(a).to(eq(b), "must be equal")
-        #   expect(a).not_to eq(b)
+        #   expect(b).to eq(a)
+        #   expect(b).to(eq(a), "must be equal")
+        #   expect(b).not_to eq(a)
         #
         class MinitestAssertions < Base
           extend AutoCorrector
@@ -43,9 +43,9 @@ module RuboCop
           def replacement(node, expected, actual, failure_message)
             runner = node.method?(:assert_equal) ? 'to' : 'not_to'
             if failure_message.nil?
-              "expect(#{expected.source}).#{runner} eq(#{actual.source})"
+              "expect(#{actual.source}).#{runner} eq(#{expected.source})"
             else
-              "expect(#{expected.source}).#{runner}(eq(#{actual.source}), " \
+              "expect(#{actual.source}).#{runner}(eq(#{expected.source}), " \
                 "#{failure_message.source})"
             end
           end

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

@@ -41,11 +41,7 @@ module RuboCop
 
         # @!method match_redundant_around_hook_block?(node)
         def_node_matcher :match_redundant_around_hook_block?, <<~PATTERN
-          (block
-            (send _ :around ...)
-            (args _?)
-            (send _ :run)
-          )
+          ({block numblock} (send _ :around ...) ... (send _ :run))
         PATTERN
 
         # @!method match_redundant_around_hook_send?(node)

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

@@ -23,6 +23,9 @@ module RuboCop
       #   end
       #
       class ScatteredSetup < Base
+        include RangeHelp
+        extend AutoCorrector
+
         MSG = 'Do not define multiple `%<hook_name>s` hooks in the same ' \
               'example group (also defined on %<lines>s).'
 
@@ -30,13 +33,11 @@ module RuboCop
           return unless example_group?(node)
 
           repeated_hooks(node).each do |occurrences|
-            lines = occurrences.map(&:first_line)
-
             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))
-              add_offense(occurrence, message: message)
+              message = message(occurrences, occurrence)
+              add_offense(occurrence, message: message) do |corrector|
+                autocorrect(corrector, occurrences.first, occurrence)
+              end
             end
           end
         end
@@ -63,6 +64,22 @@ module RuboCop
             "lines #{numbers.join(', ')}"
           end
         end
+
+        def message(occurrences, occurrence)
+          lines = occurrences.map(&:first_line)
+          lines_except_current = lines - [occurrence.first_line]
+          format(MSG, hook_name: occurrences.first.method_name,
+                      lines: lines_msg(lines_except_current))
+        end
+
+        def autocorrect(corrector, first_occurrence, occurrence)
+          return if first_occurrence == occurrence || !first_occurrence.body
+
+          corrector.insert_after(first_occurrence.body,
+                                 "\n#{occurrence.body.source}")
+          corrector.remove(range_by_whole_lines(occurrence.source_range,
+                                                include_final_newline: true))
+        end
       end
     end
   end

data/lib/rubocop/cop/rspec_cops.rb

@@ -32,6 +32,7 @@ require_relative 'rspec/align_right_let_brace'
 require_relative 'rspec/any_instance'
 require_relative 'rspec/around_block'
 require_relative 'rspec/be'
+require_relative 'rspec/be_empty'
 require_relative 'rspec/be_eq'
 require_relative 'rspec/be_eql'
 require_relative 'rspec/be_nil'
@@ -71,6 +72,7 @@ require_relative 'rspec/identical_equality_assertion'
 require_relative 'rspec/implicit_block_expectation'
 require_relative 'rspec/implicit_expect'
 require_relative 'rspec/implicit_subject'
+require_relative 'rspec/indexed_let'
 require_relative 'rspec/instance_spy'
 require_relative 'rspec/instance_variable'
 require_relative 'rspec/it_behaves_like'

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.19.0'
+      STRING = '2.21.0'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rspec
 version: !ruby/object:Gem::Version
-  version: 2.19.0
+  version: 2.21.0
 platform: ruby
 authors:
 - John Backus
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-06 00:00:00.000000000 Z
+date: 2023-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -66,6 +66,7 @@ files:
 - lib/rubocop/cop/rspec/around_block.rb
 - lib/rubocop/cop/rspec/base.rb
 - lib/rubocop/cop/rspec/be.rb
+- lib/rubocop/cop/rspec/be_empty.rb
 - lib/rubocop/cop/rspec/be_eq.rb
 - lib/rubocop/cop/rspec/be_eql.rb
 - lib/rubocop/cop/rspec/be_nil.rb
@@ -119,6 +120,7 @@ files:
 - lib/rubocop/cop/rspec/implicit_block_expectation.rb
 - lib/rubocop/cop/rspec/implicit_expect.rb
 - lib/rubocop/cop/rspec/implicit_subject.rb
+- lib/rubocop/cop/rspec/indexed_let.rb
 - lib/rubocop/cop/rspec/instance_spy.rb
 - lib/rubocop/cop/rspec/instance_variable.rb
 - lib/rubocop/cop/rspec/it_behaves_like.rb
@@ -220,14 +222,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.12
 signing_key:
 specification_version: 4
 summary: Code style checking for RSpec files