rb - performance updates

Author: titusfortner

rb/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-06-08 18:56:38 -0700 using RuboCop version 0.37.2.
+# on 2016-06-08 19:07:43 -0700 using RuboCop version 0.37.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -68,13 +68,13 @@ Metrics/AbcSize:
 # Offense count: 13
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 427
+  Max: 430
 
 # Offense count: 24
 Metrics/CyclomaticComplexity:
   Max: 16
 
-# Offense count: 717
+# Offense count: 716
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
 # URISchemes: http, https
 Metrics/LineLength:
@@ -94,42 +94,6 @@ Metrics/ModuleLength:
 Metrics/PerceivedComplexity:
   Max: 16
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Performance/Casecmp:
-  Exclude:
-    - 'lib/selenium/webdriver/support/select.rb'
-
-# Offense count: 1
-Performance/FixedSize:
-  Exclude:
-    - 'spec/integration/selenium/webdriver/driver_spec.rb'
-
-# Offense count: 9
-# Cop supports --auto-correct.
-# Configuration parameters: MaxKeyValuePairs.
-Performance/RedundantMerge:
-  Exclude:
-    - 'lib/selenium/webdriver/chrome/bridge.rb'
-    - 'lib/selenium/webdriver/edge/bridge.rb'
-    - 'lib/selenium/webdriver/edge/legacy_support.rb'
-    - 'lib/selenium/webdriver/firefox/bridge.rb'
-    - 'lib/selenium/webdriver/phantomjs/bridge.rb'
-    - 'lib/selenium/webdriver/remote/bridge.rb'
-    - 'lib/selenium/webdriver/remote/w3c_bridge.rb'
-    - 'lib/selenium/webdriver/safari/options.rb'
-
-# Offense count: 6
-# Cop supports --auto-correct.
-Performance/StringReplacement:
-  Exclude:
-    - 'lib/selenium/webdriver/firefox/binary.rb'
-    - 'lib/selenium/webdriver/remote/bridge.rb'
-    - 'lib/selenium/webdriver/remote/w3c_bridge.rb'
-    - 'lib/selenium/webdriver/safari/bridge.rb'
-    - 'spec/integration/selenium/webdriver/element_spec.rb'
-    - 'spec/integration/selenium/webdriver/spec_support/helpers.rb'
-
 # Offense count: 31
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
@@ -594,7 +558,7 @@ Style/SpaceInsideStringInterpolation:
 Style/SpecialGlobalVars:
   EnforcedStyle: use_perl_names
 
-# Offense count: 1417
+# Offense count: 1416
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes

rb/lib/selenium/webdriver/chrome/bridge.rb

@@ -43,7 +43,7 @@ def initialize(opts = {})
             desired_capabilities: caps
           }
 
-          remote_opts.merge!(http_client: http_client) if http_client
+          remote_opts[:http_client] = http_client if http_client
 
           super(remote_opts)
         end
@@ -100,8 +100,8 @@ def create_capabilities(opts)
           if profile
             data = profile.as_json
 
-            chrome_options.merge! 'profile'    => data['zip'],
-                                  'extensions' => data['extensions']
+            chrome_options['profile'] = data['zip']
+            chrome_options['extensions'] = data['extensions']
           end
 
           chrome_options['binary']                   = Chrome.path if Chrome.path

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

@@ -47,7 +47,7 @@ def initialize(opts = {})
             desired_capabilities: caps
           }
 
-          remote_opts.merge!(http_client: http_client) if http_client
+          remote_opts[:http_client] = http_client if http_client
           super(remote_opts)
         end
 

rb/lib/selenium/webdriver/edge/legacy_support.rb

@@ -68,7 +68,10 @@ def mouseUp
         def mouseMoveTo(element, x = nil, y = nil)
           params = {element: element}
 
-          params.merge! xoffset: x, yoffset: y if x && y
+          if x && y
+            params[:xoffset] = x
+            params[:yoffset] = y
+          end
 
           execute :mouseMoveTo, {}, params
         end

rb/lib/selenium/webdriver/firefox/binary.rb

@@ -37,7 +37,7 @@ def start_with(profile, profile_path, *args)
           if Platform.cygwin?
             profile_path = Platform.cygwin_path(profile_path, windows: true)
           elsif Platform.windows?
-            profile_path = profile_path.gsub("/", "\\")
+            profile_path = profile_path.tr("/", "\\")
           end
 
           ENV['XRE_CONSOLE_LOG']           = profile.log_file if profile.log_file

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

@@ -49,7 +49,7 @@ def initialize(opts = {})
             desired_capabilities: caps
           }
 
-          remote_opts.merge!(http_client: http_client) if http_client
+          remote_opts[:http_client] = http_client if http_client
 
           begin
             super(remote_opts)

rb/lib/selenium/webdriver/phantomjs/bridge.rb

@@ -47,7 +47,7 @@ def initialize(opts = {})
             desired_capabilities: caps
           }
 
-          remote_opts.merge!(http_client: http_client) if http_client
+          remote_opts[:http_client] = http_client if http_client
 
           super(remote_opts)
         end

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

@@ -92,7 +92,7 @@ def initialize(opts = {})
         def browser
           @browser ||= (
             name = @capabilities.browser_name
-            name ? name.gsub(" ", "_").to_sym : 'unknown'
+            name ? name.tr(" ", "_").to_sym : 'unknown'
           )
         end
 
@@ -413,7 +413,10 @@ def mouseUp
         def mouseMoveTo(element, x = nil, y = nil)
           params = {element: element}
 
-          params.merge! xoffset: x, yoffset: y if x && y
+          if x && y
+            params[:xoffset] = x
+            params[:yoffset] = y
+          end
 
           execute :mouseMoveTo, {}, params
         end

rb/lib/selenium/webdriver/remote/w3c_bridge.rb

@@ -94,7 +94,7 @@ def initialize(opts = {})
         def browser
           @browser ||= (
             name = @capabilities.browser_name
-            name ? name.gsub(" ", "_").to_sym : 'unknown'
+            name ? name.tr(" ", "_").to_sym : 'unknown'
           )
         end
 
@@ -418,7 +418,10 @@ def mouseUp
         def mouseMoveTo(element, x = nil, y = nil)
           params = {element: element}
 
-          params.merge! xoffset: x, yoffset: y if x && y
+          if x && y
+            params[:xoffset] = x
+            params[:yoffset] = y
+          end
 
           execute :mouseMoveTo, {}, params
         end

rb/lib/selenium/webdriver/safari/bridge.rb

@@ -111,7 +111,7 @@ def prepare_connect_file
           end
 
           FileReaper << path
-          path.gsub! "/", "\\" if Platform.windows?
+          path.tr! "/", "\\" if Platform.windows?
 
           path
         end