rubocop-rspec 3.4.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a2433cc3212de48725bca4fa2f8216ef0742950d1b0ad0a52e0d717050ede4e
-  data.tar.gz: 3e43165a772275ece7344813b6dfc5196669763013c0bedc3b75107cf6fa0f30
+  metadata.gz: 4e4727f136d1a399d3108fd010c76ac61f7fce57e3c89cb2d97ad121d558af44
+  data.tar.gz: dcc8c7f61c420d5938807dae3a610f53c6be8c657687e38542f701db2aec4ce2
 SHA512:
-  metadata.gz: 41a9171c098150e3349977cd08df5f369fe2d33c0bb4f1b29edcfb2633eae2c880ab1ff71a9c4a1ee5dc28645a6359ecd3e4ab99a822ac576523386e78364ee2
-  data.tar.gz: af1c164ac3d8c9e9ed61611fa9877c459656f695fd45c057c776af99304fcd8471fa00d958d7bf650ba46f82056ae96accd12cfeec17eb1a00129baffdb51768
+  metadata.gz: 651f8b53a0b70738f9dc084df5bdf471ce65ae4d7f0c2db8cc2eb557178fd541f317bee36ae062b8109aed72b452f69eb1c965db923d5d9875c86de9ab84f23e
+  data.tar.gz: f189ec83b4b663df4e3aca303f2f273fded6d5529e689d7f9421f379dd46203da95236a4f649414466b0f6050b0d9e7d952df003b4b63ed45722c1764fd1a094

data/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 ## Master (Unreleased)
 
+## 3.6.0 (2025-04-18)
+
+- Fix false positive in `RSpec/Pending`, where it would mark the default block `it` as an offense. ([@bquorning])
+- Fix issue when `Style/ContextWording` is configured with a Prefix being interpreted as a boolean, like `on`. ([@sakuro])
+- Add new `RSpec/IncludeExamples` cop to enforce using `it_behaves_like` over `include_examples`. ([@dvandersluis])
+- Change `RSpec/ScatteredSetup` to allow `around` hooks to be scattered. ([@ydah])
+- Fix an error `RSpec/ChangeByZero` cop when without expect block. ([@lee266])
+- Fix a false positive for `RSpec/DescribedClass` when `SkipBlocks` is true and numblocks are used. ([@earlopain])
+
+## 3.5.0 (2025-02-16)
+
+- Don't let `RSpec/PredicateMatcher` replace `respond_to?` with two arguments with the RSpec `respond_to` matcher. ([@bquorning])
+- Fix `RSpec/PredicateMatcher` support for `eql` and `equal` matchers. ([@bquorning])
+- Pluginfy RuboCop RSpec. ([@koic])
+
 ## 3.4.0 (2025-01-20)
 
 - Fix `RSpec/SortMetadata` cop to limit sorting to trailing metadata arguments. ([@cbliard])
@@ -992,6 +1007,7 @@ Compatibility release so users can upgrade RuboCop to 0.51.0. No new features.
 [@krororo]: https://github.com/krororo
 [@kuahyeow]: https://github.com/kuahyeow
 [@lazycoder9]: https://github.com/lazycoder9
+[@lee266]: https://github.com/lee266
 [@leoarnold]: https://github.com/leoarnold
 [@liberatys]: https://github.com/Liberatys
 [@lokhi]: https://github.com/lokhi
@@ -1032,6 +1048,7 @@ Compatibility release so users can upgrade RuboCop to 0.51.0. No new features.
 [@rrosenblum]: https://github.com/rrosenblum
 [@rspeicher]: https://github.com/rspeicher
 [@rst-j]: https://github.com/RST-J
+[@sakuro]: https://github.com/sakuro
 [@samrjenkins]: https://github.com/samrjenkins
 [@schmijos]: https://github.com/schmijos
 [@seanpdoyle]: https://github.com/seanpdoyle

data/README.md

@@ -48,13 +48,13 @@ ways to do this:
 Put this into your `.rubocop.yml`.
 
 ```yaml
-require: rubocop-rspec
+plugins: rubocop-rspec
 ```
 
 Alternatively, use the following array notation when specifying multiple extensions.
 
 ```yaml
-require:
+plugins:
   - rubocop-other-extension
   - rubocop-rspec
 ```
@@ -62,17 +62,20 @@ require:
 Now you can run `rubocop` and it will automatically load the RuboCop RSpec
 cops together with the standard cops.
 
+> [!NOTE]
+> The plugin system is supported in RuboCop 1.72+. In earlier versions, use `require` instead of `plugins`.
+
 ### Command line
 
 ```bash
-rubocop --require rubocop-rspec
+rubocop --plugin rubocop-rspec
 ```
 
 ### Rake task
 
 ```ruby
 RuboCop::RakeTask.new do |task|
-  task.requires << 'rubocop-rspec'
+  task.plugins << 'rubocop-rspec'
 end
 ```
 

data/config/default.yml

@@ -532,6 +532,12 @@ RSpec/ImplicitSubject:
   VersionChanged: '2.13'
   Reference: https://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/ImplicitSubject
 
+RSpec/IncludeExamples:
+  Description: Checks for usage of `include_examples`.
+  Enabled: pending
+  VersionAdded: '3.6'
+  Reference: https://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/IncludeExamples
+
 RSpec/IndexedLet:
   Description: Do not set up test data using indexes (e.g., `item_1`, `item_2`).
   Enabled: true

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

@@ -31,7 +31,7 @@ module RuboCop
 
         # @!method eq_type_with_identity?(node)
         def_node_matcher :eq_type_with_identity?, <<~PATTERN
-          (send nil? :eq {true false nil})
+          (send nil? :eq {boolean nil})
         PATTERN
 
         def on_send(node)

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

@@ -45,7 +45,7 @@ module RuboCop
 
         # @!method eql_type_with_identity(node)
         def_node_matcher :eql_type_with_identity, <<~PATTERN
-          (send _ :to $(send nil? :eql {true false int float sym nil}))
+          (send _ :to $(send nil? :eql {boolean int float sym nil}))
         PATTERN
 
         def on_send(node)

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

@@ -48,6 +48,10 @@ module RuboCop
             check_be_style(node)
           when :be_nil
             check_be_nil_style(node)
+          else
+            # :nocov:
+            :noop
+            # :nocov:
           end
         end
 

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

@@ -101,8 +101,9 @@ module RuboCop
 
         private
 
-        # rubocop:disable Metrics/MethodLength
         def register_offense(node, change_node)
+          return unless node.parent.send_type?
+
           if compound_expectations?(node)
             add_offense(node,
                         message: message_compound(change_node)) do |corrector|
@@ -115,11 +116,9 @@ module RuboCop
             end
           end
         end
-        # rubocop:enable Metrics/MethodLength
 
         def compound_expectations?(node)
-          node.parent.send_type? &&
-            %i[and or & |].include?(node.parent.method_name)
+          %i[and or & |].include?(node.parent.method_name)
         end
 
         def message(change_node)

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

@@ -115,7 +115,12 @@ module RuboCop
         end
 
         def prefixes
-          Array(cop_config.fetch('Prefixes', []))
+          Array(cop_config.fetch('Prefixes', [])).tap do |prefixes|
+            non_strings = prefixes.reject { |pre| pre.is_a?(String) }
+            unless non_strings.empty?
+              raise "Non-string prefixes #{non_strings.inspect} detected."
+            end
+          end
         end
       end
     end

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

@@ -83,7 +83,7 @@ module RuboCop
 
         # @!method rspec_block?(node)
         def_node_matcher :rspec_block?,
-                         '({block numblock} (send #rspec? #ALL.all ...) ...)'
+                         '(any_block (send #rspec? #ALL.all ...) ...)'
 
         # @!method scope_changing_syntax?(node)
         def_node_matcher :scope_changing_syntax?, '{def class module}'
@@ -153,7 +153,9 @@ module RuboCop
         end
 
         def skippable_block?(node)
-          node.block_type? && !rspec_block?(node) && cop_config['SkipBlocks']
+          return false unless cop_config['SkipBlocks']
+
+          node.any_block_type? && !rspec_block?(node)
         end
 
         def only_static_constants?

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

@@ -24,7 +24,7 @@ module RuboCop
 
         # @!method include_rspec_blocks?(node)
         def_node_search :include_rspec_blocks?, <<~PATTERN
-          ({block numblock} (send #explicit_rspec? #ExampleGroups.all ...) ...)
+          (any_block (send #explicit_rspec? #ExampleGroups.all ...) ...)
         PATTERN
 
         def on_module(node)

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

@@ -137,7 +137,7 @@ module RuboCop
         PATTERN
 
         def on_block(node) # rubocop:disable InternalAffairs/NumblockHandler
-          return if node.each_ancestor(:def, :defs).any?
+          return if node.each_ancestor(:any_def).any?
           return if node.each_ancestor(:block).any? { |block| example?(block) }
 
           example_group_body(node) do |body|
@@ -155,7 +155,7 @@ module RuboCop
           return true unless body
           return false if conditionals_with_examples?(body)
 
-          if body.if_type? || body.case_type?
+          if body.type?(:if, :case)
             !examples_in_branches?(body)
           else
             !examples?(body)
@@ -163,7 +163,7 @@ module RuboCop
         end
 
         def conditionals_with_examples?(body)
-          return false unless body.begin_type? || body.case_type?
+          return false unless body.type?(:begin, :case)
 
           body.each_descendant(:if, :case).any? do |condition_node|
             examples_in_branches?(condition_node)
@@ -172,7 +172,7 @@ module RuboCop
 
         def examples_in_branches?(condition_node)
           return false unless condition_node
-          return false if !condition_node.if_type? && !condition_node.case_type?
+          return false unless condition_node.type?(:if, :case)
 
           condition_node.branches.any? { |branch| examples?(branch) }
         end

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

@@ -67,7 +67,6 @@ module RuboCop
           } ...) ...)
         PATTERN
 
-        # rubocop:disable Metrics/MethodLength
         def on_block(node) # rubocop:disable InternalAffairs/NumblockHandler
           it_description(node) do |description_node, message|
             if message.match?(SHOULD_PREFIX)
@@ -82,7 +81,6 @@ module RuboCop
             end
           end
         end
-        # rubocop:enable Metrics/MethodLength
 
         private
 
@@ -128,7 +126,7 @@ module RuboCop
             node.node_parts.map { |child_node| text(child_node) }.join
           when :str
             node.value
-          when :begin
+          else
             node.source
           end
         end

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

@@ -100,7 +100,7 @@ module RuboCop
             node.node_parts.map { |child_node| text(child_node) }.join
           when :str, :sym
             node.value
-          when :begin
+          else
             node.source
           end
         end

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

@@ -65,7 +65,7 @@ module RuboCop
           )
         PATTERN
 
-        def on_send(node) # rubocop:disable Metrics/MethodLength
+        def on_send(node)
           expect_literal(node) do |actual, send_node, matcher, expected|
             next if SKIPPED_MATCHERS.include?(matcher)
 

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

@@ -5,11 +5,30 @@ module RuboCop
     module RSpec
       # Checks for consistent style of change matcher.
       #
-      # Enforces either passing object and attribute as arguments to the matcher
-      # or passing a block that reads the attribute value.
+      # Enforces either passing a receiver and message as method arguments,
+      # or a block.
       #
       # This cop can be configured using the `EnforcedStyle` option.
       #
+      # @safety
+      #   Autocorrection is unsafe because `method_call` style calls the
+      #   receiver *once* and sends the message to it before and after
+      #   calling the `expect` block, whereas `block` style calls the
+      #   expression *twice*, including the receiver.
+      #
+      #   If your receiver is dynamic (e.g., the result of a method call) and
+      #   you expect it to be called before and after the `expect` block,
+      #   changing from `block` to `method_call` style may break your test.
+      #
+      #   [source,ruby]
+      #   ----
+      #   expect { run }.to change { my_method.message }
+      #   # `my_method` is called before and after `run`
+      #
+      #   expect { run }.to change(my_method, :message)
+      #   # `my_method` is called once, but `message` is called on it twice
+      #   ----
+      #
       # @example `EnforcedStyle: method_call` (default)
       #   # bad
       #   expect { run }.to change { Foo.bar }

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

@@ -73,25 +73,29 @@ module RuboCop
         PATTERN
 
         def on_send(node)
-          return if node.chained? || node.each_ancestor(:def, :defs).any?
+          return if node.chained? || node.each_ancestor(:any_def).any?
 
-          focus_metadata(node) do |focus|
-            add_offense(focus) do |corrector|
-              if focus.pair_type? || focus.str_type? || focus.sym_type?
-                corrector.remove(with_surrounding(focus))
-              elsif focus.send_type?
-                correct_send(corrector, focus)
-              end
+          if focused_block?(node)
+            on_focused_block(node)
+          else
+            metadata(node) do |focus|
+              on_metadata(focus)
             end
           end
         end
 
         private
 
-        def focus_metadata(node, &block)
-          yield(node) if focused_block?(node)
+        def on_focused_block(node)
+          add_offense(node) do |corrector|
+            correct_send(corrector, node)
+          end
+        end
 
-          metadata(node, &block)
+        def on_metadata(node)
+          add_offense(node) do |corrector|
+            corrector.remove(with_surrounding(node))
+          end
         end
 
         def with_surrounding(focus)

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

@@ -67,12 +67,12 @@ module RuboCop
 
         # @!method scoped_hook(node)
         def_node_matcher :scoped_hook, <<~PATTERN
-          ({block numblock} $(send _ #Hooks.all (sym ${:each :example})) ...)
+          (any_block $(send _ #Hooks.all (sym ${:each :example})) ...)
         PATTERN
 
         # @!method unscoped_hook(node)
         def_node_matcher :unscoped_hook, <<~PATTERN
-          ({block numblock} $(send _ #Hooks.all) ...)
+          (any_block $(send _ #Hooks.all) ...)
         PATTERN
 
         def on_block(node)

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

@@ -30,7 +30,7 @@ module RuboCop
         # @!method example_or_group?(node)
         def_node_matcher :example_or_group?, <<~PATTERN
           {
-            ({block numblock} {
+            (any_block {
               (send #rspec? #ExampleGroups.all ...)
               (send nil? #Examples.all ...)
             } ...)

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

@@ -46,7 +46,7 @@ module RuboCop
 
         ENFORCED_REPLACEMENTS = alternatives.merge(alternatives.invert).freeze
 
-        def on_send(node) # rubocop:disable Metrics/MethodLength
+        def on_send(node)
           return unless (source_range = offending_expect(node))
 
           expectation_source = source_range.source
@@ -69,13 +69,13 @@ module RuboCop
         def offending_expect(node)
           case implicit_expect(node)
           when :is_expected
-            is_expected_range(node.loc)
+            range_for_is_expected(node.loc)
           when :should, :should_not
             node.loc.selector
           end
         end
 
-        def is_expected_range(source_map) # rubocop:disable Naming/PredicateName
+        def range_for_is_expected(source_map)
           Parser::Source::Range.new(
             source_map.expression.source_buffer,
             source_map.expression.begin_pos,

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

@@ -107,6 +107,10 @@ module RuboCop
             corrector.replace(node.location.selector, 'expect(subject).to')
           when :should_not
             corrector.replace(node.location.selector, 'expect(subject).not_to')
+          else
+            # :nocov:
+            :noop
+            # :nocov:
           end
         end
 
@@ -129,6 +133,10 @@ module RuboCop
             implicit_subject_in_non_its_and_non_single_line?(node)
           when :single_statement_only
             implicit_subject_in_non_its_and_non_single_statement?(node)
+          else
+            # :nocov:
+            :noop
+            # :nocov:
           end
         end
 

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module RSpec
+      # Checks for usage of `include_examples`.
+      #
+      # `include_examples`, unlike `it_behaves_like`, does not create its
+      # own context. As such, using `subject`, `let`, `before`/`after`, etc.
+      # within shared examples included with `include_examples` can have
+      # unexpected behavior and side effects.
+      #
+      # Prefer using `it_behaves_like` instead.
+      #
+      # @example
+      #   # bad
+      #   include_examples 'examples'
+      #
+      #   # good
+      #   it_behaves_like 'examples'
+      #
+      class IncludeExamples < Base
+        extend AutoCorrector
+
+        MSG = 'Prefer `it_behaves_like` over `include_examples`.'
+
+        RESTRICT_ON_SEND = %i[include_examples].freeze
+
+        def on_send(node)
+          selector = node.loc.selector
+
+          add_offense(selector) do |corrector|
+            corrector.replace(selector, 'it_behaves_like')
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -74,7 +74,9 @@ module RuboCop
         private
 
         SUFFIX_INDEX_REGEX = /_?\d+$/.freeze
+        private_constant :SUFFIX_INDEX_REGEX
         INDEX_REGEX = /\d+/.freeze
+        private_constant :INDEX_REGEX
 
         def filter_indexed_lets(candidates)
           candidates

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

@@ -80,6 +80,10 @@ module RuboCop
             MSG_RECEIVE
           when :have_received
             format(MSG_HAVE_RECEIVED, source: receiver.source)
+          else
+            # :nocov:
+            :noop
+            # :nocov:
           end
         end
       end

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

@@ -133,8 +133,8 @@ module RuboCop
 
         def count_up_nesting?(node, example_group)
           example_group &&
-            (node.block_type? &&
-            !allowed_groups.include?(node.method_name.to_s))
+            node.block_type? &&
+            !allowed_groups.include?(node.method_name.to_s)
         end
 
         def message(nesting)

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

@@ -65,7 +65,7 @@ module RuboCop
         # @param [RuboCop::AST::Node] node
         # @return [Boolean]
         def_node_matcher :regular_or_focused_example?, <<~PATTERN
-          ({block numblock} (send nil? {#Examples.regular #Examples.focused} ...) ...)
+          (any_block (send nil? {#Examples.regular #Examples.focused} ...) ...)
         PATTERN
 
         # @!method includes_expectation?(node)

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

@@ -47,7 +47,7 @@ module RuboCop
 
         # @!method skippable_example?(node)
         def_node_matcher :skippable_example?, <<~PATTERN
-          (send nil? #Examples.regular ...)
+          (send nil? #Examples.regular _ ...)
         PATTERN
 
         # @!method pending_block?(node)

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

@@ -63,8 +63,7 @@ module RuboCop
         def_node_matcher :skipped_in_example?, <<~PATTERN
           {
             (send nil? ${#Examples.skipped #Examples.pending})
-            (block (send nil? ${#Examples.skipped}) ...)
-            (numblock (send nil? ${#Examples.skipped}) ...)
+            (any_block (send nil? ${#Examples.skipped}) ...)
           }
         PATTERN
 
@@ -75,7 +74,7 @@ module RuboCop
 
         # @!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} ...) ...)
+          (any_block (send nil? ${#Examples.skipped #Examples.pending} ...) ...)
         PATTERN
 
         # @!method metadata_without_reason?(node)

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

@@ -15,6 +15,8 @@ module RuboCop
 
         def check_inflected(node)
           predicate_in_actual?(node) do |predicate, to, matcher|
+            next if cannot_replace_predicate?(predicate)
+
             msg = message_inflected(predicate)
             add_offense(node, message: msg) do |corrector|
               remove_predicate(corrector, predicate)
@@ -35,9 +37,13 @@ module RuboCop
             $#boolean_matcher? ...)
         PATTERN
 
+        def cannot_replace_predicate?(send_node)
+          send_node.method?(:respond_to?) && send_node.arguments.length > 1
+        end
+
         # @!method be_bool?(node)
         def_node_matcher :be_bool?, <<~PATTERN
-          (send nil? {:be :eq :eql :equal} {true false})
+          (send nil? {:be :eq :eql :equal} boolean)
         PATTERN
 
         # @!method be_boolthy?(node)
@@ -63,7 +69,6 @@ module RuboCop
                  matcher_name: to_predicate_matcher(predicate.method_name))
         end
 
-        # rubocop:disable Metrics/MethodLength
         def to_predicate_matcher(name)
           case name = name.to_s
           when 'is_a?'
@@ -80,7 +85,6 @@ module RuboCop
             "be_#{name[0..-2]}"
           end
         end
-        # rubocop:enable Metrics/MethodLength
 
         def remove_predicate(corrector, predicate)
           range = predicate.loc.dot.with(
@@ -106,12 +110,16 @@ module RuboCop
 
         def true?(to_symbol, matcher)
           result = case matcher.method_name
-                   when :be, :eq
+                   when :be, :eq, :eql, :equal
                      matcher.first_argument.true_type?
                    when :be_truthy, :a_truthy_value
                      true
                    when :be_falsey, :be_falsy, :a_falsey_value, :a_falsy_value
                      false
+                   else
+                     # :nocov:
+                     :noop
+                     # :nocov:
                    end
           to_symbol == :to ? result : !result
         end
@@ -174,7 +182,7 @@ module RuboCop
 
         def heredoc_argument?(matcher)
           matcher.arguments.select do |arg|
-            arg.str_type? || arg.dstr_type? || arg.xstr_type?
+            arg.type?(:str, :dstr, :xstr)
           end.any?(&:heredoc?)
         end
 
@@ -233,7 +241,6 @@ module RuboCop
           corrector.insert_after(actual, ".#{predicate}" + args + block)
         end
 
-        # rubocop:disable Metrics/MethodLength
         def to_predicate_method(matcher)
           case matcher = matcher.to_s
           when 'be_a', 'be_an', 'be_a_kind_of', 'a_kind_of', 'be_kind_of'
@@ -250,7 +257,6 @@ module RuboCop
             "#{matcher[/\Abe_(.+)/, 1]}?"
           end
         end
-        # rubocop:enable Metrics/MethodLength
 
         def replacement_matcher(node)
           case [cop_config['Strict'], node.method?(:to)]
@@ -260,7 +266,7 @@ module RuboCop
             'be(false)'
           when [false, true]
             'be_truthy'
-          when [false, false]
+          else
             'be_falsey'
           end
         end
@@ -329,6 +335,10 @@ module RuboCop
             check_inflected(node)
           when :explicit
             check_explicit(node)
+          else
+            # :nocov:
+            :noop
+            # :nocov:
           end
         end
 

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

@@ -148,8 +148,7 @@ module RuboCop
         end
 
         def heredoc_or_splat?(node)
-          ((node.str_type? || node.dstr_type?) && node.heredoc?) ||
-            node.splat_type?
+          (node.type?(:str, :dstr) && node.heredoc?) || node.splat_type?
         end
 
         def requires_quotes?(value)

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

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

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

@@ -80,10 +80,10 @@ module RuboCop
 
         def check_block_body(block)
           body = block.body
-          unless dynamic?(body) # rubocop:disable Style/GuardClause
-            add_offense(block.loc.begin, message: MSG_AND_RETURN) do |corrector|
-              BlockBodyCorrector.new(block).call(corrector)
-            end
+          return if dynamic?(body)
+
+          add_offense(block.loc.begin, message: MSG_AND_RETURN) do |corrector|
+            BlockBodyCorrector.new(block).call(corrector)
           end
         end
 
@@ -162,6 +162,7 @@ module RuboCop
           end
 
           NULL_BLOCK_BODY = Struct.new(:loc, :source).new(nil, 'nil')
+          private_constant :NULL_BLOCK_BODY
         end
       end
     end

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

@@ -5,7 +5,9 @@ module RuboCop
     module RSpec
       # Checks for setup scattered across multiple hooks in an example group.
       #
-      # Unify `before`, `after`, and `around` hooks when possible.
+      # Unify `before` and `after` hooks when possible.
+      # However, `around` hooks are allowed to be defined multiple times,
+      # as unifying them would typically make the code harder to read.
       #
       # @example
       #   # bad
@@ -22,6 +24,12 @@ module RuboCop
       #     end
       #   end
       #
+      #   # good
+      #   describe Foo do
+      #     around { |example| before1; example.call; after1 }
+      #     around { |example| before2; example.call; after2 }
+      #   end
+      #
       class ScatteredSetup < Base
         include FinalEndLocation
         include RangeHelp
@@ -48,7 +56,7 @@ module RuboCop
         def repeated_hooks(node)
           hooks = RuboCop::RSpec::ExampleGroup.new(node)
             .hooks
-            .select(&:knowable_scope?)
+            .select { |hook| hook.knowable_scope? && hook.name != :around }
             .group_by { |hook| [hook.name, hook.scope, hook.metadata] }
             .values
             .reject(&:one?)

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

@@ -69,7 +69,7 @@ module RuboCop
         end
 
         def symbol?(node)
-          node.sym_type? || node.dsym_type?
+          node.type?(:sym, :dsym)
         end
       end
     end

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

@@ -50,7 +50,7 @@ module RuboCop
           return unless inside_example_group?(node)
 
           variable_definition?(node) do |variable|
-            return if variable.dstr_type? || variable.dsym_type?
+            return if variable.type?(:dstr, :dsym)
             return if matches_allowed_pattern?(variable.value)
 
             check_name(node, variable.value, variable.source_range)

data/lib/rubocop/cop/rspec_cops.rb

@@ -48,6 +48,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/include_examples'
 require_relative 'rspec/indexed_let'
 require_relative 'rspec/instance_spy'
 require_relative 'rspec/instance_variable'

data/lib/rubocop/rspec/config_formatter.rb

@@ -6,9 +6,7 @@ module RuboCop
   module RSpec
     # Builds a YAML config file from two config hashes
     class ConfigFormatter
-      EXTENSION_ROOT_DEPARTMENT = %r{^(RSpec/)}.freeze
-      SUBDEPARTMENTS = [].freeze
-      AMENDMENTS = %(Metrics/BlockLength)
+      EXTENSION_ROOT_DEPARTMENT = %r{^RSpec/}.freeze
       COP_DOC_BASE_URL = 'https://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/'
 
       def initialize(config, descriptions)
@@ -18,18 +16,15 @@ module RuboCop
 
       def dump
         YAML.dump(unified_config)
-          .gsub(EXTENSION_ROOT_DEPARTMENT, "\n\\1")
-          .gsub(*AMENDMENTS, "\n\\0")
-          .gsub(/^(\s+)- /, '\1  - ')
-          .gsub('"~"', '~')
+          .gsub(%r{^\w+/}, "\n\\0")   # Add an extra newline before each cop.
+          .gsub(/^(\s+)- /, '\1  - ') # Add 2 spaces before each array element.
+          .gsub('"~"', '~')           # Don't quote tilde, YAML's null value.
       end
 
       private
 
       def unified_config
         cops.each_with_object(config.dup) do |cop, unified|
-          next if SUBDEPARTMENTS.include?(cop) || AMENDMENTS.include?(cop)
-
           replace_nil(unified[cop])
           unified[cop].merge!(descriptions.fetch(cop))
           unified[cop]['Reference'] = reference(cop)

data/lib/rubocop/rspec/hook.rb

@@ -64,7 +64,9 @@ module RuboCop
       end
 
       def transform_true(node)
-        node.true_type? ? true : node
+        return true if node.true_type?
+
+        node
       end
 
       def scope_name

data/lib/rubocop/rspec/language.rb

@@ -26,7 +26,7 @@ module RuboCop
 
       # @!method example_group?(node)
       def_node_matcher :example_group?, <<~PATTERN
-        ({block numblock} (send #rspec? #ExampleGroups.all ...) ...)
+        (any_block (send #rspec? #ExampleGroups.all ...) ...)
       PATTERN
 
       # @!method shared_group?(node)
@@ -35,7 +35,7 @@ module RuboCop
 
       # @!method spec_group?(node)
       def_node_matcher :spec_group?, <<~PATTERN
-        ({block numblock} (send #rspec?
+        (any_block (send #rspec?
              {#SharedGroups.all #ExampleGroups.all}
           ...) ...)
       PATTERN
@@ -50,10 +50,7 @@ module RuboCop
 
       # @!method hook?(node)
       def_node_matcher :hook?, <<~PATTERN
-        {
-          (numblock (send nil? #Hooks.all ...) ...)
-          (block (send nil? #Hooks.all ...) ...)
-        }
+        (any_block (send nil? #Hooks.all ...) ...)
       PATTERN
 
       # @!method let?(node)

data/lib/rubocop/rspec/plugin.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'lint_roller'
+
+module RuboCop
+  module RSpec
+    # A plugin that integrates RuboCop RSpec with RuboCop's plugin system.
+    class Plugin < LintRoller::Plugin
+      # :nocov:
+      def about
+        LintRoller::About.new(
+          name: 'rubocop-rspec',
+          version: Version::STRING,
+          homepage: 'https://github.com/rubocop/rubocop-rspec',
+          description: 'Code style checking for RSpec files.'
+        )
+      end
+      # :nocov:
+
+      def supported?(context)
+        context.engine == :rubocop
+      end
+
+      def rules(_context)
+        project_root = Pathname.new(__dir__).join('../../..')
+
+        ConfigObsoletion.files << project_root.join('config', 'obsoletion.yml')
+
+        LintRoller::Rules.new(
+          type: :path,
+          config_format: :rubocop,
+          value: project_root.join('config/default.yml')
+        )
+      end
+    end
+  end
+end

data/lib/rubocop/rspec/version.rb

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

data/lib/rubocop/rspec/wording.rb

@@ -17,7 +17,6 @@ module RuboCop
         @replacements = replace
       end
 
-      # rubocop:disable Metrics/MethodLength
       def rewrite
         case text
         when SHOULDNT_BE_PREFIX
@@ -32,7 +31,6 @@ module RuboCop
           remove_should_and_pluralize
         end
       end
-      # rubocop:enable Metrics/MethodLength
 
       private
 

data/lib/rubocop/rspec.rb

@@ -3,12 +3,5 @@
 module RuboCop
   # RuboCop RSpec project namespace
   module RSpec
-    PROJECT_ROOT   = Pathname.new(__dir__).parent.parent.expand_path.freeze
-    CONFIG_DEFAULT = PROJECT_ROOT.join('config', 'default.yml').freeze
-
-    private_constant(:CONFIG_DEFAULT, :PROJECT_ROOT)
-
-    ::RuboCop::ConfigObsoletion.files << PROJECT_ROOT.join('config',
-                                                           'obsoletion.yml')
   end
 end

data/lib/rubocop-rspec.rb

@@ -6,9 +6,9 @@ require 'yaml'
 require 'rubocop'
 
 require_relative 'rubocop/rspec'
-require_relative 'rubocop/rspec/inject'
 require_relative 'rubocop/rspec/language'
 require_relative 'rubocop/rspec/node'
+require_relative 'rubocop/rspec/plugin'
 require_relative 'rubocop/rspec/version'
 require_relative 'rubocop/rspec/wording'
 
@@ -34,8 +34,6 @@ require_relative 'rubocop/rspec/example'
 require_relative 'rubocop/rspec/example_group'
 require_relative 'rubocop/rspec/hook'
 
-RuboCop::RSpec::Inject.defaults!
-
 require_relative 'rubocop/cop/rspec_cops'
 
 # We have to register our autocorrect incompatibilities in RuboCop's cops

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rspec
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.6.0
 platform: ruby
 authors:
 - John Backus
@@ -9,22 +9,42 @@ authors:
 - Nils Gemeinhardt
 bindir: bin
 cert_chain: []
-date: 2025-01-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: lint_roller
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.61'
+        version: '1.72'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.72.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.61'
+        version: '1.72'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.72.1
 description: |
   Code style checking for RSpec files.
   A plugin for the RuboCop code style enforcing & linting tool.
@@ -94,6 +114,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/include_examples.rb
 - lib/rubocop/cop/rspec/indexed_let.rb
 - lib/rubocop/cop/rspec/instance_spy.rb
 - lib/rubocop/cop/rspec/instance_variable.rb
@@ -178,9 +199,9 @@ files:
 - lib/rubocop/rspec/example.rb
 - lib/rubocop/rspec/example_group.rb
 - lib/rubocop/rspec/hook.rb
-- lib/rubocop/rspec/inject.rb
 - lib/rubocop/rspec/language.rb
 - lib/rubocop/rspec/node.rb
+- lib/rubocop/rspec/plugin.rb
 - lib/rubocop/rspec/shared_contexts/default_rspec_language_config_context.rb
 - lib/rubocop/rspec/version.rb
 - lib/rubocop/rspec/wording.rb
@@ -191,6 +212,7 @@ metadata:
   changelog_uri: https://github.com/rubocop/rubocop-rspec/blob/master/CHANGELOG.md
   documentation_uri: https://docs.rubocop.org/rubocop-rspec/
   rubygems_mfa_required: 'true'
+  default_lint_roller_plugin: RuboCop::RSpec::Plugin
 rdoc_options: []
 require_paths:
 - lib
@@ -205,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Code style checking for RSpec files
 test_files: []

data/lib/rubocop/rspec/inject.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module RuboCop
-  module RSpec
-    # Because RuboCop doesn't yet support plugins, we have to monkey patch in a
-    # bit of our configuration.
-    module Inject
-      def self.defaults!
-        path = CONFIG_DEFAULT.to_s
-        hash = ConfigLoader.send(:load_yaml_configuration, 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)
-      end
-    end
-  end
-end