rubocop-capybara 2.20.0 → 2.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 963a68452b58c47db1d1d9e7f9201db0a98a8b70bb8089473b406911fa5cc33e
-  data.tar.gz: 58e60dd5ff6097695a1029b9e37414209f7c26d2da0d16cbc6b808c8cd56efd8
+  metadata.gz: ed8a103d3d11a90d7873a5569246e580d816e2ebad0a614827bd2ed3546bf6bf
+  data.tar.gz: d09792f9ea669f7556814b898fbfd9829e8db25fdd3b8873ac85487ee9f199ef
 SHA512:
-  metadata.gz: cec93e7919aeefbb1f2b2c13f1f0caeb7627c5556f85fe219f107b6520237cccd792ad4713905dfb47151f0bcb82e04d4bd0034a7a747b741e607ea9d4de5e54
-  data.tar.gz: 3e359ec71065b5daf64cdb080d8ddfad4f6144778ad7fb89d932aa083353547663a1316efe7f9e9fd3cb7bca6a6f012812ea7f18e00c76a8af22316f24325f7c
+  metadata.gz: '0798dc5b62b3dc8a8ea31bd1f79cedde039d0d69e94cf18a902ced3da7ae757b0529fa17b8d5711baae964fb591eccfcce4f7b16320598cd9dafb657c4aee85c'
+  data.tar.gz: 7de56f77982c7b52973c38698317233da3ebeb2a55dff962c380105419d2708e43e16d5f1f63a87338ec935d6c5c24941efd95a2d308b2236d7dd840bf8c63ab

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Edge (Unreleased)
 
+## 2.21.0 (2024-06-08)
+
+- Fix a false negative for `Capybara/NegationMatcher` when using `to_not`. ([@ydah])
+- Fix a false negative for `Capybara/SpecificFinders` when using `find(:id, 'some-id')`. ([@ydah])
+
 ## 2.20.0 (2024-01-03)
 
 - Change to default `EnforcedStyle: link_or_button` for `Capybara/ClickLinkOrButtonStyle` cop. ([@ydah])

data/lib/rubocop/capybara/cop/generator.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Capybara
+    module Cop
+      # Source and spec generator for new cops
+      #
+      # This generator will take a cop name and generate a source file
+      # and spec file when given a valid qualified cop name.
+      # @api private
+      class Generator < RuboCop::Cop::Generator
+        def todo
+          <<~TODO
+            Do 4 steps:
+              1. Modify the description of #{badge} in config/default.yml
+              2. Implement your new cop in the generated file!
+              3. Add an entry about new cop to CHANGELOG.md
+              4. Commit your new cop with a message such as
+                 e.g. "Add new `#{badge}` cop"
+          TODO
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/capybara/version.rb

@@ -4,7 +4,7 @@ module RuboCop
   module Capybara
     # Version information for the Capybara RuboCop plugin.
     module Version
-      STRING = '2.20.0'
+      STRING = '2.21.0'
     end
   end
 end

data/lib/rubocop/cop/capybara/current_path_expectation.rb

@@ -37,20 +37,20 @@ module RuboCop
         RESTRICT_ON_SEND = %i[expect].freeze
 
         # @!method expectation_set_on_current_path(node)
-        def_node_matcher :expectation_set_on_current_path, <<-PATTERN
+        def_node_matcher :expectation_set_on_current_path, <<~PATTERN
           (send nil? :expect (send {(send nil? :page) nil?} :current_path))
         PATTERN
 
         # Supported matchers: eq(...) / match(/regexp/) / match('regexp')
         # @!method as_is_matcher(node)
-        def_node_matcher :as_is_matcher, <<-PATTERN
+        def_node_matcher :as_is_matcher, <<~PATTERN
           (send
             #expectation_set_on_current_path ${:to :to_not :not_to}
             ${(send nil? :eq ...) (send nil? :match (regexp ...))})
         PATTERN
 
         # @!method regexp_node_matcher(node)
-        def_node_matcher :regexp_node_matcher, <<-PATTERN
+        def_node_matcher :regexp_node_matcher, <<~PATTERN
           (send
             #expectation_set_on_current_path ${:to :to_not :not_to}
             $(send nil? :match ${str dstr xstr}))

data/lib/rubocop/cop/capybara/mixin/css_attributes_parser.rb

@@ -16,7 +16,7 @@ module RuboCop
 
         # @return [Array<String>]
         def parse # rubocop:disable Metrics/MethodLength
-          @selector.chars do |char|
+          @selector.each_char do |char|
             if char == '['
               on_bracket_start
             elsif char == ']'

data/lib/rubocop/cop/capybara/negation_matcher.rb

@@ -7,20 +7,20 @@ module RuboCop
       #
       # @example EnforcedStyle: have_no (default)
       #   # bad
-      #   expect(page).not_to have_selector
+      #   expect(page).not_to have_selector 'a'
       #   expect(page).not_to have_css('a')
       #
       #   # good
-      #   expect(page).to have_no_selector
+      #   expect(page).to have_no_selector 'a'
       #   expect(page).to have_no_css('a')
       #
       # @example EnforcedStyle: not_to
       #   # bad
-      #   expect(page).to have_no_selector
+      #   expect(page).to have_no_selector 'a'
       #   expect(page).to have_no_css('a')
       #
       #   # good
-      #   expect(page).not_to have_selector
+      #   expect(page).not_to have_selector 'a'
       #   expect(page).not_to have_css('a')
       #
       class NegationMatcher < ::RuboCop::Cop::Base
@@ -42,7 +42,7 @@ module RuboCop
 
         # @!method not_to?(node)
         def_node_matcher :not_to?, <<~PATTERN
-          (send ... :not_to
+          (send ... {:not_to :to_not}
             (send nil? %POSITIVE_MATCHERS ...))
         PATTERN
 
@@ -53,7 +53,7 @@ module RuboCop
         PATTERN
 
         def on_send(node)
-          return unless offense?(node.parent)
+          return unless offense?(node)
 
           matcher = node.method_name.to_s
           add_offense(offense_range(node),
@@ -67,8 +67,9 @@ module RuboCop
         private
 
         def offense?(node)
-          (style == :have_no && not_to?(node)) ||
-            (style == :not_to && have_no?(node))
+          node.arguments? &&
+            ((style == :have_no && not_to?(node.parent)) ||
+            (style == :not_to && have_no?(node.parent)))
         end
 
         def offense_range(node)

data/lib/rubocop/cop/capybara/specific_actions.rb

@@ -28,7 +28,7 @@ module RuboCop
         }.freeze
 
         # @!method click_on_selector(node)
-        def_node_matcher :click_on_selector, <<-PATTERN
+        def_node_matcher :click_on_selector, <<~PATTERN
           (send _ :find (str $_) ...)
         PATTERN
 

data/lib/rubocop/cop/capybara/specific_finders.rb

@@ -10,6 +10,7 @@ module RuboCop
       #   find('#some-id')
       #   find('[id=some-id]')
       #   find(:css, '#some-id')
+      #   find(:id, 'some-id')
       #
       #   # good
       #   find_by_id('some-id')
@@ -23,7 +24,7 @@ module RuboCop
 
         # @!method find_argument(node)
         def_node_matcher :find_argument, <<~PATTERN
-          (send _ :find $(sym :css)? (str $_) ...)
+          (send _ :find $(sym {:css :id})? (str $_) ...)
         PATTERN
 
         # @!method class_options(node)
@@ -38,6 +39,7 @@ module RuboCop
 
             on_attr(node, sym, arg) if attribute?(arg)
             on_id(node, sym, arg) if CssSelector.id?(arg)
+            on_sym_id(node, sym, arg) if sym.first&.value == :id
           end
         end
 
@@ -59,6 +61,10 @@ module RuboCop
                            CssSelector.classes(arg.sub("##{id}", '')))
         end
 
+        def on_sym_id(node, sym, id)
+          register_offense(node, sym, "'#{id}'")
+        end
+
         def attribute?(arg)
           CssSelector.attribute?(arg) &&
             CapybaraHelp.common_attributes?(arg)
@@ -106,11 +112,11 @@ module RuboCop
         end
 
         def to_options(attrs)
-          attrs.each.map do |key, value|
+          attrs.each.filter_map do |key, value|
             next if key == 'id'
 
             "#{key}: #{value}"
-          end.compact.join(', ')
+          end.join(', ')
         end
 
         def offense_range(node)

data/lib/rubocop/cop/capybara/specific_matcher.rb

@@ -23,7 +23,7 @@ module RuboCop
       #   expect(page).to have_no_link('foo', class: 'cls', href: 'http://example.com')
       #   expect(page).to have_table(class: 'cls')
       #   expect(page).to have_select
-      #   expect(page).to have_field('foo')
+      #   expect(page).to have_field(with: 'foo')
       #
       class SpecificMatcher < ::RuboCop::Cop::Base
         MSG = 'Prefer `%<good_matcher>s` over `%<bad_matcher>s`.'
@@ -38,12 +38,12 @@ module RuboCop
         }.freeze
 
         # @!method first_argument(node)
-        def_node_matcher :first_argument, <<-PATTERN
+        def_node_matcher :first_argument, <<~PATTERN
           (send nil? _ (str $_) ... )
         PATTERN
 
         # @!method text_with_regexp?(node)
-        def_node_search :text_with_regexp?, <<-PATTERN
+        def_node_search :text_with_regexp?, <<~PATTERN
           (pair (sym {:text :exact_text}) (regexp ...))
         PATTERN
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-capybara
 version: !ruby/object:Gem::Version
-  version: 2.20.0
+  version: 2.21.0
 platform: ruby
 authors:
 - Yudai Takada
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-02 00:00:00.000000000 Z
+date: 2024-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -24,10 +24,10 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.41'
-description: |2
-      Code style checking for Capybara test files (RSpec, Cucumber, Minitest).
-      A plugin for the RuboCop code style enforcing & linting tool.
-email:
+description: |
+  Code style checking for Capybara test files (RSpec, Cucumber, Minitest).
+  A plugin for the RuboCop code style enforcing & linting tool.
+email: 
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -41,6 +41,7 @@ files:
 - config/default.yml
 - lib/rubocop-capybara.rb
 - lib/rubocop/capybara/config_formatter.rb
+- lib/rubocop/capybara/cop/generator.rb
 - lib/rubocop/capybara/description_extractor.rb
 - lib/rubocop/capybara/version.rb
 - lib/rubocop/cop/capybara/click_link_or_button_style.rb
@@ -65,7 +66,7 @@ metadata:
   changelog_uri: https://github.com/rubocop/rubocop-capybara/blob/main/CHANGELOG.md
   documentation_uri: https://docs.rubocop.org/rubocop-capybara/
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -80,8 +81,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
-signing_key:
+rubygems_version: 3.5.9
+signing_key: 
 specification_version: 4
 summary: Code style checking for Capybara test files
 test_files: []