From 29e86bd9fc4bb76acc591cba12ee6c373176eef6 Mon Sep 17 00:00:00 2001
From: Thomas Walpole <twalpole@gmail.com>
Date: Tue, 25 Jun 2019 13:46:33 -0700
Subject: [PATCH] Update to rubocop 0.72

---
 .codeclimate.yml                            | 2 +-
 .rubocop.yml                                | 4 ----
 capybara.gemspec                            | 2 +-
 lib/capybara/node/actions.rb                | 4 ++--
 lib/capybara/spec/session/selectors_spec.rb | 2 +-
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.codeclimate.yml b/.codeclimate.yml
index 9766a106..ed8a7356 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -31,7 +31,7 @@ engines:
     enabled: true
   rubocop:
     enabled: true
-    channel: rubocop-0-71
+    channel: rubocop-0-72
     exclude_fingerprints:
     - affb30770e6ef0780044f5646e28d817
 ratings:
diff --git a/.rubocop.yml b/.rubocop.yml
index ae3657ec..dfbf2ff9 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -64,10 +64,6 @@ Lint/UnusedMethodArgument:
 Layout/EndAlignment:
   EnforcedStyleAlignWith: variable
 
-Naming/RescuedExceptionsVariableName:
-  # This cop is currently fully broken
-  Enabled: false
-
 Naming/PredicateName:
   Exclude:
     - '**/*/*matchers.rb'
diff --git a/capybara.gemspec b/capybara.gemspec
index 5616d010..8b698ee3 100644
--- a/capybara.gemspec
+++ b/capybara.gemspec
@@ -46,7 +46,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rake')
   s.add_development_dependency('rspec', ['>= 3.5.0'])
   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-rspec')
   s.add_development_dependency('sauce_whisk')
diff --git a/lib/capybara/node/actions.rb b/lib/capybara/node/actions.rb
index 89d3b910..038bf062 100644
--- a/lib/capybara/node/actions.rb
+++ b/lib/capybara/node/actions.rb
@@ -307,12 +307,12 @@ module Capybara
         synchronize(Capybara::Queries::BaseQuery.wait(options, session_options.default_max_wait_time)) do
           begin
             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) }
 
             begin
               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}"
             end
           end
diff --git a/lib/capybara/spec/session/selectors_spec.rb b/lib/capybara/spec/session/selectors_spec.rb
index cb879453..4bca03ed 100644
--- a/lib/capybara/spec/session/selectors_spec.rb
+++ b/lib/capybara/spec/session/selectors_spec.rb
@@ -79,7 +79,7 @@ Capybara::SpecHelper.spec Capybara::Selector do
     it 'can find by class' do
       expect(@session.find(:field, class: 'confusion-checkbox')['id']).to eq 'confusion_checkbox'
       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