Fix focus detection for mixed array/hash metadata

- Due to the order of how the patterns were defined, the hash capture took priority over the broader capture pattern. I've changed the matching logic to be directly represented by the any-order matcher patterns which also simplifies the code, if just slightly.
- Closes #775

Author: dgollahon

lib/rubocop/cop/rspec/focus.rb

@@ -32,12 +32,9 @@ class Focus < Cop
 
         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 +50,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

@@ -136,4 +136,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