Merge pull request #1621 from ydah/refactor-RedundantAround

Refactor with integration into `match_redundant_around_hook_block`
rubocop · Apr 18, 2023 · 7e2a570 · 7e2a570
2 parents 35e07d5 + 219868e
commit 7e2a570
Showing 1 changed file with 2 additions and 18 deletions.
diff --git a/lib/rubocop/cop/rspec/redundant_around.rb b/lib/rubocop/cop/rspec/redundant_around.rb
@@ -27,14 +27,7 @@ def on_block(node)
             autocorrect(corrector, node)
           end
         end
-
-        def on_numblock(node)
-          return unless match_redundant_around_hook_numblock?(node)
-
-          add_offense(node) do |corrector|
-            autocorrect(corrector, node)
-          end
-        end
+        alias on_numblock on_block
 
         def on_send(node)
           return unless match_redundant_around_hook_send?(node)
@@ -48,16 +41,7 @@ def on_send(node)
 
         # @!method match_redundant_around_hook_block?(node)
         def_node_matcher :match_redundant_around_hook_block?, <<~PATTERN
-          (block
-            (send _ :around ...)
-            (args _?)
-            (send _ :run)
-          )
-        PATTERN
-
-        # @!method match_redundant_around_hook_numblock?(node)
-        def_node_matcher :match_redundant_around_hook_numblock?, <<~PATTERN
-          (numblock (send _ :around) ... (send _ :run))
+          ({block numblock} (send _ :around ...) ... (send _ :run))
         PATTERN
 
         # @!method match_redundant_around_hook_send?(node)