selenium-webdriver 2.53.4 → 3.0.0.beta1

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

@@ -20,38 +20,37 @@
 module Selenium
   module WebDriver
     module Firefox
-
       # @api private
       class Binary
-
-        NO_FOCUS_LIBRARY_NAME = "x_ignore_nofocus.so"
-        NO_FOCUS_LIBRARIES    = [
-          ["#{WebDriver.root}/selenium/webdriver/firefox/native/linux/amd64/#{NO_FOCUS_LIBRARY_NAME}", "amd64/#{NO_FOCUS_LIBRARY_NAME}"],
-          ["#{WebDriver.root}/selenium/webdriver/firefox/native/linux/x86/#{NO_FOCUS_LIBRARY_NAME}", "x86/#{NO_FOCUS_LIBRARY_NAME}"],
-        ]
+        NO_FOCUS_LIBRARY_NAME = 'x_ignore_nofocus.so'.freeze
+        NO_FOCUS_LIBRARIES = [
+          ["#{WebDriver.root}/selenium/webdriver/firefox/native/linux/amd64/#{NO_FOCUS_LIBRARY_NAME}",
+           "amd64/#{NO_FOCUS_LIBRARY_NAME}"],
+          ["#{WebDriver.root}/selenium/webdriver/firefox/native/linux/x86/#{NO_FOCUS_LIBRARY_NAME}",
+           "x86/#{NO_FOCUS_LIBRARY_NAME}"]
+        ].freeze
 
         WAIT_TIMEOUT = 90
         QUIT_TIMEOUT = 5
 
         def start_with(profile, profile_path, *args)
           if Platform.cygwin?
-            profile_path = Platform.cygwin_path(profile_path, :windows => true)
+            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
-          ENV['XRE_PROFILE_PATH']          = profile_path
-          ENV['MOZ_NO_REMOTE']             = '1' # able to launch multiple instances
+          ENV['XRE_CONSOLE_LOG'] = profile.log_file if profile.log_file
+          ENV['XRE_PROFILE_PATH'] = profile_path
+          ENV['MOZ_NO_REMOTE'] = '1' # able to launch multiple instances
           ENV['MOZ_CRASHREPORTER_DISABLE'] = '1' # disable breakpad
-          ENV['NO_EM_RESTART']             = '1' # prevent the binary from detaching from the console
+          ENV['NO_EM_RESTART'] = '1' # prevent the binary from detaching from the console
 
           if Platform.linux? && (profile.native_events? || profile.load_no_focus_lib?)
             modify_link_library_path profile_path
           end
 
           execute(*args)
-          cope_with_mac_strangeness(args) if Platform.mac?
         end
 
         def quit
@@ -76,28 +75,12 @@ module Selenium
         private
 
         def execute(*extra_args)
-          args = [self.class.path, "-no-remote"] + extra_args
+          args = [self.class.path, '-no-remote'] + extra_args
           @process = ChildProcess.build(*args)
           @process.io.inherit! if $DEBUG
           @process.start
         end
 
-        def cope_with_mac_strangeness(args)
-          sleep 0.3
-
-          if @process.crashed?
-            # ok, trying a restart
-            sleep 7
-            execute(*args)
-          end
-
-          # ensure we're ok
-          sleep 0.3
-          if @process.crashed?
-            raise Error::WebDriverError, "unable to start Firefox cleanly, args: #{args.inspect}"
-          end
-        end
-
         def modify_link_library_path(profile_path)
           paths = []
 
@@ -112,11 +95,10 @@ module Selenium
           paths += ENV['LD_LIBRARY_PATH'].to_s.split(File::PATH_SEPARATOR)
 
           ENV['LD_LIBRARY_PATH'] = paths.uniq.join(File::PATH_SEPARATOR)
-          ENV['LD_PRELOAD']      = NO_FOCUS_LIBRARY_NAME
+          ENV['LD_PRELOAD'] = NO_FOCUS_LIBRARY_NAME
         end
 
         class << self
-
           #
           # @api private
           #
@@ -139,7 +121,7 @@ module Selenium
                       when :windows
                         windows_path
                       when :linux, :unix
-                        Platform.find_binary("firefox3", "firefox2", "firefox") || "/usr/bin/firefox"
+                        Platform.find_binary('firefox3', 'firefox2', 'firefox') || '/usr/bin/firefox'
                       else
                         raise Error::WebDriverError, "unknown platform: #{Platform.os}"
                       end
@@ -147,7 +129,9 @@ module Selenium
             @path = Platform.cygwin_path(@path) if Platform.cygwin?
 
             unless File.file?(@path.to_s)
-              raise Error::WebDriverError, "Could not find Firefox binary (os=#{Platform.os}). Make sure Firefox is installed or set the path manually with #{self}.path="
+              error = "Could not find Firefox binary (os=#{Platform.os}). "
+              error << "Make sure Firefox is installed or set the path manually with #{self}.path="
+              raise Error::WebDriverError, error
             end
 
             @path
@@ -155,27 +139,29 @@ module Selenium
 
           def version
             @version = case Platform.os
-                         when :macosx
-                           `#{path} -v`.strip[/[^\s]*$/][/^\d+/].to_i
-                         when :windows
-                           `\"#{path}\" -v | more`.strip[/[^\s]*$/][/^\d+/].to_i
-                         when :linux
-                           `#{path} -v`.strip[/[^\s]*$/][/^\d+/].to_i
-                         else
-                           0
-                         end
+                       when :macosx
+                         `#{path} -v`.strip[/[^\s]*$/][/^\d+/].to_i
+                       when :windows
+                         `\"#{path}\" -v | more`.strip[/[^\s]*$/][/^\d+/].to_i
+                       when :linux
+                         `#{path} -v`.strip[/[^\s]*$/][/^\d+/].to_i
+                       else
+                         0
+                       end
           end
 
           private
 
           def windows_path
-            windows_registry_path || Platform.find_in_program_files("\\Mozilla Firefox\\firefox.exe") || Platform.find_binary("firefox")
+            windows_registry_path ||
+              Platform.find_in_program_files('\\Mozilla Firefox\\firefox.exe') ||
+              Platform.find_binary('firefox')
           end
 
           def macosx_path
-            path = "/Applications/Firefox.app/Contents/MacOS/firefox-bin"
-            path = File.expand_path("~/Applications/Firefox.app/Contents/MacOS/firefox-bin") unless File.exist?(path)
-            path = Platform.find_binary("firefox-bin") unless File.exist?(path)
+            path = '/Applications/Firefox.app/Contents/MacOS/firefox-bin'
+            path = File.expand_path('~/Applications/Firefox.app/Contents/MacOS/firefox-bin') unless File.exist?(path)
+            path = Platform.find_binary('firefox-bin') unless File.exist?(path)
 
             path
           end
@@ -184,18 +170,16 @@ module Selenium
             require 'win32/registry'
 
             lm = Win32::Registry::HKEY_LOCAL_MACHINE
-            lm.open("SOFTWARE\\Mozilla\\Mozilla Firefox") do |reg|
+            lm.open('SOFTWARE\\Mozilla\\Mozilla Firefox') do |reg|
               main = lm.open("SOFTWARE\\Mozilla\\Mozilla Firefox\\#{reg.keys[0]}\\Main")
-              if entry = main.find { |key, type, data| key =~ /pathtoexe/i }
-                return entry.last
-              end
+              entry = main.find { |key, _type, _data| key =~ /pathtoexe/i }
+              return entry.last if entry
             end
           rescue LoadError
             # older JRuby or IronRuby does not have win32/registry
           rescue Win32::Registry::Error
           end
         end # class << self
-
       end # Binary
     end # Firefox
   end # WebDriver

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

@@ -20,10 +20,8 @@
 module Selenium
   module WebDriver
     module Firefox
-
       # @api private
       class Bridge < Remote::Bridge
-
         def initialize(opts = {})
           port        = opts.delete(:port) || DEFAULT_PORT
           profile     = opts.delete(:profile)
@@ -45,11 +43,11 @@ module Selenium
           caps.proxy = proxy if proxy
 
           remote_opts = {
-            :url                  => @launcher.url,
-            :desired_capabilities => caps
+            url: @launcher.url,
+            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)
@@ -82,7 +80,6 @@ module Selenium
         def create_launcher(port, profile)
           Launcher.new Binary.new, port, profile
         end
-
       end # Bridge
     end # Firefox
   end # WebDriver

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

@@ -20,13 +20,12 @@
 module Selenium
   module WebDriver
     module Firefox
-
       #
       # @api private
       #
 
       class Extension
-        NAMESPACE = 'http://www.mozilla.org/2004/em-rdf#'
+        NAMESPACE = 'http://www.mozilla.org/2004/em-rdf#'.freeze
 
         def initialize(path)
           unless File.exist?(path)
@@ -42,7 +41,7 @@ module Selenium
           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: 0700
           FileUtils.cp_r root_dir, ext_path
 
           FileReaper.reap(root_dir) if @should_reap_root
@@ -55,7 +54,7 @@ module Selenium
             @path
           else
             unless Zipper::EXTENSIONS.include? File.extname(@path)
-              raise Error::WebDriverError, "expected #{Zipper::EXTENSIONS.join(" or ")}, got #{@path.inspect}"
+              raise Error::WebDriverError, "expected #{Zipper::EXTENSIONS.join(' or ')}, got #{@path.inspect}"
             end
 
             @should_reap_root = true
@@ -64,7 +63,7 @@ module Selenium
         end
 
         def read_id_from_install_rdf(directory)
-          rdf_path = File.join(directory, "install.rdf")
+          rdf_path = File.join(directory, 'install.rdf')
           doc = REXML::Document.new(File.read(rdf_path))
           namespace = doc.root.namespaces.key(NAMESPACE)
 
@@ -78,7 +77,6 @@ module Selenium
 
           raise Error::WebDriverError, "cannot locate extension id in #{rdf_path}"
         end
-
       end # Extension
     end # Firefox
   end # WebDriver

data/lib/selenium/webdriver/firefox/extension/prefs.json

@@ -40,15 +40,6 @@
     "security.csp.enable": false,
     "security.fileuri.origin_policy": 3,
     "security.fileuri.strict_origin_policy": false,
-    "security.warn_entering_secure": false,
-    "security.warn_entering_secure.show_once": false,
-    "security.warn_entering_weak": false,
-    "security.warn_entering_weak.show_once": false,
-    "security.warn_leaving_secure": false,
-    "security.warn_leaving_secure.show_once": false,
-    "security.warn_submit_insecure": false,
-    "security.warn_viewing_mixed": false,
-    "security.warn_viewing_mixed.show_once": false,
     "signon.rememberSignons": false,
     "toolkit.networkmanager.disable": true,
     "toolkit.telemetry.prompted": 2,
@@ -64,12 +55,12 @@
     "browser.newtabpage.enabled": false,
     "browser.startup.page": 0,
     "browser.startup.homepage": "about:blank",
+    "browser.startup.homepage_override.mstone": "ignore",
     "browser.usedOnWindows10.introURL": "about:blank",
     "dom.max_chrome_script_run_time": 30,
     "dom.max_script_run_time": 30,
     "dom.report_all_js_exceptions": true,
     "javascript.options.showInConsole": true,
-    "network.http.max-connections-per-server": 10,
     "startup.homepage_welcome_url": "about:blank",
     "startup.homepage_welcome_url.additional": "about:blank",
     "webdriver_accept_untrusted_certs": true,

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

@@ -20,10 +20,8 @@
 module Selenium
   module WebDriver
     module Firefox
-
       # @api private
       class Launcher
-
         SOCKET_LOCK_TIMEOUT       = 45
         STABLE_CONNECTION_TIMEOUT = 60
 
@@ -33,14 +31,14 @@ module Selenium
 
           raise Error::WebDriverError, "invalid port: #{@port}" if @port < 1
 
-          if profile.kind_of? Profile
+          if profile.is_a? Profile
             @profile = profile
           else
             @profile_name = profile
             @profile = nil
           end
 
-          @host = "127.0.0.1"
+          @host = '127.0.0.1'
         end
 
         def url
@@ -79,16 +77,16 @@ module Selenium
 
         def start
           assert_profile
-          @binary.start_with @profile, @profile_dir, "-foreground"
+          @binary.start_with @profile, @profile_dir, '-foreground'
         end
 
         def connect_until_stable
           poller = SocketPoller.new(@host, @port, STABLE_CONNECTION_TIMEOUT)
 
-          unless poller.connected?
-            @binary.quit
-            raise Error::WebDriverError, "unable to obtain stable firefox connection in #{STABLE_CONNECTION_TIMEOUT} seconds (#{@host}:#{@port})"
-          end
+          return if poller.connected?
+          @binary.quit
+          error = "unable to obtain stable firefox connection in #{STABLE_CONNECTION_TIMEOUT} seconds (#{@host}:#{@port})"
+          raise Error::WebDriverError, error
         end
 
         def fetch_profile
@@ -104,13 +102,12 @@ module Selenium
         end
 
         def assert_profile
-          raise Error::WebDriverError, "must create_profile first" unless @profile && @profile_dir
+          raise Error::WebDriverError, 'must create_profile first' unless @profile && @profile_dir
         end
 
         def socket_lock
           @socket_lock ||= SocketLock.new(@port - 1, SOCKET_LOCK_TIMEOUT)
         end
-
       end # Launcher
     end # Firefox
   end # WebDriver

data/lib/selenium/webdriver/firefox/profile.rb

@@ -23,15 +23,15 @@ module Selenium
       class Profile
         include ProfileHelper
 
-        VALID_PREFERENCE_TYPES   = [TrueClass, FalseClass, Integer, Float, String]
+        VALID_PREFERENCE_TYPES   = [TrueClass, FalseClass, Integer, Float, String].freeze
         WEBDRIVER_EXTENSION_PATH = File.expand_path("#{WebDriver.root}/selenium/webdriver/firefox/extension/webdriver.xpi")
         WEBDRIVER_PREFS          = {
-          :native_events    => 'webdriver_enable_native_events',
-          :untrusted_certs  => 'webdriver_accept_untrusted_certs',
-          :untrusted_issuer => 'webdriver_assume_untrusted_issuer',
-          :port             => 'webdriver_firefox_port',
-          :log_file         => 'webdriver.log.file'
-        }
+          native_events: 'webdriver_enable_native_events',
+          untrusted_certs: 'webdriver_accept_untrusted_certs',
+          untrusted_issuer: 'webdriver_assume_untrusted_issuer',
+          port: 'webdriver_firefox_port',
+          log_file: 'webdriver.log.file'
+        }.freeze
 
         attr_reader   :name, :log_file
         attr_writer   :secure_ssl, :native_events, :load_no_focus_lib
@@ -78,18 +78,19 @@ module Selenium
             @additional_prefs  = {}
           else
             # TODO: clean this up
-            @native_events     = model_prefs.delete(WEBDRIVER_PREFS[:native_events]) == "true"
-            @secure_ssl        = model_prefs.delete(WEBDRIVER_PREFS[:untrusted_certs]) != "true"
-            @untrusted_issuer  = model_prefs.delete(WEBDRIVER_PREFS[:untrusted_issuer]) == "true"
-            @load_no_focus_lib = model_prefs.delete(WEBDRIVER_PREFS[:load_no_focus_lib]) == "true" # not stored in profile atm, so will always be false.
+            @native_events     = model_prefs.delete(WEBDRIVER_PREFS[:native_events]) == 'true'
+            @secure_ssl        = model_prefs.delete(WEBDRIVER_PREFS[:untrusted_certs]) != 'true'
+            @untrusted_issuer  = model_prefs.delete(WEBDRIVER_PREFS[:untrusted_issuer]) == 'true'
+            # not stored in profile atm, so will always be false.
+            @load_no_focus_lib = model_prefs.delete(WEBDRIVER_PREFS[:load_no_focus_lib]) == 'true'
             @additional_prefs  = model_prefs
           end
 
-          @extensions        = {}
+          @extensions = {}
         end
 
         def layout_on_disk
-          profile_dir = @model ? create_tmp_copy(@model) : Dir.mktmpdir("webdriver-profile")
+          profile_dir = @model ? create_tmp_copy(@model) : Dir.mktmpdir('webdriver-profile')
           FileReaper << profile_dir
 
           install_extensions(profile_dir)
@@ -100,7 +101,6 @@ module Selenium
           profile_dir
         end
 
-
         #
         # Set a preference for this particular profile.
         #
@@ -109,11 +109,11 @@ module Selenium
         #
 
         def []=(key, value)
-          unless VALID_PREFERENCE_TYPES.any? { |e| value.kind_of? e }
+          unless VALID_PREFERENCE_TYPES.any? { |e| value.is_a? e }
             raise TypeError, "expected one of #{VALID_PREFERENCE_TYPES.inspect}, got #{value.inspect}:#{value.class}"
           end
 
-          if value.kind_of?(String) && Util.stringified?(value)
+          if value.is_a?(String) && Util.stringified?(value)
             raise ArgumentError, "preference values must be plain strings: #{key.inspect} => #{value.inspect}"
           end
 
@@ -130,9 +130,8 @@ module Selenium
         end
 
         def add_webdriver_extension
-          unless @extensions.has_key?(:webdriver)
-            add_extension(WEBDRIVER_EXTENSION_PATH, :webdriver)
-          end
+          return if @extensions.key?(:webdriver)
+          add_extension(WEBDRIVER_EXTENSION_PATH, :webdriver)
         end
 
         #
@@ -164,7 +163,7 @@ module Selenium
         end
 
         def proxy=(proxy)
-          unless proxy.kind_of? Proxy
+          unless proxy.is_a? Proxy
             raise TypeError, "expected #{Proxy.name}, got #{proxy.inspect}:#{proxy.class}"
           end
 
@@ -172,16 +171,16 @@ module Selenium
           when :manual
             self['network.proxy.type'] = 1
 
-            set_manual_proxy_preference "ftp", proxy.ftp
-            set_manual_proxy_preference "http", proxy.http
-            set_manual_proxy_preference "ssl", proxy.ssl
-            set_manual_proxy_preference "socks", proxy.socks
+            set_manual_proxy_preference 'ftp', proxy.ftp
+            set_manual_proxy_preference 'http', proxy.http
+            set_manual_proxy_preference 'ssl', proxy.ssl
+            set_manual_proxy_preference 'socks', proxy.socks
 
-            if proxy.no_proxy
-              self["network.proxy.no_proxies_on"] = proxy.no_proxy
-            else
-              self["network.proxy.no_proxies_on"] = ""
-            end
+            self['network.proxy.no_proxies_on'] = if proxy.no_proxy
+                                                    proxy.no_proxy
+                                                  else
+                                                    ''
+                                                  end
           when :pac
             self['network.proxy.type'] = 2
             self['network.proxy.autoconfig_url'] = proxy.pac
@@ -199,17 +198,17 @@ module Selenium
         def set_manual_proxy_preference(key, value)
           return unless value
 
-          host, port = value.to_s.split(":", 2)
+          host, port = value.to_s.split(':', 2)
 
           self["network.proxy.#{key}"] = host
           self["network.proxy.#{key}_port"] = Integer(port) if port
         end
 
         def install_extensions(directory)
-          destination = File.join(directory, "extensions")
+          destination = File.join(directory, 'extensions')
 
           @extensions.each do |name, extension|
-            p :extension => name if $DEBUG
+            p extension: name if $DEBUG
             extension.write_to(destination)
           end
         end
@@ -221,7 +220,7 @@ module Selenium
         end
 
         def delete_extensions_cache(directory)
-          FileUtils.rm_f File.join(directory, "extensions.cache")
+          FileUtils.rm_f File.join(directory, 'extensions.cache')
         end
 
         def delete_lock_files(directory)
@@ -247,7 +246,7 @@ module Selenium
           prefs[WEBDRIVER_PREFS[:untrusted_issuer]] = assume_untrusted_certificate_issuer?
 
           # If the user sets the home page, we should also start up there
-          prefs["startup.homepage_welcome_url"] = prefs["browser.startup.homepage"]
+          prefs['startup.homepage_welcome_url'] = prefs['browser.startup.homepage']
 
           write_prefs prefs, path
         end
@@ -257,25 +256,24 @@ module Selenium
           return prefs unless File.exist?(path)
 
           File.read(path).split("\n").each do |line|
-            if line =~ /user_pref\("([^"]+)"\s*,\s*(.+?)\);/
-              key, value = $1.strip, $2.strip
+            next unless line =~ /user_pref\("([^"]+)"\s*,\s*(.+?)\);/
+            key = Regexp.last_match(1).strip
+            value = Regexp.last_match(2).strip
 
-              # wrap the value in an array to make it a valid JSON string.
-              prefs[key] = JSON.parse("[#{value}]").first
-            end
+            # wrap the value in an array to make it a valid JSON string.
+            prefs[key] = JSON.parse("[#{value}]").first
           end
 
           prefs
         end
 
         def write_prefs(prefs, path)
-          File.open(path, "w") { |file|
+          File.open(path, 'w') do |file|
             prefs.each do |key, value|
               file.puts %{user_pref("#{key}", #{value.to_json});}
             end
-          }
+          end
         end
-
       end # Profile
     end # Firefox
   end # WebDriver