[rb] update with latest rubocop

Author: titusfortner

rb/.rubocop.yml

@@ -4,6 +4,8 @@ require:
 
 AllCops:
   TargetRubyVersion: 2.5
+  Exclude:
+    - 'lib/selenium/webdriver/devtools/**/*'
 
 Layout/EmptyLinesAroundAttributeAccessor:
   Enabled: true
@@ -40,8 +42,9 @@ Lint/SuppressedException:
   Enabled: false
 
 Metrics/AbcSize:
-  Max: 27
+  Max: 28
   Exclude:
+    - 'lib/selenium/webdriver/remote/capabilities.rb'
     - 'lib/selenium/webdriver/remote/http/curb.rb'
     - 'lib/selenium/webdriver/support/color.rb'
 
@@ -62,6 +65,7 @@ Metrics/CyclomaticComplexity:
   Max: 9
   Exclude:
     - 'lib/selenium/webdriver/remote/capabilities.rb'
+    - 'lib/selenium/webdriver/support/color.rb'
 
 Metrics/MethodLength:
   CountComments: false
@@ -82,7 +86,7 @@ Metrics/ParameterLists:
 
 # TODO: Refactor Chrome::Bridge#create_capabilities
 Metrics/PerceivedComplexity:
-  Max: 8
+  Max: 9
   Exclude:
     - 'lib/selenium/webdriver/remote/capabilities.rb'
 
@@ -132,6 +136,12 @@ RSpec/MessageSpies:
 RSpec/MultipleExpectations:
   Enabled: false
 
+RSpec/StubbedMock:
+  Enabled: false
+
+RSpec/MultipleMemoizedHelpers:
+  Enabled: false
+
 Style/Alias:
   EnforcedStyle: prefer_alias_method
 
@@ -165,6 +175,9 @@ Style/HashTransformValues:
 Style/NumericLiterals:
   Enabled: false
 
+Style/OptionalBooleanParameter:
+  Enabled: false
+
 Style/RegexpLiteral:
   EnforcedStyle: mixed
 

rb/lib/selenium/server.rb

@@ -139,31 +139,7 @@ def net_http_start(address, &block)
     # :standalone, #hub, #node
     #
 
-    attr_accessor :role
-
-    #
-    # The server port
-    #
-
-    attr_accessor :port
-
-    #
-    # The server timeout
-    #
-
-    attr_accessor :timeout
-
-    #
-    # Whether to launch the server in the background
-    #
-
-    attr_accessor :background
-
-    #
-    # Path to log file, or 'true' for stdout.
-    #
-
-    attr_accessor :log
+    attr_accessor :role, :port, :timeout, :background, :log
 
     #
     # @param [String] jar Path to the server jar.
@@ -225,7 +201,7 @@ def <<(arg)
     private
 
     def selenium4?
-      @jar.match?(/[^\.][4]\./) || @jar.include?('deploy')
+      @jar.match?(/[^.]4\./) || @jar.include?('deploy')
     end
 
     def stop_process

rb/lib/selenium/webdriver/chrome/service.rb

@@ -32,7 +32,7 @@ class Service < WebDriver::Service
 
         private
 
-        # Note: This processing is deprecated
+        # NOTE: This processing is deprecated
         def extract_service_args(driver_opts)
           driver_args = super
           driver_opts = driver_opts.dup

rb/lib/selenium/webdriver/common/driver.rb

@@ -298,7 +298,7 @@ def ref; end
       def create_bridge(**opts)
         opts[:url] ||= service_url(opts)
         caps = opts.delete(:capabilities)
-        # Note: This is deprecated
+        # NOTE: This is deprecated
         cap_array = caps.is_a?(Hash) ? [caps] : Array(caps)
 
         desired_capabilities = opts.delete(:desired_capabilities)

rb/lib/selenium/webdriver/common/service_manager.rb

@@ -103,7 +103,7 @@ def find_free_port
 
       def start_process
         @process = build_process(@executable_path, "--port=#{@port}", *@extra_args)
-        # Note: this is a bug only in Windows 7
+        # NOTE: this is a bug only in Windows 7
         @process.leader = true unless Platform.windows?
         @process.start
       end

rb/lib/selenium/webdriver/common/target_locator.rb

@@ -57,10 +57,10 @@ def parent_frame
       def window(id)
         if block_given?
           original = begin
-                       @bridge.window_handle
-                     rescue Error::NoSuchWindowError
-                       nil
-                     end
+            @bridge.window_handle
+          rescue Error::NoSuchWindowError
+            nil
+          end
 
           unless @bridge.window_handles.include? id
             raise Error::NoSuchWindowError, "The specified identifier '#{id}' is not found in the window handle list"

rb/lib/selenium/webdriver/edge_html/service.rb

@@ -31,7 +31,7 @@ class Service < WebDriver::Service
 
         private
 
-        # Note: This processing is deprecated
+        # NOTE: This processing is deprecated
         def extract_service_args(driver_opts)
           driver_args = super
           driver_opts = driver_opts.dup

rb/lib/selenium/webdriver/firefox/service.rb

@@ -32,7 +32,7 @@ class Service < WebDriver::Service
 
         private
 
-        # Note: This processing is deprecated
+        # NOTE: This processing is deprecated
         def extract_service_args(driver_opts)
           driver_args = super
           driver_opts = driver_opts.dup

rb/lib/selenium/webdriver/ie/service.rb

@@ -32,7 +32,7 @@ class Service < WebDriver::Service
 
         private
 
-        # Note: This processing is deprecated
+        # NOTE: This processing is deprecated
         def extract_service_args(driver_opts)
           driver_args = super
           driver_opts = driver_opts.dup

rb/lib/selenium/webdriver/remote/bridge.rb

@@ -35,7 +35,7 @@ class Bridge
         # @api private
         #
 
-        def initialize(http_client: nil, url:)
+        def initialize(url:, http_client: nil)
           uri = url.is_a?(URI) ? url : URI.parse(url)
           uri.path += '/' unless uri.path.end_with?('/')
 
@@ -624,7 +624,7 @@ def convert_locator(how, what)
           [how, what]
         end
 
-        ESCAPE_CSS_REGEXP = /(['"\\#.:;,!?+<>=~*^$|%&@`{}\-\[\]\(\)])/.freeze
+        ESCAPE_CSS_REGEXP = /(['"\\#.:;,!?+<>=~*^$|%&@`{}\-\[\]()])/.freeze
         UNICODE_CODE_POINT = 30
 
         # Escapes invalid characters in CSS selector.

rb/lib/selenium/webdriver/remote/http/default.rb

@@ -28,8 +28,7 @@ module Http
         class Default < Common
           attr_writer :proxy
 
-          attr_accessor :open_timeout
-          attr_accessor :read_timeout
+          attr_accessor :open_timeout, :read_timeout
 
           # Initializes object.
           # Warning: Setting {#open_timeout} to non-nil values will cause a separate thread to spawn.
@@ -39,6 +38,7 @@ class Default < Common
           def initialize(open_timeout: nil, read_timeout: nil)
             @open_timeout = open_timeout
             @read_timeout = read_timeout
+            super()
           end
 
           def close

rb/lib/selenium/webdriver/safari/options.rb

@@ -37,22 +37,6 @@ class Options < WebDriver::Options
             @options[key] = value
           end
         end
-
-        #
-        # Create a new Options instance for W3C-capable versions of Safari.
-        #
-        # @example
-        #   options = Selenium::WebDriver::Safari::Options.new(automatic_inspection: true)
-        #   driver = Selenium::WebDriver.for :safari, options: options
-        #
-        # @param [Hash] opts the pre-defined options to create the Safari::Options with
-        # @option opts [Boolean] :automatic_inspection Preloads Web Inspector and JavaScript debugger. Default is false
-        # @option opts [Boolean] :automatic_profiling Preloads Web Inspector and starts a timeline recording. Default is false
-        #
-
-        def initialize(**opts)
-          super
-        end
       end # Options
     end # Safari
   end # WebDriver

rb/lib/selenium/webdriver/support/block_event_listener.rb

@@ -25,7 +25,7 @@ def initialize(callback)
           @callback = callback
         end
 
-        def method_missing(meth, *args) # rubocop:disable Style/MethodMissingSuper, Style/MissingRespondToMissing
+        def method_missing(meth, *args) # rubocop:disable Style/MissingRespondToMissing
           @callback.call meth, *args
         end
       end # BlockEventListener

rb/lib/selenium/webdriver/support/event_firing_bridge.rb

@@ -120,7 +120,7 @@ def dispatch(name, *args)
           returned
         end
 
-        def method_missing(meth, *args, &blk) # rubocop:disable Style/MethodMissingSuper, Style/MissingRespondToMissing
+        def method_missing(meth, *args, &blk) # rubocop:disable Style/MissingRespondToMissing
           @delegate.__send__(meth, *args, &blk)
         end
       end # EventFiringBridge

rb/selenium-webdriver.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new('> 1.3.1') if s.respond_to? :required_rubygems_version=
   s.required_ruby_version = Gem::Requirement.new('>= 2.5')
 
-  s.files = Dir[root + '/**/*'].reject { |e| e =~ /ruby\.iml|build\.desc/ }.map { |e| e.sub(root + '/', '') }
+  s.files = Dir["#{root}/**/*"].reject { |e| e =~ /ruby\.iml|build\.desc/ }.map { |e| e.sub("#{root}/", '') }
   s.require_paths = ['lib']
 
   s.add_runtime_dependency 'childprocess', ['>= 0.5', '< 5.0']
@@ -41,10 +41,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rack', ['~> 2.0']
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', ['~> 3.0']
-  s.add_development_dependency 'rubocop', ['~> 0.84.0']
+  s.add_development_dependency 'rubocop', ['~> 1.8.0']
   s.add_development_dependency 'rubocop-performance'
   s.add_development_dependency 'rubocop-rspec'
   s.add_development_dependency 'webmock', ['~> 3.5']
-  s.add_development_dependency 'webrick',['~> 1.7']
+  s.add_development_dependency 'webrick', ['~> 1.7']
   s.add_development_dependency 'yard', ['~> 0.9.11']
 end

rb/spec/integration/selenium/webdriver/spec_support/guards/guard.rb

@@ -50,9 +50,10 @@ def message
                         'no reason given'
                       end
 
-            if @type == :exclude
+            case @type
+            when :exclude
               "Test not guarded because it breaks test run; #{details}"
-            elsif @type == :exclusive
+            when :exclusive
               'Test does not apply to this configuration'
             else
               "Test guarded; #{details}"

rb/spec/unit/selenium/webdriver/chrome/options_spec.rb

@@ -85,7 +85,7 @@ module Chrome
           it 'adds an extension' do
             allow(File).to receive(:file?).and_return(true)
             ext = 'foo.crx'
-            allow_any_instance_of(Options).to receive(:encode_file).with(ext).and_return("encoded_#{ext[/([^\.]*)/]}")
+            allow_any_instance_of(Options).to receive(:encode_file).with(ext).and_return("encoded_#{ext[/([^.]*)/]}")
 
             options.add_extension(ext)
             expect(options.extensions).to eq([ext])

rb/spec/unit/selenium/webdriver/edge_chrome/options_spec.rb

@@ -85,7 +85,7 @@ module EdgeChrome
           it 'adds an extension' do
             allow(File).to receive(:file?).and_return(true)
             ext = 'foo.crx'
-            allow_any_instance_of(Options).to receive(:encode_file).with(ext).and_return("encoded_#{ext[/([^\.]*)/]}")
+            allow_any_instance_of(Options).to receive(:encode_file).with(ext).and_return("encoded_#{ext[/([^.]*)/]}")
 
             options.add_extension(ext)
             expect(options.extensions).to eq([ext])