diff --git a/lib/capybara/queries/current_path_query.rb b/lib/capybara/queries/current_path_query.rb index 02d4ca71a..774ef16aa 100644 --- a/lib/capybara/queries/current_path_query.rb +++ b/lib/capybara/queries/current_path_query.rb @@ -22,7 +22,7 @@ def resolves_for?(session) @actual_path = options[:url] ? uri&.to_s : uri&.request_uri if @expected_path.is_a? Regexp - @actual_path.to_s.match(@expected_path) + @actual_path.to_s.match?(@expected_path) else ::Addressable::URI.parse(@expected_path) == ::Addressable::URI.parse(@actual_path) end diff --git a/lib/capybara/queries/selector_query.rb b/lib/capybara/queries/selector_query.rb index a1d436ab3..513c3d55d 100644 --- a/lib/capybara/queries/selector_query.rb +++ b/lib/capybara/queries/selector_query.rb @@ -436,7 +436,7 @@ def normalize_ws def matches_text_regexp?(node, regexp) text_visible = visible text_visible = :all if text_visible == :hidden - !!node.text(text_visible, normalize_ws: normalize_ws).match(regexp) + node.text(text_visible, normalize_ws: normalize_ws).match?(regexp) end def default_visibility diff --git a/lib/capybara/queries/title_query.rb b/lib/capybara/queries/title_query.rb index 847fe46d7..3346f761b 100644 --- a/lib/capybara/queries/title_query.rb +++ b/lib/capybara/queries/title_query.rb @@ -13,7 +13,7 @@ def initialize(expected_title, **options) end def resolves_for?(node) - (@actual_title = node.title).match(@search_regexp) + (@actual_title = node.title).match?(@search_regexp) end def failure_message diff --git a/lib/capybara/selector.rb b/lib/capybara/selector.rb index f0a9780d6..841246753 100644 --- a/lib/capybara/selector.rb +++ b/lib/capybara/selector.rb @@ -120,7 +120,7 @@ node_filter(:href) do |node, href| # If not a Regexp it's been handled in the main XPath - (href.is_a?(Regexp) ? node[:href].match(href) : true).tap do |res| + (href.is_a?(Regexp) ? node[:href].match?(href) : true).tap do |res| add_error "Expected href to match #{href.inspect} but it was #{node[:href].inspect}" unless res end end