Merge pull request #777 from rubocop-hq/improve-focus-cop

Improve Focus cop

Author: bquorning

CHANGELOG.md

@@ -8,6 +8,8 @@
 * Update RuboCop dependency to 0.68.1 with support for children matching node pattern syntax. ([@pirj][])
 * Add `RSpec/EmptyLineAfterExample` cop to check that there is an empty line after example blocks. ([@pirj][])
 * Fix `Capybara/CurrentPathExpectation` auto-corrector, to include option `ignore_query: true`. ([@onumis][])
+* Fix `RSpec/Focus` detecting mixed array/hash metadata. ([@dgollahon][])
+* Fix `RSpec/Focus` to also detect `pending` examples. ([@dgollahon][])
 
 ## 1.35.0 (2019-08-02)
 

lib/rubocop/cop/rspec/focus.rb

@@ -26,18 +26,16 @@ class Focus < Cop
           ExampleGroups::GROUPS  +
           ExampleGroups::SKIPPED +
           Examples::EXAMPLES     +
-          Examples::SKIPPED
+          Examples::SKIPPED      +
+          Examples::PENDING
 
         focused = ExampleGroups::FOCUSED + Examples::FOCUSED
 
         FOCUSABLE_SELECTORS = focusable.node_pattern_union
 
-        FOCUS_SYMBOL = s(:sym, :focus)
-        FOCUS_TRUE   = s(:pair, FOCUS_SYMBOL, s(:true))
-
         def_node_matcher :metadata, <<-PATTERN
-          {(send #{RSPEC} #{FOCUSABLE_SELECTORS} ... (hash $...))
-           (send #{RSPEC} #{FOCUSABLE_SELECTORS} $...)}
+          {(send #{RSPEC} #{FOCUSABLE_SELECTORS} <$(sym :focus) ...>)
+           (send #{RSPEC} #{FOCUSABLE_SELECTORS} ... (hash <$(pair (sym :focus) true) ...>))}
         PATTERN
 
         def_node_matcher :focused_block?, focused.send_pattern
@@ -53,10 +51,7 @@ def on_send(node)
         def focus_metadata(node, &block)
           yield(node) if focused_block?(node)
 
-          metadata(node) do |matches|
-            matches.grep(FOCUS_SYMBOL, &block)
-            matches.grep(FOCUS_TRUE, &block)
-          end
+          metadata(node, &block)
         end
       end
     end

spec/rubocop/cop/rspec/focus_spec.rb

@@ -38,6 +38,8 @@
                                    ^^^^^^^^^^^ Focused spec found.
       xscenario 'test', meta: true, focus: true do; end
                                     ^^^^^^^^^^^ Focused spec found.
+      pending 'test', meta: true, focus: true do; end
+                                  ^^^^^^^^^^^ Focused spec found.
     RUBY
   end
 
@@ -75,6 +77,8 @@
                        ^^^^^^ Focused spec found.
       it 'test', :focus do; end
                  ^^^^^^ Focused spec found.
+      pending 'test', :focus do; end
+                      ^^^^^^ Focused spec found.
     RUBY
   end
   # rubocop:enable RSpec/ExampleLength
@@ -136,4 +140,11 @@
       ^^^^^^^^^^^^ Focused spec found.
     RUBY
   end
+
+  it 'flags rspec example blocks that include `:focus` preceding a hash' do
+    expect_offense(<<-RUBY)
+      describe 'test', :focus, js: true do; end
+                       ^^^^^^ Focused spec found.
+    RUBY
+  end
 end