webdrivers 4.6.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c31a9a9bcdbe92bc18be8e3175ca852ee58445a442647c0f6f1386b35edacb05
-  data.tar.gz: c7f331a4cf2c67e8849e53185228189d11f41d5116b6e0743d09cfedbbefaa3a
+  metadata.gz: ea3a67076ea1a3e77e954a92642eed78d0bbcc041dfa0715ff08f911b20e2577
+  data.tar.gz: 0bc4ae97ff8d252e5201b79aa24f58d29e1e965948bc4f63bd1923cf84d0accd
 SHA512:
-  metadata.gz: 82321bb84a03c26f595bb85a5907742ce4116cbe44b608a2ac27ea5c344452311151271b5eaa3bb7be4f6773fd1882d55e365531638aeed236c497557717a467
-  data.tar.gz: 4d65d4764fd7655fce7a040abd3e6b1232c2ca54a8405c9f17ed9bb8005b9ebaf0e979a783da55a32516648fff6cb882eaea79cfc4113dddced022530de43531
+  metadata.gz: c6c95c4b5cc8f198f1df0715574bcf76018e976a311c51e498ef9e3b56277e1a9e45b6255ce721a22e415d546fdef1dcd2b02e864553bdbb1290a06ff3ad8264
+  data.tar.gz: d3a8876c9ee4cbe31552946e870775a9fd0aa833db5c9a8843a56ecfd85bbc92d285b9f4237de365fb8bcb1fe837afee6633c9937010442e5c6e47759899645b

data/CHANGELOG.md

@@ -1,3 +1,31 @@
+# 5.3.0 (2023-07-31)
+* Add support for Chrome for Testing drivers ([#237](https://github.com/titusfortner/webdrivers/issues/249), thanks sadahiro-ono)
+* Support is restricted to Selenium 4.0 - 4.10 to encourage people to update to Selenium 4.11
+
+# 5.2.0 (2022-09-29)
+* `chromedriver` - Fix downloading on M1 macs from version 106.0.5249.61 ([#237](https://github.com/titusfortner/webdrivers/issues/237), thanks jmccure)
+
+# 5.1.0 (2022-09-19)
+* Improve error messages (#232, thanks dan-jensen)
+* Fix circular require bug with railtie (#233, thanks amatsuda)
+* Support downloading correct geckodriver on Apple silicon (#234 thanks stephannv)
+* Update linux locations for Chrome to latest chromedriver finder (thanks entretechno-jeremiah) 
+* Add support for Microsoft Edge on Linux (#236)
+
+# 5.0.0 (2021-10-19)
+* Require Selenium 4+
+* Remove custom Logger and use the one in Selenium 4
+
+# 4.7.0 (2021-10-14)
+* Add support for Selenium 4.x #218 (thanks yahonda )
+* Allow Edge on Linux
+* Update required Selenium > 3.141 because of a change in 4.6
+* Require Ruby 2.6+
+* Fix IE downloads with the change in location of assets
+
+# 4.6.1 (2021-08-19)
+* Fix bug in IEdriver caused by bad formatting in recent release
+
 # 4.6.0 (2021-02-26)
 * Update `Edgedriver` naming to support Selenium 4 beta (([#206](https://github.com/titusfortner/webdrivers/pull/206))
 

data/LICENSE.txt

@@ -1,7 +1,7 @@
 (The MIT License)
 
-Copyright (c) 2017-2019: Titus Fortner
-Copyright (c) 2019: Lakshya Kapoor, Thomas Walpole
+Copyright (c) 2017-2023: Titus Fortner
+Copyright (c) 2019-2023: Lakshya Kapoor, Thomas Walpole
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -5,6 +5,30 @@
 
 Run Selenium tests more easily with automatic installation and updates for all supported webdrivers.
 
+## Update: Future of this Project
+
+With Google's new [Chrome for Testing](https://developer.chrome.com/blog/chrome-for-testing/) project, 
+and Selenium's new [Selenium Manager](https://www.selenium.dev/documentation/selenium_manager/) feature, 
+what is required of this gem has changed.
+
+If you can update to to the latest version of Selenium (4.11+), please do so and stop requiring this gem.
+Provide feedback or raise issues to [Selenium Project](https://github.com/SeleniumHQ/selenium/issues/new/choose)
+
+If you cannot upgrade to Selenium 4.11, Webdrivers 5.3.0 will continue to support Ruby 2.6+ and Selenium 4.0 - 4.10
+
+If you are using an older version of webdrivers gem, and cannot upgrade, you can set
+the required version of chromedriver to v114 (`Webdrivers.required_version = '114.0.5735.90'`) and 
+[Disable the build check](https://www.selenium.dev/documentation/webdriver/browsers/chrome/#disabling-build-check). 
+This is not guaranteed to continue working and will not receive bug fixes.
+
+**Webdrivers 6.0**
+To provide support for Selenium 3 and Ruby < 2.6 a 6.0 version is planned. It requires:
+* Creating a `selenium-manager.gem` based off of https://github.com/SeleniumHQ/selenium/pull/12429
+* Re-implementing this gem to wrap `selenium-manager.gem`
+* Ensuring compatible with older versions of Selenium & Ruby
+
+If anyone would like to help get Webdrivers 6 working, please let us know.
+
 ## Description
 
 `webdrivers` downloads drivers and directs Selenium to use them. Currently supports:
@@ -22,7 +46,7 @@ notes at the bottom.
 In your Gemfile:
 
 ```ruby
-gem 'webdrivers', '~> 4.0', require: false
+gem 'webdrivers', '~> 5.0', require: false
 ```
 
 In your project:

data/lib/webdrivers/chrome_finder.rb

@@ -8,7 +8,7 @@ module Webdrivers
     class << self
       def version
         version = send("#{System.platform}_version", location)
-        raise VersionError, 'Failed to find Chrome version.' if version.nil? || version.empty?
+        raise VersionError, 'Failed to determine Chrome version.' if version.nil? || version.empty?
 
         Webdrivers.logger.debug "Browser version: #{version}"
         version[/\d+\.\d+\.\d+\.\d+/] # Google Chrome 73.0.3683.75 -> 73.0.3683.75
@@ -18,7 +18,7 @@ module Webdrivers
         chrome_bin = user_defined_location || send("#{System.platform}_location")
         return chrome_bin unless chrome_bin.nil?
 
-        raise BrowserNotFound, 'Failed to find Chrome binary.'
+        raise BrowserNotFound, 'Failed to determine Chrome binary location.'
       end
 
       private
@@ -90,7 +90,17 @@ module Webdrivers
       def linux_location
         return wsl_location if System.wsl_v1?
 
-        directories = %w[/usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin /snap/bin /opt/google/chrome]
+        directories = %w[
+          /usr/local/sbin
+          /usr/local/bin
+          /usr/sbin
+          /usr/bin
+          /sbin
+          /bin
+          /snap/bin
+          /opt/google/chrome
+          /opt/chromium.org/chromium
+        ]
         files = %w[google-chrome chrome chromium chromium-browser]
 
         directories.each do |dir|

data/lib/webdrivers/chromedriver.rb

@@ -63,7 +63,11 @@ module Webdrivers
       private
 
       def latest_point_release(version)
-        normalize_version(Network.get(URI.join(base_url, "LATEST_RELEASE_#{version}")))
+        if version < normalize_version('115')
+          return normalize_version(Network.get(URI.join(base_url, "LATEST_RELEASE_#{version}")))
+        end
+
+        latest_patch_version(version)
       rescue NetworkError
         msg = "Unable to find latest point release version for #{version}."
         msg = begin
@@ -78,7 +82,7 @@ module Webdrivers
         end
 
         msg = "#{msg} Please set `Webdrivers::Chromedriver.required_version = <desired driver version>` "\
-              'to a known chromedriver version: https://chromedriver.storage.googleapis.com/index.html'
+                'to a known chromedriver version: https://chromedriver.chromium.org/downloads/version-selection'
         Webdrivers.logger.debug msg
         raise VersionError, msg
       end
@@ -97,18 +101,23 @@ module Webdrivers
         false
       end
 
-      def download_url
-        return @download_url if @download_url
+      def apple_filename(driver_version)
+        unless apple_m1_compatible?(driver_version)
+          return driver_version >= normalize_version('115') ? 'mac-x64' : 'mac64'
+        end
+
+        if driver_version < normalize_version('106.0.5249.61')
+          'mac64_m1'
+        elsif driver_version < normalize_version('115')
+          'mac_arm64'
+        else
+          'mac-arm64'
+        end
+      end
 
-        driver_version = if required_version == EMPTY_VERSION
-                           latest_version
-                         else
-                           normalize_version(required_version)
-                         end
-        filename = driver_filename(driver_version)
-        url = "#{base_url}/#{driver_version}/chromedriver_#{filename}.zip"
-        Webdrivers.logger.debug "chromedriver URL: #{url}"
-        @download_url = url
+      def direct_url(driver_version)
+        direct_url_from_api(driver_version) ||
+          "#{base_url}/#{driver_version}/chromedriver_#{driver_filename(driver_version)}.zip"
       end
 
       def driver_filename(driver_version)
@@ -117,8 +126,7 @@ module Webdrivers
         elsif System.platform == 'linux'
           'linux64'
         elsif System.platform == 'mac'
-          apple_arch = apple_m1_compatible?(driver_version) ? '_m1' : ''
-          "mac64#{apple_arch}"
+          apple_filename(driver_version)
         else
           raise 'Failed to determine driver filename to download for your OS.'
         end
@@ -144,6 +152,7 @@ module Webdrivers
       def browser_build_version
         normalize_version(browser_version.segments[0..2].join('.'))
       end
+
       alias chrome_build_version browser_build_version
 
       # Returns true if an executable driver binary exists
@@ -152,21 +161,35 @@ module Webdrivers
         super && current_version && (current_version < normalize_version('70.0.3538') ||
           current_build_version == browser_build_version)
       end
-    end
-  end
-end
 
-if ::Selenium::WebDriver::Service.respond_to? :driver_path=
-  ::Selenium::WebDriver::Chrome::Service.driver_path = proc { ::Webdrivers::Chromedriver.update }
-else
-  # v3.141.0 and lower
-  module Selenium
-    module WebDriver
-      module Chrome
-        def self.driver_path
-          @driver_path ||= Webdrivers::Chromedriver.update
-        end
+      def chrome_for_testing_base_url
+        'https://googlechromelabs.github.io/chrome-for-testing/'
+      end
+
+      def latest_patch_version(driver_version)
+        latest_patch_version = URI.join(chrome_for_testing_base_url, 'latest-patch-versions-per-build.json')
+                                  .then { |url| Network.get(url) }
+                                  .then { |res| JSON.parse(res, symbolize_names: true) }
+                                  .then { |json| json.dig(:builds, :"#{driver_version}", :version) }
+                                  .then { |version| version ? normalize_version(version) : nil }
+        raise NetworkError unless latest_patch_version
+
+        latest_patch_version
+      end
+
+      def direct_url_from_api(driver_version)
+        return if normalize_version(driver_version) < normalize_version('115')
+
+        URI.join(chrome_for_testing_base_url, 'known-good-versions-with-downloads.json')
+           .then { |url| Network.get(url) }
+           .then { |res| JSON.parse(res, symbolize_names: true) }
+           .then { |json| json[:versions].find { |e| e[:version] == driver_version.to_s } }
+           .then { |json| json.dig(:downloads, :chromedriver) }
+           .then { |json| json.find { |e| e[:platform] == driver_filename(driver_version) } }
+           .then { |json| json&.dig(:url) }
       end
     end
   end
 end
+
+::Selenium::WebDriver::Chrome::Service.driver_path = proc { ::Webdrivers::Chromedriver.update }

data/lib/webdrivers/common.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 require 'rubygems/package'
-require 'webdrivers/logger'
 require 'webdrivers/network'
 require 'webdrivers/system'
 require 'selenium-webdriver'
+require 'webdrivers/logger'
 require 'webdrivers/version'
 
 module Webdrivers
@@ -118,12 +118,12 @@ module Webdrivers
 
       private
 
+      def download_version
+        required_version == EMPTY_VERSION ? latest_version : required_version
+      end
+
       def download_url
-        @download_url ||= if required_version == EMPTY_VERSION
-                            downloads[downloads.keys.max]
-                          else
-                            downloads[normalize_version(required_version)]
-                          end
+        @download_url ||= direct_url(download_version).tap { |url| Webdrivers.logger.debug "#{file_name} URL: #{url}" }
       end
 
       def exists?
@@ -131,11 +131,7 @@ module Webdrivers
       end
 
       def correct_binary?
-        current_version == if required_version == EMPTY_VERSION
-                             latest_version
-                           else
-                             normalize_version(required_version)
-                           end
+        current_version == download_version
       rescue ConnectionError, VersionError
         driver_path if sufficient_binary?
       end

data/lib/webdrivers/edge_finder.rb

@@ -69,18 +69,17 @@ module Webdrivers
       end
 
       def linux_location
-        # directories = %w[/usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin /snap/bin /opt/google/chrome]
-        # files = %w[microsoft-edge] # Based on Microsoft Edge 89.0.760.0 dev
-        #
-        # directories.each do |dir|
-        #   files.each do |file|
-        #     option = "#{dir}/#{file}"
-        #     return option if File.exist?(option)
-        #   end
-        # end
-        #
-        # nil
-        raise 'Default location not yet known'
+        directories = %w[/usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin /snap/bin /opt/microsoft/edge]
+        files = %w[microsoft-edge microsoft-edge-beta microsoft-edge-dev]
+
+        directories.each do |dir|
+          files.each do |file|
+            option = "#{dir}/#{file}"
+            return option if File.exist?(option)
+          end
+        end
+
+        nil
       end
 
       def win_version(location)

data/lib/webdrivers/edgedriver.rb

@@ -22,8 +22,7 @@ module Webdrivers
       #
       # @return [String]
       def base_url
-        # 'https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver/'
-        'https://msedgedriver.azureedge.net/'
+        'https://msedgedriver.azureedge.net'
       end
 
       private
@@ -76,15 +75,11 @@ module Webdrivers
         false
       end
 
-      # def linux_compatible?(driver_version)
-      #   System.platform == 'linux' && driver_version >= normalize_version('89.0.731.0')
-      # end
-
       def driver_filename(driver_version)
         if System.platform == 'win' || System.wsl_v1?
           "win#{System.bitsize}" # 32 or 64-bit
-        # elsif linux_compatible?(driver_version)
-        #   'linux64'
+        elsif System.platform == 'linux'
+          'linux64'
         elsif System.platform == 'mac'
           # Determine M1 or Intel architecture
           apple_arch = apple_m1_compatible?(driver_version) ? 'arm' : 'mac'
@@ -94,18 +89,8 @@ module Webdrivers
         end
       end
 
-      def download_url
-        return @download_url if @download_url
-
-        driver_version = if required_version == EMPTY_VERSION
-                           latest_version
-                         else
-                           normalize_version(required_version)
-                         end
-        filename = driver_filename(driver_version)
-        url = "#{base_url}/#{driver_version}/edgedriver_#{filename}.zip"
-        Webdrivers.logger.debug "msedgedriver URL: #{url}"
-        @download_url = url
+      def direct_url(driver_version)
+        "#{base_url}/#{driver_version}/edgedriver_#{driver_filename(driver_version)}.zip"
       end
     end
   end

data/lib/webdrivers/geckodriver.rb

@@ -42,14 +42,6 @@ module Webdrivers
         System.platform == 'win' ? 'geckodriver.exe' : 'geckodriver'
       end
 
-      def download_url
-        @download_url ||= if required_version == EMPTY_VERSION
-                            direct_url(latest_version)
-                          else
-                            direct_url(required_version)
-                          end
-      end
-
       def direct_url(version)
         "#{base_url}/download/v#{version}/geckodriver-v#{version}-#{platform_ext}"
       end
@@ -59,7 +51,7 @@ module Webdrivers
         when 'linux'
           "linux#{System.bitsize}.tar.gz"
         when 'mac'
-          'macos.tar.gz'
+          System.apple_m1_architecture? ? 'macos-aarch64.tar.gz' : 'macos.tar.gz'
         when 'win'
           "win#{System.bitsize}.zip"
         end
@@ -68,17 +60,4 @@ module Webdrivers
   end
 end
 
-if ::Selenium::WebDriver::Service.respond_to? :driver_path=
-  ::Selenium::WebDriver::Firefox::Service.driver_path = proc { ::Webdrivers::Geckodriver.update }
-else
-  # v3.141.0 and lower
-  module Selenium
-    module WebDriver
-      module Firefox
-        def self.driver_path
-          @driver_path ||= Webdrivers::Geckodriver.update
-        end
-      end
-    end
-  end
-end
+::Selenium::WebDriver::Firefox::Service.driver_path = proc { ::Webdrivers::Geckodriver.update }

data/lib/webdrivers/iedriver.rb

@@ -34,7 +34,7 @@ module Webdrivers
       #
       # @return [String]
       def base_url
-        'https://selenium-release.storage.googleapis.com/'
+        'https://api.github.com/repos/seleniumhq/selenium/releases'
       end
 
       private
@@ -43,35 +43,26 @@ module Webdrivers
         'IEDriverServer.exe'
       end
 
+      def direct_url(version)
+        downloads[version]
+      end
+
       def downloads
         ds = download_manifest.each_with_object({}) do |item, hash|
-          version = normalize_version item[/([^_]+)\.zip/, 1]
-          hash[version] = "#{base_url}#{item}"
+          version = normalize_version item['name'][/\.?([^_]+)\.zip/, 1]
+          hash[version] = item['browser_download_url']
         end
         Webdrivers.logger.debug "Versions now located on downloads site: #{ds.keys}"
         ds
       end
 
       def download_manifest
-        doc = Nokogiri::XML.parse(Network.get(base_url))
-        items = doc.css('Key').collect(&:text)
-        items.select { |item| item.include?('IEDriverServer_Win32') }
+        json = Network.get(base_url)
+        all_assets = JSON.parse(json).map { |release| release['assets'] }.flatten
+        all_assets.select { |asset| asset['name'].include?('IEDriverServer_Win32') }
       end
     end
   end
 end
 
-if ::Selenium::WebDriver::Service.respond_to? :driver_path=
-  ::Selenium::WebDriver::IE::Service.driver_path = proc { ::Webdrivers::IEdriver.update }
-else
-  # v3.141.0 and lower
-  module Selenium
-    module WebDriver
-      module IE
-        def self.driver_path
-          @driver_path ||= Webdrivers::IEdriver.update
-        end
-      end
-    end
-  end
-end
+::Selenium::WebDriver::IE::Service.driver_path = proc { ::Webdrivers::IEdriver.update }

data/lib/webdrivers/logger.rb

@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
-require 'forwardable'
-require 'logger'
-
-# Code adapted from Selenium Implementation
-# https://github.com/SeleniumHQ/selenium/blob/master/rb/lib/selenium/webdriver/common/logger.rb
-
 module Webdrivers
   #
   # @example Enable full logging
@@ -18,94 +12,9 @@ module Webdrivers
   #   Webdrivers.logger.info('This is info message')
   #   Webdrivers.logger.warn('This is warning message')
   #
-  class Logger
-    extend Forwardable
-    include ::Logger::Severity
-
-    def_delegators :@logger, :debug, :debug?,
-                   :info, :info?,
-                   :warn, :warn?,
-                   :error, :error?,
-                   :fatal, :fatal?,
-                   :level
-
+  class Logger < Selenium::WebDriver::Logger
     def initialize
-      @logger = create_logger($stdout)
-    end
-
-    def output=(io)
-      # `Logger#reopen` was added in Ruby 2.3
-      if @logger.respond_to?(:reopen)
-        @logger.reopen(io)
-      else
-        @logger = create_logger(io)
-      end
-    end
-
-    #
-    # For Ruby < 2.3 compatibility
-    # Based on https://github.com/ruby/ruby/blob/ruby_2_3/lib/logger.rb#L250
-    #
-
-    def level=(severity)
-      if severity.is_a?(Integer)
-        @logger.level = severity
-      else
-        case severity.to_s.downcase
-        when 'debug'
-          @logger.level = DEBUG
-        when 'info'
-          @logger.level = INFO
-        when 'warn'
-          @logger.level = WARN
-        when 'error'
-          @logger.level = ERROR
-        when 'fatal'
-          @logger.level = FATAL
-        when 'unknown'
-          @logger.level = UNKNOWN
-        else
-          raise ArgumentError, "invalid log level: #{severity}"
-        end
-      end
-    end
-
-    #
-    # Returns IO object used by logger internally.
-    #
-    # Normally, we would have never needed it, but we want to
-    # use it as IO object for all child processes to ensure their
-    # output is redirected there.
-    #
-    # It is only used in debug level, in other cases output is suppressed.
-    #
-    # @api private
-    #
-    def io
-      @logger.instance_variable_get(:@logdev).instance_variable_get(:@dev)
-    end
-
-    #
-    # Marks code as deprecated with replacement.
-    #
-    # @param [String] old
-    # @param [String] new
-    #
-    def deprecate(old, new)
-      warn "[DEPRECATION] #{old} is deprecated. Use #{new} instead."
-    end
-
-    private
-
-    def create_logger(output)
-      logger = ::Logger.new(output)
-      logger.progname = 'Webdrivers'
-      logger.level = ($DEBUG ? DEBUG : WARN)
-      logger.formatter = proc do |severity, time, progname, msg|
-        "#{time.strftime('%F %T')} #{severity} #{progname} #{msg}\n"
-      end
-
-      logger
+      super('Webdrivers')
     end
   end
 end

data/lib/webdrivers/railtie.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'webdrivers'
 require 'rails'
 
 module Webdrivers

data/lib/webdrivers/system.rb

@@ -127,8 +127,7 @@ module Webdrivers
         Webdrivers.logger.debug "Decompressing #{filename}"
 
         Zip::File.open(filename) do |zip_file|
-          driver = zip_file.get_entry(driver_name)
-          f_path = File.join(Dir.pwd, driver.name)
+          driver, f_path = driver_and_path(zip_file, driver_name)
           delete(f_path)
           FileUtils.mkdir_p(File.dirname(f_path)) unless File.exist?(File.dirname(f_path))
           zip_file.extract(driver, f_path)
@@ -136,6 +135,18 @@ module Webdrivers
         driver_name
       end
 
+      def driver_and_path(zip_file, driver_name)
+        driver = zip_file.get_entry(driver_name)
+        f_path = File.join(Dir.pwd, driver.name)
+
+        [driver, f_path]
+      rescue Errno::ENOENT
+        driver = zip_file.entries.find { |e| File.basename(e.name) == driver_name }
+        f_path = File.join(Dir.pwd, File.basename(driver.name))
+
+        [driver, f_path]
+      end
+
       def platform
         if Selenium::WebDriver::Platform.linux?
           'linux'

data/lib/webdrivers/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Webdrivers
-  VERSION = '4.6.0'
+  VERSION = '5.3.0'
 end

data/spec/webdrivers/chromedriver_spec.rb

@@ -65,8 +65,9 @@ describe Webdrivers::Chromedriver do
       it 'raises ConnectionError when offline, and no binary exists' do
         allow(Net::HTTP).to receive(:get_response).and_raise(SocketError)
         allow(chromedriver).to receive(:exists?).and_return(false)
+        allow(Webdrivers::ChromeFinder).to receive(:version).and_return('115.0.5790.114')
 
-        msg = %r{Can not reach https://chromedriver.storage.googleapis.com}
+        msg = %r{Can not reach https://googlechromelabs.github.io/chrome-for-testing}
         expect { chromedriver.update }.to raise_error(Webdrivers::ConnectionError, msg)
       end
     end
@@ -100,8 +101,9 @@ describe Webdrivers::Chromedriver do
 
       it 'raises ConnectionError if offline' do
         allow(Net::HTTP).to receive(:get_response).and_raise(SocketError)
+        chromedriver.required_version = '115.0.5790.102'
 
-        msg = %r{Can not reach https://chromedriver.storage.googleapis.com/}
+        msg = %r{Can not reach https://googlechromelabs.github.io/chrome-for-testing}
         expect { chromedriver.update }.to raise_error(Webdrivers::ConnectionError, msg)
       end
     end
@@ -135,6 +137,62 @@ describe Webdrivers::Chromedriver do
         expect(chromedriver.current_version.version).to eq('72.0.3626.7')
       end
     end
+
+    context 'when using an Apple machine' do
+      before do
+        allow(Webdrivers::System).to receive(:platform).and_return('mac')
+        allow(Webdrivers::System).to receive(:download)
+      end
+
+      context 'with Intel architecture' do
+        it 'v114 uses correct suffix' do
+          allow(Webdrivers::System).to receive(:apple_m1_architecture?).and_return(false)
+          allow(chromedriver).to receive(:latest_version).and_return(Gem::Version.new('114.0.5735.90'))
+          chromedriver.required_version = nil
+
+          chromedriver.update
+          expect(Webdrivers::System).to have_received(:download).with(end_with('_mac64.zip'), anything)
+        end
+
+        it 'v115 uses correct suffix' do
+          allow(Webdrivers::System).to receive(:apple_m1_architecture?).and_return(false)
+          allow(chromedriver).to receive(:latest_version).and_return(Gem::Version.new('115.0.5790.102'))
+          chromedriver.required_version = nil
+
+          chromedriver.update
+          expect(Webdrivers::System).to have_received(:download).with(end_with('-mac-x64.zip'), anything)
+        end
+      end
+
+      context 'with Apple architecture' do
+        it 'v106.0.5249.61 uses correct suffix' do
+          allow(Webdrivers::System).to receive(:apple_m1_architecture?).and_return(true)
+          allow(chromedriver).to receive(:latest_version).and_return(Gem::Version.new('106.0.5249.61'))
+          chromedriver.required_version = nil
+
+          chromedriver.update
+          expect(Webdrivers::System).to have_received(:download).with(end_with('_arm64.zip'), anything)
+        end
+
+        it 'less than v106.0.5249.61 uses correct suffix' do
+          allow(Webdrivers::System).to receive(:apple_m1_architecture?).and_return(true)
+          allow(chromedriver).to receive(:latest_version).and_return(Gem::Version.new('106.0.5249.21'))
+          chromedriver.required_version = nil
+
+          chromedriver.update
+          expect(Webdrivers::System).to have_received(:download).with(end_with('_mac64_m1.zip'), anything)
+        end
+
+        it 'v115 uses correct suffix' do
+          allow(Webdrivers::System).to receive(:apple_m1_architecture?).and_return(true)
+          allow(chromedriver).to receive(:latest_version).and_return(Gem::Version.new('115.0.5790.102'))
+          chromedriver.required_version = nil
+
+          chromedriver.update
+          expect(Webdrivers::System).to have_received(:download).with(end_with('-mac-arm64.zip'), anything)
+        end
+      end
+    end
   end
 
   describe '#current_version' do
@@ -168,11 +226,11 @@ describe Webdrivers::Chromedriver do
     end
 
     it 'raises VersionError for beta version' do
-      allow(chromedriver).to receive(:browser_version).and_return Gem::Version.new('100.0.0')
-      msg = 'Unable to find latest point release version for 100.0.0. '\
+      allow(chromedriver).to receive(:browser_version).and_return Gem::Version.new('999.0.0')
+      msg = 'Unable to find latest point release version for 999.0.0. '\
 'You appear to be using a non-production version of Chrome. '\
 'Please set `Webdrivers::Chromedriver.required_version = <desired driver version>` '\
-'to a known chromedriver version: https://chromedriver.storage.googleapis.com/index.html'
+'to a known chromedriver version: https://chromedriver.chromium.org/downloads/version-selection'
 
       expect { chromedriver.latest_version }.to raise_exception(Webdrivers::VersionError, msg)
     end
@@ -181,19 +239,21 @@ describe Webdrivers::Chromedriver do
       allow(chromedriver).to receive(:browser_version).and_return Gem::Version.new('72.0.9999.0000')
       msg = 'Unable to find latest point release version for 72.0.9999. '\
 'Please set `Webdrivers::Chromedriver.required_version = <desired driver version>` '\
-'to a known chromedriver version: https://chromedriver.storage.googleapis.com/index.html'
+'to a known chromedriver version: https://chromedriver.chromium.org/downloads/version-selection'
 
       expect { chromedriver.latest_version }.to raise_exception(Webdrivers::VersionError, msg)
     end
 
     it 'raises ConnectionError when offline' do
       allow(Net::HTTP).to receive(:get_response).and_raise(SocketError)
+      allow(Webdrivers::ChromeFinder).to receive(:version).and_return('115.0.5790.114')
 
-      msg = %r{^Can not reach https://chromedriver.storage.googleapis.com}
+      msg = %r{^Can not reach https://googlechromelabs.github.io/chrome-for-testing}
       expect { chromedriver.latest_version }.to raise_error(Webdrivers::ConnectionError, msg)
     end
 
     it 'creates cached file' do
+      allow(chromedriver).to receive(:latest_patch_version).and_return(nil)
       allow(Webdrivers::Network).to receive(:get).and_return('71.0.3578.137')
 
       chromedriver.latest_version
@@ -224,6 +284,17 @@ describe Webdrivers::Chromedriver do
       expect(Webdrivers::Network).to have_received(:get)
       expect(Webdrivers::System).to have_received(:valid_cache?)
     end
+
+    it 'call chrome_for_testing if the browser version is greater than 115' do
+      allow(chromedriver).to receive(:browser_version).and_return Gem::Version.new('115.0.5790.102')
+      allow(Webdrivers::Network).to receive(:get).and_return(
+        {"builds": {'115.0.5790': {"version": '115.0.5790.102'}}}.to_json
+      )
+      uri = URI.join('https://googlechromelabs.github.io', '/chrome-for-testing/latest-patch-versions-per-build.json')
+
+      expect(chromedriver.latest_version).to eq Gem::Version.new('115.0.5790.102')
+      expect(Webdrivers::Network).to have_received(:get).with(uri)
+    end
   end
 
   describe '#required_version=' do

data/spec/webdrivers/edge_finder_spec.rb

@@ -5,11 +5,7 @@ require 'spec_helper'
 describe Webdrivers::EdgeFinder do
   let(:edge_finder) { described_class }
 
-  before(:all) do # rubocop:disable RSpec/BeforeAfterAll
-    if Selenium::WebDriver::VERSION[0].to_i < 4
-      skip "The current selenium-webdriver doesn't include Chromium based Edge support"
-    end
-  end
+  before { skip 'Edge is not yet supported on Linux' if Webdrivers::System.platform == 'linux' }
 
   context 'when the user relies on the gem to figure out the location of Edge' do
     it 'determines the location correctly based on the current OS' do

data/spec/webdrivers/edgedriver_spec.rb

@@ -5,14 +5,10 @@ require 'spec_helper'
 describe Webdrivers::Edgedriver do
   let(:edgedriver) { described_class }
 
-  before(:all) do # rubocop:disable RSpec/BeforeAfterAll
-    if Selenium::WebDriver::VERSION[0].to_i < 4
-      skip "The current selenium-webdriver doesn't include Chromium based Edge support"
-    end
+  before do
+    edgedriver.remove
   end
 
-  before { edgedriver.remove }
-
   describe '#update' do
     context 'when evaluating #correct_binary?' do
       it 'does not download when latest version and current version match' do
@@ -99,6 +95,7 @@ describe Webdrivers::Edgedriver do
       before { allow(edgedriver).to receive(:correct_binary?).and_return(false) }
 
       it 'downloads binary' do
+        allow(Webdrivers::EdgeFinder).to receive(:version).and_return('115.0.1901.188')
         edgedriver.update
 
         expect(edgedriver.current_version).not_to be_nil
@@ -126,19 +123,19 @@ describe Webdrivers::Edgedriver do
 
     context 'when required version is 0' do
       it 'downloads the latest version' do
-        allow(edgedriver).to receive(:latest_version).and_return(Gem::Version.new('77.0.207.0'))
+        allow(edgedriver).to receive(:latest_version).and_return(Gem::Version.new('98.0.1089.1'))
         edgedriver.required_version = 0
         edgedriver.update
-        expect(edgedriver.current_version.version).to eq('77.0.207.0')
+        expect(edgedriver.current_version.version).to eq('98.0.1089.1')
       end
     end
 
     context 'when required version is nil' do
       it 'downloads the latest version' do
-        allow(edgedriver).to receive(:latest_version).and_return(Gem::Version.new('77.0.207.0'))
+        allow(edgedriver).to receive(:latest_version).and_return(Gem::Version.new('98.0.1089.1'))
         edgedriver.required_version = nil
         edgedriver.update
-        expect(edgedriver.current_version.version).to eq('77.0.207.0')
+        expect(edgedriver.current_version.version).to eq('98.0.1089.1')
       end
     end
   end
@@ -168,21 +165,20 @@ describe Webdrivers::Edgedriver do
     end
 
     it 'raises VersionError for beta version' do
-      allow(edgedriver).to receive(:browser_version).and_return Gem::Version.new('100.0.0')
-      msg = 'Unable to find latest point release version for 100.0.0. '\
+      allow(edgedriver).to receive(:browser_version).and_return Gem::Version.new('999.0.0')
+      msg = 'Unable to find latest point release version for 999.0.0. '\
 'You appear to be using a non-production version of Edge. '\
 'Please set `Webdrivers::Edgedriver.required_version = <desired driver version>` '\
-'to a known edgedriver version: Can not reach https://msedgedriver.azureedge.net/'
+'to a known edgedriver version: Can not reach https://msedgedriver.azureedge.net'
 
       expect { edgedriver.latest_version }.to raise_exception(Webdrivers::VersionError, msg)
     end
 
     it 'raises VersionError for unknown version' do
-      skip "MS doesn't yet support point release latest versioning."
-      allow(edgedriver).to receive(:browser_version).and_return('77.0.9999.0000')
+      allow(edgedriver).to receive(:browser_version).and_return Gem::Version.new('77.0.9999')
       msg = 'Unable to find latest point release version for 77.0.9999. '\
 'Please set `Webdrivers::Edgedriver.required_version = <desired driver version>` '\
-'to a known edgedriver version: Can not reach https://msedgedriver.azureedge.net/'
+'to a known edgedriver version: Can not reach https://msedgedriver.azureedge.net'
 
       expect { edgedriver.latest_version }.to raise_exception(Webdrivers::VersionError, msg)
     end
@@ -246,6 +242,7 @@ describe Webdrivers::Edgedriver do
 
   describe '#remove' do
     it 'removes existing edgedriver' do
+      allow(Webdrivers::EdgeFinder).to receive(:version).and_return('115.0.1901.188')
       edgedriver.update
 
       edgedriver.remove

data/spec/webdrivers/geckodriver_spec.rb

@@ -86,12 +86,46 @@ describe Webdrivers::Geckodriver do
       expect(Webdrivers::System).to have_received(:download).with(url, geckodriver.driver_path)
     end
 
-    it 'does something when a wrong version is supplied' do
+    it 'raises error when a wrong version is supplied' do
       geckodriver.required_version = '0.2.0'
 
-      msg = /Net::HTTPServerException: 404 "Not Found"/
+      msg = /404 "Not Found"/
       expect { geckodriver.update }.to raise_error(StandardError, msg)
     end
+
+    context 'when platform is Apple Sillicon' do
+      it 'downloads aarch64 binary' do
+        allow(Webdrivers::System).to receive(:platform).and_return('mac')
+        allow(Webdrivers::System).to receive(:apple_m1_architecture?).and_return(true)
+        base = 'https://github.com/mozilla/geckodriver/releases/download'
+        binary = 'geckodriver-v0.31.0-macos-aarch64.tar.gz'
+        url = "#{base}/v0.31.0/#{binary}"
+
+        allow(Webdrivers::System).to receive(:download).with(url, geckodriver.driver_path)
+
+        geckodriver.required_version = '0.31.0'
+        geckodriver.update
+
+        expect(Webdrivers::System).to have_received(:download).with(url, geckodriver.driver_path)
+      end
+    end
+
+    context 'when platform isn\'t Apple Sillicon' do
+      it 'downloads default binary' do
+        allow(Webdrivers::System).to receive(:platform).and_return('mac')
+        allow(Webdrivers::System).to receive(:apple_m1_architecture?).and_return(false)
+        base = 'https://github.com/mozilla/geckodriver/releases/download'
+        binary = 'geckodriver-v0.31.0-macos.tar.gz'
+        url = "#{base}/v0.31.0/#{binary}"
+
+        allow(Webdrivers::System).to receive(:download).with(url, geckodriver.driver_path)
+
+        geckodriver.required_version = '0.31.0'
+        geckodriver.update
+
+        expect(Webdrivers::System).to have_received(:download).with(url, geckodriver.driver_path)
+      end
+    end
   end
 
   describe '#current_version' do
@@ -192,14 +226,12 @@ You can obtain a copy of the license at https://mozilla.org/MPL/2.0/"
     end
 
     it 'uses provided value' do
-      begin
-        install_dir = File.expand_path(File.join(ENV['HOME'], '.webdrivers2'))
-        Webdrivers.install_dir = install_dir
+      install_dir = File.expand_path(File.join(ENV['HOME'], '.webdrivers2'))
+      Webdrivers.install_dir = install_dir
 
-        expect(Webdrivers::System.install_dir).to eq install_dir
-      ensure
-        Webdrivers.install_dir = nil
-      end
+      expect(Webdrivers::System.install_dir).to eq install_dir
+    ensure
+      Webdrivers.install_dir = nil
     end
   end
 

data/spec/webdrivers/i_edriver_spec.rb

@@ -6,6 +6,10 @@ describe Webdrivers::IEdriver do
   let(:iedriver) { described_class }
 
   before do
+    if ENV['CI'] && !Selenium::WebDriver::Platform.windows?
+      skip('Only run IE tests on Windows on CI because rate limiting')
+    end
+
     iedriver.remove
     iedriver.required_version = nil
   end
@@ -69,7 +73,7 @@ describe Webdrivers::IEdriver do
       it 'raises ConnectionError if offline' do
         allow(Net::HTTP).to receive(:get_response).and_raise(SocketError)
 
-        msg = %r{Can not reach https://selenium-release.storage.googleapis.com/}
+        msg = %r{Can not reach https://api.github.com/repos/seleniumhq/selenium/releases}
         expect { iedriver.update }.to raise_error(Webdrivers::ConnectionError, msg)
       end
     end
@@ -109,7 +113,8 @@ describe Webdrivers::IEdriver do
     end
 
     it 'creates cached file' do
-      allow(Webdrivers::Network).to receive(:get).and_return('3.4.0')
+      json = '[{"assets": [{"name":"IEDriverServer_Win32_3.150.0.zip"}]}]'
+      allow(Webdrivers::Network).to receive(:get).and_return(json)
 
       iedriver.latest_version
       expect(File.exist?("#{Webdrivers::System.install_dir}/IEDriverServer.version")).to eq true
@@ -174,14 +179,12 @@ describe Webdrivers::IEdriver do
     end
 
     it 'uses provided value' do
-      begin
-        install_dir = File.expand_path(File.join(ENV['HOME'], '.webdrivers2'))
-        Webdrivers.install_dir = install_dir
+      install_dir = File.expand_path(File.join(ENV['HOME'], '.webdrivers2'))
+      Webdrivers.install_dir = install_dir
 
-        expect(Webdrivers::System.install_dir).to eq install_dir
-      ensure
-        Webdrivers.install_dir = nil
-      end
+      expect(Webdrivers::System.install_dir).to eq install_dir
+    ensure
+      Webdrivers.install_dir = nil
     end
   end
 

data/spec/webdrivers/webdrivers_spec.rb

@@ -49,37 +49,31 @@ describe Webdrivers do
     end
 
     it 'uses provided value' do
-      begin
-        install_dir                 = File.expand_path(File.join(ENV['HOME'], '.webdrivers2'))
-        described_class.install_dir = install_dir
+      install_dir                 = File.expand_path(File.join(ENV['HOME'], '.webdrivers2'))
+      described_class.install_dir = install_dir
 
-        expect(described_class.install_dir).to eq install_dir
-      ensure
-        described_class.install_dir = nil
-      end
+      expect(described_class.install_dir).to eq install_dir
+    ensure
+      described_class.install_dir = nil
     end
 
     context 'when ENV variable WD_INSTALL_DIR is set and Webdrivers.install_dir is not' do
       it 'uses path from the ENV variable' do
-        begin
-          described_class.install_dir = nil
-          allow(ENV).to receive(:[]).with('WD_INSTALL_DIR').and_return('custom_dir')
-          expect(described_class.install_dir).to be('custom_dir')
-        ensure
-          described_class.install_dir = nil
-        end
+        described_class.install_dir = nil
+        allow(ENV).to receive(:[]).with('WD_INSTALL_DIR').and_return('custom_dir')
+        expect(described_class.install_dir).to be('custom_dir')
+      ensure
+        described_class.install_dir = nil
       end
     end
 
     context 'when both ENV variable WD_INSTALL_DIR and Webdrivers.install_dir are set' do
       it 'uses path from Webdrivers.install_dir' do
-        begin
-          described_class.install_dir = 'my_install_dir_path'
-          allow(ENV).to receive(:[]).with('WD_INSTALL_DIR').and_return('my_env_path')
-          expect(described_class.install_dir).to be('my_install_dir_path')
-        ensure
-          described_class.install_dir = nil
-        end
+        described_class.install_dir = 'my_install_dir_path'
+        allow(ENV).to receive(:[]).with('WD_INSTALL_DIR').and_return('my_env_path')
+        expect(described_class.install_dir).to be('my_install_dir_path')
+      ensure
+        described_class.install_dir = nil
       end
     end
   end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: webdrivers
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 5.3.0
 platform: ruby
 authors:
 - Titus Fortner
 - Lakshya Kapoor
 - Thomas Walpole
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-26 00:00:00.000000000 Z
+date: 2023-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -156,22 +156,22 @@ dependencies:
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.11'
 description: Run Selenium tests more easily with install and updates for all supported
   webdrivers.
 email:
@@ -218,9 +218,9 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/titusfortner/webdrivers/issues
   changelog_uri: https://github.com/titusfortner/webdrivers/blob/master/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/webdrivers/4.6.0
-  source_code_uri: https://github.com/titusfortner/webdrivers/tree/v4.6.0
-post_install_message: 
+  documentation_uri: https://www.rubydoc.info/gems/webdrivers/5.3.0
+  source_code_uri: https://github.com/titusfortner/webdrivers/tree/v5.3.0
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -228,25 +228,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: Easy download and use of browser drivers.
 test_files:
 - spec/spec_helper.rb
 - spec/webdrivers/chrome_finder_spec.rb
+- spec/webdrivers/chromedriver_spec.rb
 - spec/webdrivers/edge_finder_spec.rb
-- spec/webdrivers/webdrivers_spec.rb
-- spec/webdrivers/system_spec.rb
 - spec/webdrivers/edgedriver_spec.rb
-- spec/webdrivers/i_edriver_spec.rb
 - spec/webdrivers/geckodriver_spec.rb
-- spec/webdrivers/chromedriver_spec.rb
+- spec/webdrivers/i_edriver_spec.rb
+- spec/webdrivers/system_spec.rb
+- spec/webdrivers/webdrivers_spec.rb
 - spec/webdrivers_proxy_support_spec.rb