webdrivers 4.1.2 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cd7ebf2f29727575042cf40f562078368874a966f32185894fccc870846eae4
-  data.tar.gz: b11fabe9de1ba71cf72eac2cd3144a2564aa898a730a44a75195b380ee87d2d5
+  metadata.gz: f4c9d9a6544732e58eb7a88d34e39b188b5ff658caaa14fbdff15931a69d1e2d
+  data.tar.gz: 92a4997e99508bb79374838461cd2fee48591185b271dd6ce170628c51a02c2c
 SHA512:
-  metadata.gz: edd6426c60e37b35655b9170321bd7c66d5fb1992ce1f2e9038a7fb75793b4d2270792c876b7a165ce7411330ddc35b63c33e274a9a836e1e4d073c4bf80887d
-  data.tar.gz: 356ec146930fcd79c1ad9a8b6fe9c0d0f78552a5ad90d07809723e4c9c3ce1b3328824e8583e8cae732b3a1c47c3e08697a72af707ab09fbb0f88ed926f669d1
+  metadata.gz: fb469a584a66b14097ec87b6a8f2ad30e2cbefdaeef91efd2a50f16ff0451c8a748f8607d53d06ceed3506d61e54ef31b9997e068f9e55dfe9136f8012570234
+  data.tar.gz: ed61ff78edd17f205673242eeba0fa76dcb2df9675a7d8dc4c813e8dd056799a44b13c1a10b238eeb36bae96cc188ca20c4edd71aebf9ec48e9a78e613136f17

data/CHANGELOG.md

@@ -1,3 +1,67 @@
+# 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))
+
+# 4.5.0 (2021-01-19)
+* Improve format of README usage section. Thanks, [okuramasafumi](https://github.com/okuramasafumi)!
+* `chromedriver` - Add support for Apple M1 specific builds ([#193](https://github.com/titusfortner/webdrivers/pull/193)). Thanks, [MichaelHoste](https://github.com/MichaelHoste)!
+* `msedgedriver` - Add support for Apple M1 specific builds.
+* `msedgedriver` - Added automatic selection of 32-bit vs 64-bit builds on Windows and WSLv1.  
+* When using this gem in WSLv2, Chrome installed on the Linux filesystem will be automatically used ([#196](https://github.com/titusfortner/webdrivers/pull/196)). 
+  WSLv1 continues to automatically use Chrome from the Windows filesystem though. Thanks, [fabioxgn](https://github.com/fabioxgn)!
+  * We'll aim to make the behavior consistent in a future release.
+
+### 4.4.2 (2020-12-29)
+* Use new powershell if available to enhance WSL support ([#176](https://github.com/titusfortner/webdrivers/issues/176), 
+  [#186](https://github.com/titusfortner/webdrivers/pull/186)). Thanks, [G-Rath](https://github.com/G-Rath) and 
+  [131](https://github.com/131)!
+* Update rubocop version (development dependency only) ([#178](https://github.com/titusfortner/webdrivers/pull/178)).
+  Thanks, [utkarsh2102](https://github.com/utkarsh2102)!
+* Replace `git ls-files` with `dir` in the gemspec for better Debian support ([#179](https://github.com/titusfortner/webdrivers/pull/179),
+  [#184](https://github.com/titusfortner/webdrivers/issues/184)).
+  Thanks again, [utkarsh2102](https://github.com/utkarsh2102)!
+* Update README with `require: false` when adding gem to Gemfile ([#183](https://github.com/titusfortner/webdrivers/pull/183)).
+* Make WSL detection more generic ([#187](https://github.com/titusfortner/webdrivers/pull/187)).
+  [rbclark](https://github.com/rbclark)!
+  
+### 4.4.1 (2020-06-01)
+* Do not include binstubs used for troubleshooting only. Fixes [#174](https://github.com/titusfortner/webdrivers/issues/174).
+
+### 4.4.0 (2020-05-31)
+* Implement support for `chromedriver` in Windows Subsystem for Linux (WSL) v1 ([#172](https://github.com/titusfortner/webdrivers/issues/172)). 
+  Thanks, [G-Rath](https://github.com/G-Rath)!
+* Chrome/Edgedriver - Fix [#171](https://github.com/titusfortner/webdrivers/issues/171) by making sure the cached
+driver build version matches the browser build version before using it.
+* Chrome/Edgedriver - Driver version check now matches the driver and browser `major.minor.build` versions instead of just 
+the major version to be fully compliant with the `chromedriver` version selection
+[document](https://chromedriver.chromium.org/downloads/version-selection).
+
+### 4.3.0 (2020-04-14)
+* Add support for Microsoft Edge (Chromium) stable
+* Drop support for Ruby < 2.4.0
+
+### 4.2.0 (2019-12-27)
+* Add support for Microsoft Edge (Chromium) Beta releases ([#155](https://github.com/titusfortner/webdrivers/pull/155))
+* Use tilde expansion to resolve user's home directory ([#166](https://github.com/titusfortner/webdrivers/pull/161))
+* Add support for Chromium installed using Snap on Ubuntu ([#163](https://github.com/titusfortner/webdrivers/pull/163)). Thanks Tietew!
+
+### 4.1.3 (2019-10-07)
+* Require rubyzip version 1.3.0 or higher to fix [rubyzip#403](https://github.com/rubyzip/rubyzip/pull/403). Thanks rhymes! ([#153](https://github.com/titusfortner/webdrivers/pull/153))
+* Fix a bug where the file deletion confirmation was printed even when there were no files to delete.
+
 ### 4.1.2 (2019-07-29)
 * Fix a bug related to raising `BrowserNotFound`.
 

data/README.md

@@ -1,8 +1,7 @@
 # Webdrivers
 
 [![Gem Version](https://badge.fury.io/rb/webdrivers.svg)](https://badge.fury.io/rb/webdrivers)
-[![Build status](https://travis-ci.org/titusfortner/webdrivers.svg?branch=master)](https://travis-ci.org/titusfortner/webdrivers)
-[![AppVeyor status](https://ci.appveyor.com/api/projects/status/ejh90xqbvkphq4cy/branch/master?svg=true)](https://ci.appveyor.com/project/titusfortner/webdrivers/branch/master)
+![Tests](https://github.com/titusfortner/webdrivers/workflows/Tests/badge.svg)
 
 Run Selenium tests more easily with automatic installation and updates for all supported webdrivers.
 
@@ -13,13 +12,18 @@ Run Selenium tests more easily with automatic installation and updates for all s
 * [chromedriver](http://chromedriver.chromium.org/)
 * [geckodriver](https://github.com/mozilla/geckodriver)
 * [IEDriverServer](https://github.com/SeleniumHQ/selenium/wiki/InternetExplorerDriver)
-* [msedgedriver](https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver/)  - Dev and Canary releases on Windows and macOS only
+* [msedgedriver](https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver/)
+
+Works on macOS, Linux, Windows, and Windows Subsystem for Linux (WSL) v1 and v2. And do see the browser and OS specific
+notes at the bottom.
 
 ## Usage
 
 In your Gemfile:
 
-`gem 'webdrivers', '~> 4.0'`
+```ruby
+gem 'webdrivers', '~> 5.0', require: false
+```
 
 In your project:
 
@@ -68,7 +72,7 @@ Webdrivers::Geckodriver.required_version  = '0.23.0'
 Webdrivers::IEdriver.required_version     = '3.14.0'
 
 # Edge (Chromium)
-Webdrivers::Edgedriver.required_version     = '76.0.183.0'
+Webdrivers::Edgedriver.required_version   = '76.0.183.0'
 ```
 
 You can explicitly trigger the update in your code, but this will happen
@@ -92,10 +96,10 @@ variable. **Only set one to avoid confusion**.
 
 ##### Special exception for chromedriver and msedgedriver
 
-Cache time will be respected as long as a driver binary exists and the major versions of
-the browser and the driver match. For example, if you update Chrome or Edge to v76 and its driver is
-still at v75, `webdrivers` will ignore the cache time and update the driver to make sure you're
-using a compatible version.
+Cache time will be respected as long as a driver binary exists and the major.minor.build versions of
+the browser and the driver match. For example, if you update Chrome or Edge to v76.0.123 and its driver is
+still at v76.0.100, `webdrivers` will ignore the cache time and update the driver to make sure you're
+using a compatible build version.
 
 ### Proxy
 
@@ -192,7 +196,7 @@ The logging level can be configured for debugging purpose:
 Webdrivers.logger.level = :DEBUG
 ```
 
-### Browser Specific Notes
+### Browser & OS Specific Notes
 
 #### Chrome/Chromium
 
@@ -217,7 +221,7 @@ variable.
 This is also required if Google Chrome is not installed in its
 [default location](https://github.com/SeleniumHQ/selenium/wiki/ChromeDriver).
 
-##### Heroku Users
+#### Chrome on Heroku
 
 Follow the specific instructions [here](https://github.com/titusfortner/webdrivers/wiki/Heroku-buildpack-google-chrome) if you're using `heroku-buildpack-google-chrome`.
 
@@ -229,6 +233,27 @@ section apply to this browser as well.
 
 Please note that `msedgedriver` requires `selenium-webdriver` v4.
 
+#### WSLv1 support
+
+While WSLv1 is not designed to run headful applications like Chrome, it can run exes; as such when found to be running
+in WSL, `webdrivers` will use Chrome on the Windows filesystem.
+
+It's recommended that you install the new PowerShell (PS7) to avoid [a known issue](https://github.com/microsoft/terminal/issues/367)
+with the console font being changed when calling the old PowerShell (PS5).
+
+#### WSLv2 support
+
+Webdrivers will detect WSLv2 as running on Linux and use Chrome on the Linux filesystem.
+
+WSLv2 doesn't support connecting to host ports out of the box, so it isn't possible to connect to Chromedriver on
+Windows without extra configurations, see: https://github.com/microsoft/WSL/issues/4619. The simplest way to use 
+Chromedriver with WSLv2 is to run Chrome headless on Linux.
+
+#### Chrome and Edge on Apple M1 (`arm64`)
+
+If you're switching from Intel to M1, you'll have to manually delete the existing Intel (`mac64`) driver before the 
+M1 (`arm64`) build can be downloaded. Otherwise, you'll get an error: `Bad CPU type in executable - ~/.webdrivers/chromedriver (Errno::E086)`
+
 ## Wiki
 
 Please see the [wiki](https://github.com/titusfortner/webdrivers/wiki)

data/lib/webdrivers/chrome_finder.rb

@@ -50,6 +50,28 @@ module Webdrivers
         nil
       end
 
+      def wsl_location
+        _, drive, user = ENV['PATH'].match(%r{/([a-z])/Users/([^/:]+)/AppData/}).to_a
+
+        roots = [
+          "#{drive}:\\Users\\#{user}\\AppData\\Local",
+          "#{drive}:\\Program Files (x86)",
+          "#{drive}:\\Program Files"
+        ]
+
+        directories = %w[Google\\Chrome\\Application Chromium\\Application]
+        file = 'chrome.exe'
+
+        directories.each do |dir|
+          roots.each do |root|
+            option = System.to_wsl_path("#{root}\\#{dir}\\#{file}")
+            return option if File.exist?(option)
+          end
+        end
+
+        nil
+      end
+
       def mac_location
         directories = ['', File.expand_path('~')]
         files = ['/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
@@ -66,7 +88,9 @@ module Webdrivers
       end
 
       def linux_location
-        directories = %w[/usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin /opt/google/chrome]
+        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]
         files = %w[google-chrome chrome chromium chromium-browser]
 
         directories.each do |dir|
@@ -80,10 +104,18 @@ module Webdrivers
       end
 
       def win_version(location)
-        System.call("powershell (Get-ItemProperty '#{location}').VersionInfo.ProductVersion")&.strip
+        System.call("pwsh.exe -command \"(Get-ItemProperty '#{location}').VersionInfo.ProductVersion\"")&.strip
+      rescue StandardError
+        System.call("powershell.exe \"(Get-ItemProperty '#{location}').VersionInfo.ProductVersion\"")&.strip
+      end
+
+      def wsl_version(location)
+        win_version(System.to_win32_path(location))
       end
 
       def linux_version(location)
+        return wsl_version(location) if System.wsl_v1?
+
         System.call(location, '--product-version')&.strip
       end
 

data/lib/webdrivers/chromedriver.rb

@@ -29,9 +29,14 @@ module Webdrivers
       def latest_version
         @latest_version ||= begin
           # Versions before 70 do not have a LATEST_RELEASE file
-          return normalize_version('2.41') if release_version < normalize_version('70')
+          return normalize_version('2.41') if browser_build_version < normalize_version('70')
 
-          latest_applicable = with_cache(file_name) { latest_point_release(release_version) }
+          # Cache check
+          # Cached version should exist and be compatible with the current browser version.
+          # Otherwise, fetch the latest compatible driver.
+          latest_applicable = with_cache(file_name,
+                                         current_build_version,
+                                         browser_build_version) { latest_point_release(browser_build_version) }
 
           Webdrivers.logger.debug "Latest version available: #{latest_applicable}"
           normalize_version(latest_applicable)
@@ -68,64 +73,77 @@ module Webdrivers
           else
             msg
           end
-              rescue NetworkError
-                "#{msg} A network issue is preventing determination of latest chromedriver release."
+        rescue NetworkError
+          "#{msg} A network issue is preventing determination of latest chromedriver release."
         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.storage.googleapis.com/index.html'
         Webdrivers.logger.debug msg
         raise VersionError, msg
       end
 
       def file_name
-        System.platform == 'win' ? 'chromedriver.exe' : 'chromedriver'
+        System.platform == 'win' || System.wsl_v1? ? 'chromedriver.exe' : 'chromedriver'
       end
 
-      def download_url
-        return @download_url if @download_url
+      def apple_m1_compatible?(driver_version)
+        if System.apple_m1_architecture? && driver_version >= normalize_version('87.0.4280.88')
+          Webdrivers.logger.debug 'chromedriver version is Apple M1 compatible.'
+          return true
+        end
+
+        Webdrivers.logger.debug 'chromedriver version is NOT Apple M1 compatible. Required >= 87.0.4280.88'
+        false
+      end
 
-        version = if required_version == EMPTY_VERSION
-                    latest_version
-                  else
-                    normalize_version(required_version)
-                  end
+      def direct_url(driver_version)
+        "#{base_url}/#{driver_version}/chromedriver_#{driver_filename(driver_version)}.zip"
+      end
 
-        file_name = System.platform == 'win' ? 'win32' : "#{System.platform}64"
-        url = "#{base_url}/#{version}/chromedriver_#{file_name}.zip"
-        Webdrivers.logger.debug "chromedriver URL: #{url}"
-        @download_url = url
+      def driver_filename(driver_version)
+        if System.platform == 'win' || System.wsl_v1?
+          'win32'
+        elsif System.platform == 'linux'
+          'linux64'
+        elsif System.platform == 'mac'
+          apple_arch = apple_m1_compatible?(driver_version) ? '_m1' : ''
+          "mac64#{apple_arch}"
+        else
+          raise 'Failed to determine driver filename to download for your OS.'
+        end
       end
 
-      # Returns release version from the currently installed Chrome version
+      # Returns major.minor.build version from the currently installed chromedriver version
       #
       # @example
-      #   73.0.3683.75 -> 73.0.3683
-      def release_version
-        chrome = normalize_version(browser_version)
-        normalize_version(chrome.segments[0..2].join('.'))
+      #   73.0.3683.68 (major.minor.build.patch) -> 73.0.3683 (major.minor.build)
+      def current_build_version
+        build_ver = if current_version.nil? # Driver not found
+                      nil
+                    else
+                      current_version.segments[0..2].join('.')
+                    end
+        normalize_version(build_ver)
       end
 
+      # Returns major.minor.build version from the currently installed Chrome version
+      #
+      # @example
+      #   73.0.3683.75 (major.minor.build.patch) -> 73.0.3683 (major.minor.build)
+      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
+      # and its build version matches the browser build version
       def sufficient_binary?
         super && current_version && (current_version < normalize_version('70.0.3538') ||
-            current_version.segments.first == release_version.segments.first)
+          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
-      end
-    end
-  end
-end
+::Selenium::WebDriver::Chrome::Service.driver_path = proc { ::Webdrivers::Chromedriver.update }

data/lib/webdrivers/common.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
 require 'rubygems/package'
-require 'zip'
-require 'webdrivers/logger'
 require 'webdrivers/network'
 require 'webdrivers/system'
 require 'selenium-webdriver'
+require 'webdrivers/logger'
 require 'webdrivers/version'
 
 module Webdrivers
@@ -22,7 +21,7 @@ module Webdrivers
   end
 
   DEFAULT_CACHE_TIME = 86_400 # 24 hours
-  DEFAULT_INSTALL_DIR = File.expand_path(File.join(ENV['HOME'], '.webdrivers'))
+  DEFAULT_INSTALL_DIR = File.expand_path('~/.webdrivers')
 
   class << self
     attr_accessor :proxy_addr, :proxy_port, :proxy_user, :proxy_pass
@@ -119,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?
@@ -132,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
@@ -158,9 +153,15 @@ module Webdrivers
         nil
       end
 
-      def with_cache(file_name)
-        if System.valid_cache?(file_name)
-          normalize_version System.cached_version(file_name)
+      # Returns cached driver version if cache is still valid and the driver binary exists.
+      # Otherwise caches the given version (typically the latest available)
+      # In case of Chrome, it also verifies that the driver build and browser build versions are compatible.
+      # Example usage: lib/webdrivers/chromedriver.rb:34
+      def with_cache(file_name, driver_build = nil, browser_build = nil)
+        if System.valid_cache?(file_name) && exists? && (driver_build == browser_build)
+          cached_version = System.cached_version(file_name)
+          Webdrivers.logger.debug "using cached version as latest: #{cached_version}"
+          normalize_version cached_version
         else
           version = yield
           System.cache_version(file_name, version)

data/lib/webdrivers/edge_finder.rb

@@ -24,20 +24,23 @@ module Webdrivers
       private
 
       def user_defined_location
-        if Selenium::WebDriver::EdgeChrome.path
-          Webdrivers.logger.debug "Selenium::WebDriver::EdgeChrome.path: #{Selenium::WebDriver::EdgeChrome.path}"
-          return Selenium::WebDriver::EdgeChrome.path
+        if Selenium::WebDriver::Edge.path
+          Webdrivers.logger.debug "Selenium::WebDriver::Edge.path: #{Selenium::WebDriver::Edge.path}"
+          return Selenium::WebDriver::Edge.path
         end
 
-        return if ENV['WD_EDGE_CHROME_PATH'].nil?
+        return if ENV['WD_EDGE_PATH'].nil?
 
-        Webdrivers.logger.debug "WD_EDGE_CHROME_PATH: #{ENV['WD_EDGE_CHROME_PATH']}"
-        ENV['WD_EDGE_CHROME_PATH']
+        Webdrivers.logger.debug "WD_EDGE_PATH: #{ENV['WD_EDGE_PATH']}"
+        ENV['WD_EDGE_PATH']
       end
 
       def win_location
         envs = %w[LOCALAPPDATA PROGRAMFILES PROGRAMFILES(X86)]
-        directories = ['\\Microsoft\\Edge Dev\\Application', '\\Microsoft\\Edge SxS\\Application']
+        directories = ['\\Microsoft\\Edge\\Application',
+                       '\\Microsoft\\Edge Beta\\Application',
+                       '\\Microsoft\\Edge Dev\\Application',
+                       '\\Microsoft\\Edge SxS\\Application']
         file = 'msedge.exe'
 
         directories.each do |dir|
@@ -52,6 +55,7 @@ module Webdrivers
       def mac_location
         directories = ['', File.expand_path('~')]
         files = ['/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge',
+                 '/Applications/Microsoft Edge Beta.app/Contents/MacOS/Microsoft Edge Beta',
                  '/Applications/Microsoft Edge Dev.app/Contents/MacOS/Microsoft Edge Dev',
                  '/Applications/Microsoft Edge Canary.app/Contents/MacOS/Microsoft Edge Canary']
 
@@ -65,6 +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'
       end
 

data/lib/webdrivers/edgedriver.rb

@@ -26,10 +26,6 @@ module Webdrivers
         'https://msedgedriver.azureedge.net/'
       end
 
-      def remove
-        super
-      end
-
       private
 
       def latest_point_release(version)
@@ -58,8 +54,8 @@ module Webdrivers
           else
             msg
           end
-              rescue NetworkError
-                "#{msg} A network issue is preventing determination of latest msedgedriver release."
+        rescue NetworkError
+          "#{msg} A network issue is preventing determination of latest msedgedriver release."
         end
 
         "#{msg} Please set `Webdrivers::Edgedriver.required_version = <desired driver version>` "\
@@ -70,37 +66,39 @@ module Webdrivers
         System.platform == 'win' ? 'msedgedriver.exe' : 'msedgedriver'
       end
 
-      def download_url
-        return @download_url if @download_url
+      def apple_m1_compatible?(driver_version)
+        if System.apple_m1_architecture? && driver_version >= normalize_version('87.0.669.0')
+          Webdrivers.logger.debug 'msedgedriver version is Apple M1 compatible.'
+          return true
+        end
 
-        version = if required_version == EMPTY_VERSION
-                    latest_version
-                  else
-                    normalize_version(required_version)
-                  end
+        Webdrivers.logger.debug 'msedgedriver version is NOT Apple M1 compatible. Required >= 87.0.669.0'
+        false
+      end
 
-        file_name = System.platform == 'win' ? 'win32' : "#{System.platform}64"
-        url = "#{base_url}/#{version}/edgedriver_#{file_name}.zip"
-        Webdrivers.logger.debug "msedgedriver URL: #{url}"
-        @download_url = url
+      def linux_compatible?(driver_version)
+        System.platform == 'linux' && driver_version >= normalize_version('89.0.731.0')
       end
-    end
-  end
-end
 
-if defined? Selenium::WebDriver::EdgeChrome
-  if ::Selenium::WebDriver::Service.respond_to? :driver_path=
-    ::Selenium::WebDriver::EdgeChrome::Service.driver_path = proc { ::Webdrivers::Edgedriver.update }
-  else
-    # v3.141.0 and lower
-    module Selenium
-      module WebDriver
-        module EdgeChrome
-          def self.driver_path
-            @driver_path ||= Webdrivers::Edgedriver.update
-          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 == 'mac'
+          # Determine M1 or Intel architecture
+          apple_arch = apple_m1_compatible?(driver_version) ? 'arm' : 'mac'
+          "#{apple_arch}64"
+        else
+          raise 'Failed to determine driver filename to download for your OS.'
         end
       end
+
+      def direct_url(driver_version)
+        "#{base_url}/#{driver_version}/edgedriver_#{driver_filename(driver_version)}.zip"
+      end
     end
   end
 end
+
+::Selenium::WebDriver::Edge::Service.driver_path = proc { ::Webdrivers::Edgedriver.update }

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
@@ -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 }