Update to rubocop 0.72

This commit is contained in:
Thomas Walpole 2019-06-25 13:46:33 -07:00
parent 2158339097
commit 29e86bd9fc
5 changed files with 5 additions and 9 deletions

View File

@ -31,7 +31,7 @@ engines:
enabled: true enabled: true
rubocop: rubocop:
enabled: true enabled: true
channel: rubocop-0-71 channel: rubocop-0-72
exclude_fingerprints: exclude_fingerprints:
- affb30770e6ef0780044f5646e28d817 - affb30770e6ef0780044f5646e28d817
ratings: ratings:

View File

@ -64,10 +64,6 @@ Lint/UnusedMethodArgument:
Layout/EndAlignment: Layout/EndAlignment:
EnforcedStyleAlignWith: variable EnforcedStyleAlignWith: variable
Naming/RescuedExceptionsVariableName:
# This cop is currently fully broken
Enabled: false
Naming/PredicateName: Naming/PredicateName:
Exclude: Exclude:
- '**/*/*matchers.rb' - '**/*/*matchers.rb'

View File

@ -46,7 +46,7 @@ Gem::Specification.new do |s|
s.add_development_dependency('rake') s.add_development_dependency('rake')
s.add_development_dependency('rspec', ['>= 3.5.0']) s.add_development_dependency('rspec', ['>= 3.5.0'])
s.add_development_dependency('rspec-instafail') s.add_development_dependency('rspec-instafail')
s.add_development_dependency('rubocop') s.add_development_dependency('rubocop', ['~>0.72'])
s.add_development_dependency('rubocop-performance') s.add_development_dependency('rubocop-performance')
s.add_development_dependency('rubocop-rspec') s.add_development_dependency('rubocop-rspec')
s.add_development_dependency('sauce_whisk') s.add_development_dependency('sauce_whisk')

View File

@ -307,12 +307,12 @@ module Capybara
synchronize(Capybara::Queries::BaseQuery.wait(options, session_options.default_max_wait_time)) do synchronize(Capybara::Queries::BaseQuery.wait(options, session_options.default_max_wait_time)) do
begin begin
find(:select, from, options) find(:select, from, options)
rescue Capybara::ElementNotFound => select_error rescue Capybara::ElementNotFound => select_error # rubocop:disable Naming/RescuedExceptionsVariableName
raise if %i[selected with_selected multiple].any? { |option| options.key?(option) } raise if %i[selected with_selected multiple].any? { |option| options.key?(option) }
begin begin
find(:datalist_input, from, options) find(:datalist_input, from, options)
rescue Capybara::ElementNotFound => dlinput_error rescue Capybara::ElementNotFound => dlinput_error # rubocop:disable Naming/RescuedExceptionsVariableName
raise Capybara::ElementNotFound, "#{select_error.message} and #{dlinput_error.message}" raise Capybara::ElementNotFound, "#{select_error.message} and #{dlinput_error.message}"
end end
end end

View File

@ -79,7 +79,7 @@ Capybara::SpecHelper.spec Capybara::Selector do
it 'can find by class' do it 'can find by class' do
expect(@session.find(:field, class: 'confusion-checkbox')['id']).to eq 'confusion_checkbox' expect(@session.find(:field, class: 'confusion-checkbox')['id']).to eq 'confusion_checkbox'
expect(@session).to have_selector(:field, class: 'confusion', count: 3) expect(@session).to have_selector(:field, class: 'confusion', count: 3)
expect(@session.find(:field, class: ['confusion', 'confusion-textarea'])['id']).to eq 'confusion_textarea' expect(@session.find(:field, class: %w[confusion confusion-textarea])['id']).to eq 'confusion_textarea'
end end
end end
end end