Merge pull request #2114 from rubocop/fix-offenses

Fix offenses for InternalAffairs/NodePatternGroups cop

Author: ydah

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Master (Unreleased)
 
 - Add new cop `RSpec/LeakyLocalVariable`. ([@lovro-bikic])
+- Bump RuboCop requirement to +1.81. ([@ydah])
 
 ## 3.7.0 (2025-09-01)
 

lib/rubocop/cop/rspec/context_wording.rb

@@ -67,7 +67,7 @@ class ContextWording < Base
 
         # @!method context_wording(node)
         def_node_matcher :context_wording, <<~PATTERN
-          (block (send #rspec? { :context :shared_context } $({str dstr xstr} ...) ...) ...)
+          (block (send #rspec? { :context :shared_context } $(any_str ...) ...) ...)
         PATTERN
 
         def on_block(node) # rubocop:disable InternalAffairs/NumblockHandler

lib/rubocop/cop/rspec/mixin/final_end_location.rb

@@ -7,7 +7,7 @@ module RSpec
       module FinalEndLocation
         def final_end_location(start_node)
           heredoc_endings =
-            start_node.each_node(:str, :dstr, :xstr)
+            start_node.each_node(:any_str)
               .select(&:heredoc?)
               .map { |node| node.loc.heredoc_end }
 

lib/rubocop/cop/rspec/mixin/variable.rb

@@ -13,7 +13,7 @@ module Variable
         # @!method variable_definition?(node)
         def_node_matcher :variable_definition?, <<~PATTERN
           (send nil? {#Subjects.all #Helpers.all}
-            $({sym str dsym dstr} ...) ...)
+            $({any_sym str dstr} ...) ...)
         PATTERN
       end
     end

lib/rubocop/cop/rspec/predicate_matcher.rb

@@ -181,9 +181,7 @@ def uncorrectable_matcher?(node, matcher)
         end
 
         def heredoc_argument?(matcher)
-          matcher.arguments.select do |arg|
-            arg.type?(:str, :dstr, :xstr)
-          end.any?(&:heredoc?)
+          matcher.arguments.select(&:any_str_type?).any?(&:heredoc?)
         end
 
         # @!method predicate_matcher?(node)

lib/rubocop/cop/rspec/sort_metadata.rb

@@ -30,7 +30,7 @@ class SortMetadata < Base
 
         # @!method match_ambiguous_trailing_metadata?(node)
         def_node_matcher :match_ambiguous_trailing_metadata?, <<~PATTERN
-          (send _ _ _ ... !{hash sym str dstr xstr})
+          (send _ _ _ ... !{hash sym any_str})
         PATTERN
 
         def on_metadata(args, hash)

lib/rubocop/cop/rspec/variable_definition.rb

@@ -69,7 +69,7 @@ def string?(node)
         end
 
         def symbol?(node)
-          node.type?(:sym, :dsym)
+          node.any_sym_type?
         end
       end
     end

rubocop-rspec.gemspec

@@ -39,5 +39,5 @@ Gem::Specification.new do |spec|
   }
 
   spec.add_dependency 'lint_roller', '~> 1.1'
-  spec.add_dependency 'rubocop', '~> 1.72', '>= 1.72.1'
+  spec.add_dependency 'rubocop', '~> 1.81'
 end