Use any_block in node patterns

Co-authored-by: Daniel Vandersluis <[email protected]>

Author: bquorning

.rubocop_todo.yml

@@ -6,18 +6,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# This cop supports safe autocorrection (--autocorrect).
-InternalAffairs/NodePatternGroups:
-  Exclude:
-    - 'lib/rubocop/cop/rspec/described_class.rb'
-    - 'lib/rubocop/cop/rspec/described_class_module_wrapping.rb'
-    - 'lib/rubocop/cop/rspec/hook_argument.rb'
-    - 'lib/rubocop/cop/rspec/hooks_before_examples.rb'
-    - 'lib/rubocop/cop/rspec/no_expectation_example.rb'
-    - 'lib/rubocop/cop/rspec/pending_without_reason.rb'
-    - 'lib/rubocop/cop/rspec/redundant_around.rb'
-    - 'lib/rubocop/rspec/language.rb'
-
 # This cop supports safe autocorrection (--autocorrect).
 InternalAffairs/NodeTypeMultiplePredicates:
   Exclude:

lib/rubocop/cop/rspec/described_class.rb

@@ -83,7 +83,7 @@ class DescribedClass < Base # rubocop:disable Metrics/ClassLength
 
         # @!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}'

lib/rubocop/cop/rspec/described_class_module_wrapping.rb

@@ -24,7 +24,7 @@ class DescribedClassModuleWrapping < Base
 
         # @!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)

lib/rubocop/cop/rspec/hook_argument.rb

@@ -67,12 +67,12 @@ class HookArgument < Base
 
         # @!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)

lib/rubocop/cop/rspec/hooks_before_examples.rb

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

lib/rubocop/cop/rspec/no_expectation_example.rb

@@ -65,7 +65,7 @@ class NoExpectationExample < Base
         # @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)

lib/rubocop/cop/rspec/pending_without_reason.rb

@@ -63,8 +63,7 @@ class PendingWithoutReason < Base
         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 @@ class PendingWithoutReason < Base
 
         # @!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)

lib/rubocop/cop/rspec/redundant_around.rb

@@ -41,7 +41,7 @@ def on_send(node)
 
         # @!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)

lib/rubocop/rspec/language.rb

@@ -26,7 +26,7 @@ class << self
 
       # @!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 @@ class << self
 
       # @!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 @@ class << self
 
       # @!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)