From e25a293f37158447926649cfc92752156943bfec Mon Sep 17 00:00:00 2001 From: Thomas Walpole Date: Mon, 12 Nov 2018 10:34:15 -0800 Subject: [PATCH] Line length cleanup --- .rubocop.yml | 5 +++-- lib/capybara/node/document_matchers.rb | 8 ++++++-- lib/capybara/selenium/driver.rb | 2 +- lib/capybara/session/matchers.rb | 8 ++++++-- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 9729561f..1e233cef 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -17,8 +17,9 @@ Metrics/LineLength: - 'lib/capybara/spec/**/*' - 'lib/capybara/selector.rb' IgnoredPatterns: - - '\s*# ' - - '\s*(raise|warn) ' + - '\s+# rubocop' + - '^\s*#' + - '^\s*(raise|warn) ' Max: 120 Metrics/BlockLength: diff --git a/lib/capybara/node/document_matchers.rb b/lib/capybara/node/document_matchers.rb index c1edcc8b..c883ca89 100644 --- a/lib/capybara/node/document_matchers.rb +++ b/lib/capybara/node/document_matchers.rb @@ -17,7 +17,9 @@ module Capybara # @return [true] # def assert_title(title, **options) - _verify_title(title, options) { |query| raise Capybara::ExpectationNotMet, query.failure_message unless query.resolves_for?(self) } + _verify_title(title, options) do |query| + raise Capybara::ExpectationNotMet, query.failure_message unless query.resolves_for?(self) + end end ## @@ -28,7 +30,9 @@ module Capybara # @return [true] # def assert_no_title(title, **options) - _verify_title(title, options) { |query| raise Capybara::ExpectationNotMet, query.negative_failure_message if query.resolves_for?(self) } + _verify_title(title, options) do |query| + raise Capybara::ExpectationNotMet, query.negative_failure_message if query.resolves_for?(self) + end end ## diff --git a/lib/capybara/selenium/driver.rb b/lib/capybara/selenium/driver.rb index 9178ad8a..4d7e10b6 100644 --- a/lib/capybara/selenium/driver.rb +++ b/lib/capybara/selenium/driver.rb @@ -225,7 +225,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base ::Selenium::WebDriver::Error::StaleElementReferenceError, ::Selenium::WebDriver::Error::UnhandledError, ::Selenium::WebDriver::Error::ElementNotVisibleError, - ::Selenium::WebDriver::Error::InvalidSelectorError, # Work around a race condition that can occur with chromedriver and #go_back/#go_forward + ::Selenium::WebDriver::Error::InvalidSelectorError, # Work around a chromedriver go_back/go_forward race condition ::Selenium::WebDriver::Error::ElementNotInteractableError, ::Selenium::WebDriver::Error::ElementClickInterceptedError, ::Selenium::WebDriver::Error::InvalidElementStateError, diff --git a/lib/capybara/session/matchers.rb b/lib/capybara/session/matchers.rb index 5b3a6bf9..383aefc2 100644 --- a/lib/capybara/session/matchers.rb +++ b/lib/capybara/session/matchers.rb @@ -20,7 +20,9 @@ module Capybara # @return [true] # def assert_current_path(path, **options) - _verify_current_path(path, options) { |query| raise Capybara::ExpectationNotMet, query.failure_message unless query.resolves_for?(self) } + _verify_current_path(path, options) do |query| + raise Capybara::ExpectationNotMet, query.failure_message unless query.resolves_for?(self) + end end ## @@ -34,7 +36,9 @@ module Capybara # @return [true] # def assert_no_current_path(path, **options) - _verify_current_path(path, options) { |query| raise Capybara::ExpectationNotMet, query.negative_failure_message if query.resolves_for?(self) } + _verify_current_path(path, options) do |query| + raise Capybara::ExpectationNotMet, query.negative_failure_message if query.resolves_for?(self) + end end ##