rubocop-capybara 2.17.1 → 2.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f842364dafbf74a569f7e4d40eeee32b49bf3b9983d7ada2f376fb919481bdf
-  data.tar.gz: 075717405e4165171110bbdd29863873b4b94822baef45cb3946d8055da497bb
+  metadata.gz: bb7f795cc80f072b94781f2339e781cccf9922ad2303c09111c0e34a4af264f8
+  data.tar.gz: d2ae47b522208177b7c93338973c8a144dfbccca2f817f0797b531f8c89e50b9
 SHA512:
-  metadata.gz: 70e7fe7215dda9d8ae088bc0df07e50cf3d2f1c0645afe8797d7ce4a03b080a710b52da0403b37ce0ec6dc1a428d999e0342ea53d39d406c68f894059d9d7f6c
-  data.tar.gz: 7d17ff840e4f4ac78b079bbc9a567c10b1fbf2419f748b932bd67a2bdfe43e2a825dd06735974daff51dc35f323824803010e4526adedef9dc0812f77a8fe5f7
+  metadata.gz: 36b58f29500840c7dc34c2c2ed55856ff08cdd7ca41822209a9388204948903be89cf13c3065da7cfed3e8332f3433b3293087c8de1cf1266f093fadef2fa69d
+  data.tar.gz: 5b961abac7ae8dd46708ec9649718a23596bde9e45bcc48f7d9e818c2a116d5fda3de0653cf3aa8e56d11ed11ebcb94e24ef49ee0653e739a26d43d2383c2152

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Edge (Unreleased)
 
+## 2.18.0 (2023-04-21)
+
+- Fix an offense message for `Capybara/SpecificFinders`. ([@ydah])
+- Expand `Capybara/NegationMatcher` to support `have_content` ([@OskarsEzerins])
+- Fix an incorrect autocorrect for `Capybara/CurrentPathExpectation` when matcher's argument is a method with a argument and no parentheses. ([@ydah])
+
 ## 2.17.1 (2023-02-13)
 
 - Fix an incorrect autocorrect for `Capybara/CurrentPathExpectation`. ([@ydah])
@@ -47,6 +53,7 @@
 [@bquorning]: https://github.com/bquorning
 [@darhazer]: https://github.com/Darhazer
 [@onumis]: https://github.com/onumis
+[@oskarsezerins]: https://github.com/OskarsEzerins
 [@pirj]: https://github.com/pirj
 [@rspeicher]: https://github.com/rspeicher
 [@timrogers]: https://github.com/timrogers

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.17.1'
+      STRING = '2.18.0'
     end
   end
 end

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

@@ -6,10 +6,10 @@ module RuboCop
       # Checks that no expectations are set on Capybara's `current_path`.
       #
       # The
-      # https://www.rubydoc.info/github/teamcapybara/capybara/main/Capybara/RSpecMatchers#have_current_path-instance_method[`have_current_path` matcher]
+      # https://www.rubydoc.info/github/teamcapybara/capybara/master/Capybara/RSpecMatchers#have_current_path-instance_method[`have_current_path` matcher]
       # should be used on `page` to set expectations on Capybara's
       # current path, since it uses
-      # https://github.com/teamcapybara/capybara/blob/main/README.md#asynchronous-javascript-ajax-and-friends[Capybara's waiting functionality]
+      # https://github.com/teamcapybara/capybara/blob/master/README.md#asynchronous-javascript-ajax-and-friends[Capybara's waiting functionality]
       # which ensures that preceding actions (like `click_link`) have
       # completed.
       #
@@ -30,6 +30,7 @@ module RuboCop
       #
       class CurrentPathExpectation < ::RuboCop::Cop::Base
         extend AutoCorrector
+        include RangeHelp
 
         MSG = 'Do not set an RSpec expectation on `current_path` in ' \
               'Capybara feature specs - instead, use the ' \
@@ -85,8 +86,7 @@ module RuboCop
         end
 
         def rewrite_expectation(corrector, node, to_symbol, matcher_node)
-          current_path_node = node.first_argument
-          corrector.replace(current_path_node, 'page')
+          corrector.replace(node.first_argument, 'page')
           corrector.replace(node.parent.loc.selector, 'to')
           matcher_method = if to_symbol == :to
                              'have_current_path'
@@ -94,6 +94,7 @@ module RuboCop
                              'have_no_current_path'
                            end
           corrector.replace(matcher_node.loc.selector, matcher_method)
+          add_argument_parentheses(corrector, matcher_node.first_argument)
           add_ignore_query_options(corrector, node)
         end
 
@@ -111,6 +112,20 @@ module RuboCop
           end
         end
 
+        def add_argument_parentheses(corrector, arg_node)
+          return unless method_call_with_no_parentheses?(arg_node)
+
+          first_argument_range = range_with_surrounding_space(
+            arg_node.first_argument.source_range, side: :left
+          )
+          corrector.insert_before(first_argument_range, '(')
+          corrector.insert_after(arg_node.last_argument, ')')
+        end
+
+        def method_call_with_no_parentheses?(arg_node)
+          arg_node.send_type? && arg_node.arguments? && !arg_node.parenthesized?
+        end
+
         # `have_current_path` with no options will include the querystring
         # while `page.current_path` does not.
         # This ensures the option `ignore_query: true` is added

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

@@ -4,6 +4,7 @@ module RuboCop
   module Cop
     module Capybara
       # Help methods for capybara.
+      # @api private
       module CapybaraHelp
         COMMON_OPTIONS = %w[
           id class style

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

@@ -4,6 +4,7 @@ module RuboCop
   module Cop
     module Capybara
       # Helps parsing css selector.
+      # @api private
       module CssSelector
         module_function
 

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

@@ -31,7 +31,7 @@ module RuboCop
         CAPYBARA_MATCHERS = %w[
           selector css xpath text title current_path link button
           field checked_field unchecked_field select table
-          sibling ancestor
+          sibling ancestor content
         ].freeze
         POSITIVE_MATCHERS =
           Set.new(CAPYBARA_MATCHERS) { |element| :"have_#{element}" }.freeze

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

@@ -75,7 +75,7 @@ module RuboCop
         end
 
         def offense_range(node, receiver)
-          receiver.loc.selector.with(end_pos: node.loc.expression.end_pos)
+          receiver.loc.selector.with(end_pos: node.source_range.end_pos)
         end
 
         def message(action, selector)

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

@@ -19,7 +19,7 @@ module RuboCop
 
         include RangeHelp
 
-        MSG = 'Prefer `find_by` over `find`.'
+        MSG = 'Prefer `find_by_id` over `find`.'
         RESTRICT_ON_SEND = %i[find].freeze
 
         # @!method find_argument(node)
@@ -68,7 +68,7 @@ module RuboCop
         def register_offense(node, id, classes = [])
           add_offense(offense_range(node)) do |corrector|
             corrector.replace(node.loc.selector, 'find_by_id')
-            corrector.replace(node.first_argument.loc.expression,
+            corrector.replace(node.first_argument,
                               id.delete('\\'))
             unless classes.compact.empty?
               autocorrect_classes(corrector, node, classes)
@@ -117,7 +117,7 @@ module RuboCop
           if node.loc.end
             node.loc.end.end_pos
           else
-            node.loc.expression.end_pos
+            node.source_range.end_pos
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-capybara
 version: !ruby/object:Gem::Version
-  version: 2.17.1
+  version: 2.18.0
 platform: ruby
 authors:
 - Yudai Takada
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-16 00:00:00.000000000 Z
+date: 2023-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.3
+rubygems_version: 3.4.5
 signing_key:
 specification_version: 4
 summary: Code style checking for Capybara test files