Update settings for rubocop.

Signed-off-by: Alex Rodionov <[email protected]>

Author: RustyNail

rb/.rubocop.yml

@@ -1,7 +1,7 @@
 AllCops:
   TargetRubyVersion: 2.0
 
-Style/SpaceInsideHashLiteralBraces:
+Layout/SpaceInsideHashLiteralBraces:
   EnforcedStyle: no_space
 
 Style/BracesAroundHashParameters:
@@ -46,12 +46,16 @@ Metrics/PerceivedComplexity:
   Max: 11
   Exclude:
     - 'lib/selenium/webdriver/chrome/legacy_bridge.rb'
+    - 'lib/selenium/webdriver/chrome/driver.rb'
+    - 'lib/selenium/webdriver/remote/w3c/capabilities.rb'
 
 Metrics/CyclomaticComplexity:
   Max: 9
   Exclude:
     - 'lib/selenium/webdriver/chrome/legacy_bridge.rb'
+    - 'lib/selenium/webdriver/chrome/driver.rb'
     - 'lib/selenium/webdriver/common/driver.rb'
+    - 'lib/selenium/webdriver/remote/w3c/capabilities.rb'
     - 'spec/integration/selenium/webdriver/spec_support/test_environment.rb'
 
 Metrics/ClassLength:
@@ -60,17 +64,27 @@ Metrics/ClassLength:
     - 'lib/selenium/webdriver/firefox/profile.rb'
     - 'lib/selenium/webdriver/remote/legacy_bridge.rb'
     - 'lib/selenium/webdriver/remote/capabilities.rb'
+    - 'lib/selenium/webdriver/remote/oss/bridge.rb'
     - 'lib/selenium/webdriver/remote/w3c_bridge.rb'
+    - 'lib/selenium/webdriver/remote/w3c/capabilities.rb'
+    - 'lib/selenium/webdriver/remote/w3c/bridge.rb'
     - 'spec/integration/selenium/webdriver/spec_support/test_environment.rb'
 
 Metrics/AbcSize:
   Max: 33
   Exclude:
+    - 'lib/selenium/webdriver/chrome/driver.rb'
     - 'lib/selenium/webdriver/chrome/legacy_bridge.rb'
+    - 'lib/selenium/webdriver/remote/w3c/capabilities.rb'
     - 'lib/selenium/webdriver/support/color.rb'
 
 Metrics/LineLength:
   Max: 130
+  Exclude:
+    - 'lib/selenium/webdriver/remote/w3c/capabilities.rb'
+    - 'lib/selenium/webdriver/remote/bridge.rb'
+    - 'spec/unit/selenium/server_spec.rb'
+    - 'lib/selenium/webdriver/ie/service.rb'
 
 Metrics/ModuleLength:
   Exclude:
@@ -80,8 +94,74 @@ Metrics/ModuleLength:
 Metrics/MethodLength:
   Max: 33
   Exclude:
+    - 'lib/selenium/webdriver/chrome/driver.rb'
     - 'lib/selenium/webdriver/chrome/legacy_bridge.rb'
 
 Metrics/BlockLength:
   Exclude:
     - "**/*_spec.rb"
+
+Metrics/ParameterLists:
+  Exclude:
+    - 'lib/selenium/webdriver/common/interactions/pointer_input.rb'
+
+Layout/EmptyLineAfterMagicComment:
+  Enabled: false
+
+Layout/EmptyLinesAroundBlockBody:
+  Exclude:
+    - 'spec/**/*'
+
+Layout/EmptyLinesAroundClassBody:
+  Enabled: false
+
+Layout/EmptyLinesAroundModuleBody:
+  Enabled: false
+
+Lint/UnusedBlockArgument:
+  Enabled: false
+
+Lint/UnusedMethodArgument:
+  Enabled: false
+
+Lint/UselessAssignment:
+  Exclude:
+    - 'spec/unit/selenium/webdriver/chrome/service_spec.rb'
+
+Performance/Caller:
+  Enabled: false
+
+Style/CommentAnnotation:
+  Enabled: false
+
+Style/FormatString:
+  Exclude:
+    - 'lib/selenium/webdriver/atoms.rb'
+
+Style/MethodMissing:
+  Exclude:
+    - 'lib/selenium/webdriver/support/event_firing_bridge.rb'
+    - 'lib/selenium/webdriver/support/block_event_listener.rb'
+
+Layout/MultilineMethodCallIndentation:
+  Exclude:
+    - 'spec/unit/selenium/webdriver/chrome/profile_spec.rb'
+
+Style/MultilineMemoization:
+  Enabled: false
+
+Style/RedundantBegin:
+  Exclude:
+    - 'spec/integration/selenium/webdriver/driver_spec.rb'
+
+Style/RedundantSelf:
+  Enabled: false
+
+Style/StringLiterals:
+  Enabled: false
+
+Style/SymbolArray:
+  Enabled: false
+
+Style/TrailingCommaInLiteral:
+  Enabled: false

rb/lib/selenium/server.rb

@@ -84,7 +84,7 @@ def download(required_version)
                   progress += segment.length
                   segment_count += 1
 
-                  if segment_count % 15 == 0
+                  if segment_count % 15.zero?
                     percent = (progress.to_f / total.to_f) * 100
                     print "#{CL_RESET}Downloading #{download_file_name}: #{percent.to_i}% (#{progress} / #{total})"
                     segment_count = 0

rb/lib/selenium/webdriver/common/platform.rb

@@ -117,7 +117,7 @@ def cygwin_path(path, opts = {})
       end
 
       def make_writable(file)
-        File.chmod 0766, file
+        File.chmod 0o766, file
       end
 
       def assert_file(path)
@@ -208,7 +208,7 @@ def interfaces
   end # WebDriver
 end # Selenium
 
-if __FILE__ == $PROGRAM_NAME
+if $PROGRAM_NAME == __FILE__
   p engine: Selenium::WebDriver::Platform.engine,
     os: Selenium::WebDriver::Platform.os,
     ruby_version: Selenium::WebDriver::Platform.ruby_version,

rb/lib/selenium/webdriver/common/port_prober.rb

@@ -38,7 +38,7 @@ def self.random
         port
       end
 
-      IGNORED_ERRORS = [Errno::EADDRNOTAVAIL]
+      IGNORED_ERRORS = [Errno::EADDRNOTAVAIL].freeze
       IGNORED_ERRORS << Errno::EBADF if Platform.cygwin?
       IGNORED_ERRORS.freeze
 

rb/lib/selenium/webdriver/common/profile_helper.rb

@@ -46,7 +46,7 @@ def create_tmp_copy(directory)
 
         # TODO: must be a better way..
         FileUtils.rm_rf tmp_directory
-        FileUtils.mkdir_p File.dirname(tmp_directory), mode: 0700
+        FileUtils.mkdir_p File.dirname(tmp_directory), mode: 0o700
         FileUtils.cp_r directory, tmp_directory
 
         tmp_directory

rb/lib/selenium/webdriver/common/service.rb

@@ -155,7 +155,7 @@ def socket_lock
       protected
 
       def extract_service_args(driver_opts)
-        driver_opts.key?(:args) ? driver_opts.delete(:args) :  []
+        driver_opts.key?(:args) ? driver_opts.delete(:args) : []
       end
 
     end # Service

rb/lib/selenium/webdriver/edge/bridge.rb

@@ -24,10 +24,10 @@ module Bridge
 
         def commands(command)
           unsupported = %i[execute_script execute_async_script submit_element double_click
-           mouse_down mouse_up mouse_move_to click
-           send_keys_to_active_element get_window_handles get_current_window_handle
-           get_window_size set_window_size get_window_position set_window_position
-           maximize_window get_alert_text accept_alert dismiss_alert]
+                           mouse_down mouse_up mouse_move_to click
+                           send_keys_to_active_element get_window_handles get_current_window_handle
+                           get_window_size set_window_size get_window_position set_window_position
+                           maximize_window get_alert_text accept_alert dismiss_alert]
           if unsupported.include? command
             Remote::OSS::Bridge::COMMANDS[command]
           else

rb/lib/selenium/webdriver/firefox/extension.rb

@@ -41,7 +41,7 @@ def write_to(extensions_dir)
           ext_path = File.join extensions_dir, read_id_from_install_rdf(root_dir)
 
           FileUtils.rm_rf ext_path
-          FileUtils.mkdir_p File.dirname(ext_path), mode: 0700
+          FileUtils.mkdir_p File.dirname(ext_path), mode: 0o700
           FileUtils.cp_r root_dir, ext_path
 
           FileReaper.reap(root_dir) if @should_reap_root

rb/lib/selenium/webdriver/firefox/launcher.rb

@@ -90,11 +90,11 @@ def connect_until_stable
         end
 
         def fetch_profile
-          if @profile_name
-            @profile = Profile.from_name @profile_name
-          else
-            @profile = Profile.new
-          end
+          @profile = if @profile_name
+                       Profile.from_name @profile_name
+                     else
+                       Profile.new
+                     end
         end
 
         def assert_profile

rb/lib/selenium/webdriver/firefox/marionette/bridge.rb

@@ -34,7 +34,7 @@ def commands(command)
 
           def install_addon(path, temporary)
             payload = {path: path}
-            payload.merge!(temporary: temporary) unless temporary.nil?
+            payload[:temporary] = temporary unless temporary.nil?
             execute :install_addon, {}, payload
           end
 

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

@@ -94,7 +94,6 @@ def request(verb, url, headers, payload, redirects = 0)
               retries += 1
               sleep 2
               retry
-
             rescue Errno::ECONNREFUSED => ex
               raise ex.class, "using proxy: #{proxy.http}" if use_proxy?
               raise

rb/lib/selenium/webdriver/support/color.rb

@@ -78,12 +78,12 @@ def self.from_hsl(h, s, l, a)
           l = Float(l) / 100
           a = Float(a || 1)
 
-          if s == 0
+          if s.zero?
             r = l
             g = r
             b = r
           else
-            luminocity2 = (l < 0.5) ? l * (1 + s) : l + s - l * s
+            luminocity2 = l < 0.5 ? l * (1 + s) : l + s - l * s
             luminocity1 = 2 * l - luminocity2
 
             r = hue_to_rgb(luminocity1, luminocity2, h + 1.0 / 3.0)

rb/spec/integration/selenium/webdriver/firefox/profile_spec.rb

@@ -119,10 +119,10 @@ def profile_opts
 
           it 'can configure a manual proxy' do
             proxy = Proxy.new(
-                http: 'foo:123',
-                ftp: 'bar:234',
-                ssl: 'baz:345',
-                no_proxy: 'localhost'
+              http: 'foo:123',
+              ftp: 'bar:234',
+              ssl: 'baz:345',
+              no_proxy: 'localhost'
             )
 
             profile.proxy = proxy

rb/spec/integration/selenium/webdriver/spec_support/rack_server.rb

@@ -133,6 +133,6 @@ def call(env)
   end # WebDriver
 end # Selenium
 
-if __FILE__ == $PROGRAM_NAME
+if $PROGRAM_NAME == __FILE__
   Selenium::WebDriver::SpecSupport::RackServer.new(ARGV[0], ARGV[1]).run
 end

rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb

@@ -99,7 +99,7 @@ def remote_server?
 
         def remote_server_jar
           if ENV['DOWNLOAD_SERVER']
-            @remote_server_jar ||= "#{root.join('rb/selenium-server-standalone').to_s}-#{Selenium::Server.latest}.jar"
+            @remote_server_jar ||= "#{root.join('rb/selenium-server-standalone')}-#{Selenium::Server.latest}.jar"
             @remote_server_jar = root.join("rb/#{Selenium::Server.download(:latest)}").to_s unless File.exist? @remote_server_jar
           else
             @remote_server_jar ||= root.join('buck-out/gen/java/server/src/org/openqa/grid/selenium/selenium.jar').to_s

rb/spec/integration/selenium/webdriver/window_spec.rb

@@ -106,7 +106,7 @@ module WebDriver
             expect(new_rect.width).to eq(target_width)
             expect(new_rect.height).to eq(target_height)
           end
-      end
+        end
       end
 
       # TODO: - Create Window Manager guard

rb/spec/unit/selenium/server_spec.rb

@@ -77,7 +77,7 @@ module Selenium
       expect(File).to receive(:exist?).with('selenium-server-test.jar').and_return(true)
 
       expect(ChildProcess).to receive(:build)
-        .with('java', '-Dwebdriver.chrome.driver=/bin/chromedriver','-jar', 'selenium-server-test.jar', '-port', '4444', 'foo', 'bar')
+        .with('java', '-Dwebdriver.chrome.driver=/bin/chromedriver', '-jar', 'selenium-server-test.jar', '-port', '4444', 'foo', 'bar')
         .and_return(mock_process)
 
       server = Selenium::Server.new('selenium-server-test.jar', background: true)

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

@@ -82,7 +82,7 @@ module Chrome
         end
 
         it 'deprecates `service_log_path`' do
-          message = /\[DEPRECATION\] `:service_log_path` is deprecated. Use `driver_opts: {log_path: \/path\/to\/log}`/
+          message = %r{\[DEPRECATION\] `:service_log_path` is deprecated. Use `driver_opts: {log_path: \/path\/to\/log}`}
 
           expect(WebDriver.logger).to receive(:deprecate).with(':service_log_path', "driver_opts: {log_path: '/path/to/log'}")
           @driver = Driver.new(http_client: http, service_log_path: "/path/to/log")

rb/spec/unit/selenium/webdriver/remote/bridge_spec.rb

@@ -72,7 +72,7 @@ module Remote
 
           it 'supports responses with "value" capabilities' do
             allow(http).to receive(:request)
-              .and_return({'status' => 200, 'sessionId' => '', 'value' => {'browserName' => 'firefox'}})
+              .and_return('status' => 200, 'sessionId' => '', 'value' => {'browserName' => 'firefox'})
 
             bridge = Bridge.handshake(http_client: http, desired_capabilities: Capabilities.new)
             expect(bridge.capabilities[:browser_name]).to eq('firefox')