fixup! Further simplify Pending cop

rubocop · Aug 11, 2019 · 6a5b595 · 6a5b595
1 parent 3d908ff
commit 6a5b595
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/lib/rubocop/cop/rspec/pending.rb b/lib/rubocop/cop/rspec/pending.rb
@@ -39,29 +39,26 @@ class Pending < Cop
 
         def_node_matcher :skippable?, SKIPPABLE.send_pattern
 
-        def_node_matcher :skipped_in_symbol_metadata?, <<-PATTERN
-          (send _ _ <#skip_or_pending? ...>)
-        PATTERN
-
-        def_node_matcher :skipped_in_hash_metadata?, <<-PATTERN
-          (send _ _ ... (hash <(pair #skip_or_pending? true) ...>))
+        def_node_matcher :skipped_in_metadata?, <<-PATTERN
+          {
+            (send _ _ <#skip_or_pending? ...>)
+            (send _ _ ... (hash <(pair #skip_or_pending? true) ...>))
+          }
         PATTERN
 
         def_node_matcher :skip_or_pending?, '{(sym :skip) (sym :pending)}'
         def_node_matcher :pending_block?, PENDING.send_pattern
 
         def on_send(node)
-          return unless pending_block?(node) || skipped_in_metadata?(node)
+          return unless pending_block?(node) || skipped?(node)
 
           add_offense(node)
         end
 
         private
 
-        def skipped_in_metadata?(node)
-          return unless skippable?(node)
-
-          skipped_in_hash_metadata?(node) || skipped_in_symbol_metadata?(node)
+        def skipped?(node)
+          skippable?(node) && skipped_in_metadata?(node)
         end
       end
     end