webdrivers 4.4.1 → 4.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 478610897cf82cc6520b2501b70eddfc75a6cb000d95ec8a451acff865956913
-  data.tar.gz: ff8db96ce6a0c80df2e12354ace821f755272b385b76b0fa8f60819312132e53
+  metadata.gz: 543fb2ae13f36325fe5fc7cfd8a4c890e27d3eabdb239abbe2d816e656db9bda
+  data.tar.gz: f2cf830140dde3e9127e556cf46357fa6538b40425636dce02aa020000df8282
 SHA512:
-  metadata.gz: f56a8c5f61d30f1beccf5a2094f32069fe6b7c5ace48b3f626f53ea67da172113e6324c3616337637843cdab103c9c7b3a87d15982943444cf596c79194dc977
-  data.tar.gz: d461bec3bfaa089881e002f63c10e939cbcdfbc6edace671eb3a4bcfecc82f34298dc60d76a22363d48d3cf6f547e124f140fcbfc158e9e14eae6b3743f3e443
+  metadata.gz: 5dfa4804f4ec0342dd24df0ecbdddf8d2456e12037e73e72efc88b11b0e4c355159ab5bb818309195ab09c90fcf4a09ede79344b955763ca74c381b6d0cb378c
+  data.tar.gz: d5e802872d42a2a8929421872563457263f610cb2f536acded38d28b03ff8986f13094bd0efbdd32223d541cd1245425f57937de7ea262849985c80409f7c89f

data/CHANGELOG.md

@@ -1,8 +1,37 @@
+# 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!
+* 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 

data/LICENSE.txt

@@ -1,23 +1,23 @@
-(The MIT License)
-
-Copyright (c) 2017-2019: Titus Fortner
-Copyright (c) 2019: 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
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+(The MIT License)
+
+Copyright (c) 2017-2019: Titus Fortner
+Copyright (c) 2019: 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
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

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.
 
@@ -15,13 +14,16 @@ Run Selenium tests more easily with automatic installation and updates for all s
 * [IEDriverServer](https://github.com/SeleniumHQ/selenium/wiki/InternetExplorerDriver)
 * [msedgedriver](https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver/)
 
-Works on macOS, Linux, Windows, and Windows Subsystem for Linux (WSL) v1.
+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', '~> 4.0', require: false
+```
 
 In your project:
 
@@ -194,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
 
@@ -219,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`.
 
@@ -231,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

@@ -88,7 +88,7 @@ module Webdrivers
       end
 
       def linux_location
-        return wsl_location if System.wsl?
+        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]
@@ -104,6 +104,8 @@ module Webdrivers
       end
 
       def win_version(location)
+        System.call("pwsh.exe -command \"(Get-ItemProperty '#{location}').VersionInfo.ProductVersion\"")&.strip
+      rescue StandardError
         System.call("powershell.exe \"(Get-ItemProperty '#{location}').VersionInfo.ProductVersion\"")&.strip
       end
 
@@ -112,7 +114,7 @@ module Webdrivers
       end
 
       def linux_version(location)
-        return wsl_version(location) if System.wsl?
+        return wsl_version(location) if System.wsl_v1?
 
         System.call(location, '--product-version')&.strip
       end

data/lib/webdrivers/chromedriver.rb

@@ -73,36 +73,57 @@ 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' || System.wsl? ? 'chromedriver.exe' : 'chromedriver'
+        System.platform == 'win' || System.wsl_v1? ? 'chromedriver.exe' : 'chromedriver'
+      end
+
+      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
 
       def download_url
         return @download_url if @download_url
 
-        version = if required_version == EMPTY_VERSION
-                    latest_version
-                  else
-                    normalize_version(required_version)
-                  end
-
-        file_name = System.platform == 'win' || System.wsl? ? 'win32' : "#{System.platform}64"
-        url = "#{base_url}/#{version}/chromedriver_#{file_name}.zip"
+        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
       end
 
+      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 major.minor.build version from the currently installed chromedriver version
       #
       # @example

data/lib/webdrivers/edge_finder.rb

@@ -24,15 +24,15 @@ 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
@@ -69,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,17 +66,44 @@ module Webdrivers
         System.platform == 'win' ? 'msedgedriver.exe' : 'msedgedriver'
       end
 
+      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
+
+        Webdrivers.logger.debug 'msedgedriver version is NOT Apple M1 compatible. Required >= 87.0.669.0'
+        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 == '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 download_url
         return @download_url if @download_url
 
-        version = if required_version == EMPTY_VERSION
-                    latest_version
-                  else
-                    normalize_version(required_version)
-                  end
-
-        file_name = System.platform == 'win' ? 'win32' : "#{System.platform}64"
-        url = "#{base_url}/#{version}/edgedriver_#{file_name}.zip"
+        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
       end
@@ -88,19 +111,4 @@ module Webdrivers
   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
-        end
-      end
-    end
-  end
-end
+::Selenium::WebDriver::Edge::Service.driver_path = proc { ::Webdrivers::Edgedriver.update }

data/lib/webdrivers/iedriver.rb

@@ -44,16 +44,19 @@ module Webdrivers
       end
 
       def downloads
-        doc = Nokogiri::XML.parse(Network.get(base_url))
-        items = doc.css('Key').collect(&:text)
-        items.select! { |item| item.include?('IEDriverServer_Win32') }
-        ds = items.each_with_object({}) do |item, hash|
-          key = normalize_version item[/([^_]+)\.zip/, 1]
-          hash[key] = "#{base_url}#{item}"
+        ds = download_manifest.each_with_object({}) do |item, hash|
+          version = normalize_version item[/\.?([^_]+)\.zip/, 1]
+          hash[version] = "#{base_url}#{item}"
         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') }
+      end
     end
   end
 end

data/lib/webdrivers/network.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'net/http'
+
 module Webdrivers
   #
   # @api private

data/lib/webdrivers/system.rb

@@ -148,8 +148,18 @@ module Webdrivers
         end
       end
 
+      def apple_m1_architecture?
+        if platform == 'mac' && RUBY_PLATFORM.include?('arm64-darwin')
+          Webdrivers.logger.debug 'Apple architecture: M1 (arm64-darwin)'
+          return true
+        end
+
+        Webdrivers.logger.debug 'Apple architecture: Intel (mac64)'
+        false
+      end
+
       # @return [TrueClass, FalseClass]
-      def wsl?
+      def wsl_v1?
         platform == 'linux' && File.open('/proc/version').read.include?('Microsoft')
       end
 

data/lib/webdrivers/version.rb

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

data/spec/webdrivers/chrome_finder_spec.rb

@@ -52,7 +52,7 @@ describe Webdrivers::ChromeFinder do
     before do
       skip "The current platform cannot be WSL, as it's not Linux" unless Selenium::WebDriver::Platform.linux?
 
-      allow(Webdrivers::System).to receive(:wsl?).and_return(true)
+      allow(Webdrivers::System).to receive(:wsl_v1?).and_return(true)
       allow(Webdrivers::System).to receive(:to_wsl_path).and_return('')
       allow(Webdrivers::System).to receive(:to_win32_path).and_return('')
     end

data/spec/webdrivers/edge_finder_spec.rb

@@ -6,9 +6,7 @@ describe Webdrivers::EdgeFinder do
   let(:edge_finder) { described_class }
 
   before(:all) do # rubocop:disable RSpec/BeforeAfterAll
-    # Skip these tests if version of selenium-webdriver being tested with doesn't
-    # have Chromium based Edge support
-    unless defined?(Selenium::WebDriver::EdgeChrome)
+    if Selenium::WebDriver::VERSION[0].to_i < 4
       skip "The current selenium-webdriver doesn't include Chromium based Edge support"
     end
   end
@@ -20,8 +18,8 @@ describe Webdrivers::EdgeFinder do
   end
 
   context 'when the user provides a path to the Edge binary' do
-    it 'uses Selenium::WebDriver::EdgeChrome.path when it is defined' do
-      Selenium::WebDriver::EdgeChrome.path = edge_finder.location
+    it 'uses Selenium::WebDriver::Edge.path when it is defined' do
+      Selenium::WebDriver::Edge.path = edge_finder.location
       locations = %i[win_location mac_location linux_location]
       allow(edge_finder).to receive_messages(locations)
 
@@ -29,8 +27,8 @@ describe Webdrivers::EdgeFinder do
       locations.each { |loc| expect(edge_finder).not_to have_received(loc) }
     end
 
-    it "uses ENV['WD_EDGE_CHROME_PATH'] when it is defined" do
-      allow(ENV).to receive(:[]).with('WD_EDGE_CHROME_PATH').and_return(edge_finder.location)
+    it "uses ENV['WD_EDGE_PATH'] when it is defined" do
+      allow(ENV).to receive(:[]).with('WD_EDGE_PATH').and_return(edge_finder.location)
       locations = %i[win_location mac_location linux_location]
       allow(edge_finder).to receive_messages(locations)
 
@@ -38,11 +36,11 @@ describe Webdrivers::EdgeFinder do
       locations.each { |loc| expect(edge_finder).not_to have_received(loc) }
     end
 
-    it 'uses Selenium::WebDriver::EdgeChrome.path over WD_EDGE_CHROME_PATH' do
-      Selenium::WebDriver::EdgeChrome.path = edge_finder.location
-      allow(ENV).to receive(:[]).with('WD_EDGE_CHROME_PATH').and_return('my_wd_chrome_path')
+    it 'uses Selenium::WebDriver::Edge.path over WD_EDGE_PATH' do
+      Selenium::WebDriver::Edge.path = edge_finder.location
+      allow(ENV).to receive(:[]).with('WD_EDGE_PATH').and_return('my_wd_chrome_path')
       expect(edge_finder.version).not_to be_nil
-      expect(ENV).not_to have_received(:[]).with('WD_EDGE_CHROME_PATH')
+      expect(ENV).not_to have_received(:[]).with('WD_EDGE_PATH')
     end
   end
 

data/spec/webdrivers/edgedriver_spec.rb

@@ -6,9 +6,7 @@ describe Webdrivers::Edgedriver do
   let(:edgedriver) { described_class }
 
   before(:all) do # rubocop:disable RSpec/BeforeAfterAll
-    # Skip these tests if version of selenium-webdriver being tested with doesn't
-    # have Chromium based Edge support
-    unless defined?(Selenium::WebDriver::EdgeChrome)
+    if Selenium::WebDriver::VERSION[0].to_i < 4
       skip "The current selenium-webdriver doesn't include Chromium based Edge support"
     end
   end

data/spec/webdrivers/system_spec.rb

@@ -2,36 +2,42 @@
 
 require 'spec_helper'
 
-wsl_proc_contents = [
-  'Linux version 4.4.0-18362-Microsoft',
-  '(Microsoft@Microsoft.com)',
-  '(gcc version 5.4.0 (GCC) )',
-  '#836-Microsoft',
-  'Mon May 05 16:04:00 PST 2020'
-].join ' '
-
 describe Webdrivers::System do
-  describe '#wsl?' do
-    context 'when the current platform is linux' do
-      before { allow(described_class).to receive(:platform).and_return 'linux' }
+  describe '#wsl_v1?' do
+    subject { described_class.wsl_v1? }
+
+    before do
+      allow(described_class).to receive(:platform).and_return(platform)
+      allow(File).to receive(:open).with('/proc/version').and_return(StringIO.new(wsl_proc_version_contents))
+    end
 
-      it 'checks /proc/version' do
-        allow(File).to receive(:open).with('/proc/version').and_return(StringIO.new(wsl_proc_contents))
+    let(:platform) { 'linux' }
+    let(:wsl_proc_version_contents) { '' }
 
-        expect(described_class.wsl?).to eq true
+    context 'when the current platform is linux and WSL version is 1' do
+      let(:wsl_proc_version_contents) do
+        'Linux version 4.4.0-18362-Microsoft'\
+        '(Microsoft@Microsoft.com) (gcc version 5.4.0 (GCC) )'\
+        '#836-Microsoft Mon May 05 16:04:00 PST 2020'
       end
+
+      it { is_expected.to eq true }
     end
 
-    context 'when the current platform is mac' do
-      before { allow(described_class).to receive(:platform).and_return 'mac' }
+    context 'when the current platform is linux and WSL version is 2' do
+      let(:wsl_proc_version_contents) do
+        'Linux version 4.19.84-microsoft-standard '\
+        '(oe-user@oe-host) (gcc version 8.2.0 (GCC)) '\
+        '#1 SMP Wed Nov 13 11:44:37 UTC 2019'
+      end
 
-      it 'does not bother checking proc' do
-        allow(File).to receive(:open).and_call_original
+      it { is_expected.to eq false }
+    end
 
-        expect(described_class.wsl?).to eq false
+    context 'when the current platform is mac' do
+      let(:platform) { 'mac' }
 
-        expect(File).not_to have_received(:open).with('/proc/version')
-      end
+      it { is_expected.to eq false }
     end
   end
 

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: webdrivers
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 4.6.1
 platform: ruby
 authors:
 - Titus Fortner
 - Lakshya Kapoor
 - Thomas Walpole
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-02 00:00:00.000000000 Z
+date: 2021-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -60,14 +60,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.66'
+        version: '0.89'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.66'
+        version: '0.89'
+- !ruby/object:Gem::Dependency
+  name: rubocop-packaging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -88,14 +102,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.32'
+        version: '1.42'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.32'
+        version: '1.42'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -167,19 +181,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/ISSUE_TEMPLATE.md"
-- ".gitignore"
-- ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- appveyor.yml
-- bin/console
-- bin/setup
-- gemfiles/Gemfile.edge
 - lib/webdrivers.rb
 - lib/webdrivers/Rakefile
 - lib/webdrivers/chrome_finder.rb
@@ -208,18 +212,15 @@ files:
 - spec/webdrivers/system_spec.rb
 - spec/webdrivers/webdrivers_spec.rb
 - spec/webdrivers_proxy_support_spec.rb
-- support/install_jruby.ps1
-- support/install_msedge.ps1
-- webdrivers.gemspec
 homepage: https://github.com/titusfortner/webdrivers
 licenses:
 - MIT
 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.4.1
-  source_code_uri: https://github.com/titusfortner/webdrivers/tree/v4.4.1
-post_install_message: 
+  documentation_uri: https://www.rubydoc.info/gems/webdrivers/4.6.1
+  source_code_uri: https://github.com/titusfortner/webdrivers/tree/v4.6.1
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -234,8 +235,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Easy download and use of browser drivers.
-test_files: []
+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/edgedriver_spec.rb
+- spec/webdrivers/geckodriver_spec.rb
+- spec/webdrivers/i_edriver_spec.rb
+- spec/webdrivers/system_spec.rb
+- spec/webdrivers/webdrivers_spec.rb
+- spec/webdrivers_proxy_support_spec.rb

data/.github/ISSUE_TEMPLATE.md

@@ -1,16 +0,0 @@
-#### Summary
-Short summary of the bug or feature request.
-
-#### Debug Info
-Please provide the following information for bug reports:
-
-* Webdrivers version:
-* Ruby version:
-* Operating system / CI Environment:
-* Browser and version:
-
-#### Expected Behavior
-What you expect to happen.
-
-#### Actual Behavior
-What is actually happening: Error message, stack trace, DEBUG log if applicable (set `Webdrivers.logger.level = :DEBUG` after you require webdrivers)

data/.gitignore

@@ -1,8 +0,0 @@
-*.gem
-.bundle
-Gemfile.lock
-pkg/*
-chromedriver.log
-/.idea/
-coverage/
-gemfiles/Gemfile.*.lock

data/.rubocop.yml

@@ -1,96 +0,0 @@
-AllCops:
-  TargetRubyVersion: 2.4.10
-
-require:
-  - rubocop-rspec
-  - rubocop-performance
-
-Layout/SpaceInsideHashLiteralBraces:
-  EnforcedStyle: no_space
-
-Layout/EndOfLine:
-  EnforcedStyle: lf
-
-Layout/LineLength:
-  Max: 120
-  IgnoredPatterns:
-    - '\s+# rubocop:disable'
-
-Layout/EmptyLinesAroundAttributeAccessor:
-  Enabled: true
-
-Layout/SpaceAroundOperators:
-  Enabled: true
-
-Layout/SpaceAroundMethodCallOperator:
-  Enabled: true
-
-Lint/DeprecatedOpenSSLConstant:
-  Enabled: true
-
-Lint/RaiseException:
-  Enabled: true
-
-Lint/StructNewOverride:
-  Enabled: true
-
-Lint/MixedRegexpCaptureTypes:
-  Enabled: true
-
-Lint/ScriptPermission:
-  Enabled: false
-
-Metrics/MethodLength:
-  Max: 20
-
-Metrics/BlockLength:
-  Exclude:
-    - 'spec/**/*'
-    - 'lib/webdrivers/tasks/*.rake'
-    - 'webdrivers.gemspec'
-
-Metrics/ClassLength:
-  Max: 116
-  Exclude:
-    - 'lib/webdrivers/system.rb'
-
-Metrics/CyclomaticComplexity:
-  Max: 8
-
-Metrics/AbcSize:
-  Max: 16
-  Exclude:
-    - 'lib/webdrivers/chromedriver.rb'
-
-Style/Documentation:
-  Enabled: false
-
-Style/FrozenStringLiteralComment:
-  Enabled: false
-
-Style/ExponentialNotation:
-  Enabled: false
-
-Style/HashEachMethods:
-  Enabled: true
-
-Style/HashTransformKeys:
-  Enabled: false
-
-Style/HashTransformValues:
-  Enabled: false
-
-Style/SlicingWithRange:
-  Enabled: false
-
-Style/RedundantRegexpCharacterClass:
-  Enabled: true
-
-Style/RedundantRegexpEscape:
-  Enabled: false
-
-RSpec/ExampleLength:
-  Enabled: false
-
-RSpec/MultipleExpectations:
-  Enabled: false

data/.travis.yml

@@ -1,41 +0,0 @@
-language: ruby
-cache: bundler
-addons:
-  apt:
-    packages:
-      - chromium-browser
-      - libgconf-2-4
-  chrome: stable
-script: bundle exec rake $RAKE_TASK
-before_install:
-  - gem update --system -N
-  - gem install bundler -N
-matrix:
-  include:
-    - rvm: 2.4
-      env: RAKE_TASK=spec
-    - rvm: 2.5
-      env: RAKE_TASK=spec
-    - rvm: 2.6
-      env: RAKE_TASK=spec
-    - rvm: 2.7
-      os: osx
-      env: RAKE_TASK=spec
-    - rvm: 2.7
-      env: RAKE_TASK=rubocop
-    - rvm: jruby-9.2.11.1
-      jdk: openjdk8
-      env: RAKE_TASK=spec
-    - rvm: 2.7
-      env: RAKE_TASK=spec
-      gemfile: gemfiles/Gemfile.edge
-      os: osx
-      osx_image: xcode11.3
-      addons:
-        chrome: stable
-        homebrew:
-          taps: homebrew/cask-versions
-          casks:
-            - microsoft-edge
-  allow_failures:
-    - gemfile: gemfiles/Gemfile.edge

data/Gemfile

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in webdrivers.gemspec
-gemspec

data/Rakefile

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-require 'rubocop/rake_task'
-
-RuboCop::RakeTask.new
-
-RSpec::Core::RakeTask.new(:spec)
-
-task default: %i[rubocop spec]

data/appveyor.yml

@@ -1,45 +0,0 @@
-build: off
-cache:
-  - vendor/bundle
-image:
-  - Visual Studio 2019
-environment:
-  matrix:
-    - RUBY_VERSION: Ruby24-x64
-      RUBY_BIN: ruby
-      RAKE_TASK: rubocop
-      SCRIPT_CONTEXT: bundle exec
-    - RUBY_VERSION: Ruby24-x64
-      RUBY_BIN: ruby
-      RAKE_TASK: spec
-      SCRIPT_CONTEXT: bundle exec
-    - RUBY_VERSION: Ruby25-x64
-      RUBY_BIN: ruby
-      RAKE_TASK: spec
-      SCRIPT_CONTEXT: bundle exec
-    - RUBY_VERSION: Ruby26-x64
-      RUBY_BIN: ruby
-      RAKE_TASK: spec
-      SCRIPT_CONTEXT: bundle exec
-    - RUBY_VERSION: jruby-9.2.11.1
-      RUBY_BIN: jruby
-      RAKE_TASK: spec
-      SCRIPT_CONTEXT: jruby -G -S
-    - RUBY_VERSION: Ruby26-x64
-      RUBY_BIN: ruby
-      RAKE_TASK: spec
-      SCRIPT_CONTEXT: bundle exec
-      BUNDLE_GEMFILE: gemfiles/Gemfile.edge
-install:
-  - ps: if ($env:RUBY_BIN -eq 'jruby') { support\install_jruby.ps1 }
-  - ps: support\install_msedge.ps1
-  - set PATH=C:\%RUBY_VERSION%\bin;%PATH%
-  - '%RUBY_BIN% -S gem update --system -N'
-  - '%RUBY_BIN% -S gem install bundler -N'
-  - '%RUBY_BIN% -S bundle install'
-before_test:
-  - '%RUBY_BIN% -v'
-  - '%RUBY_BIN% -S gem -v'
-  - '%RUBY_BIN% -S bundle -v'
-test_script:
-  - '%SCRIPT_CONTEXT% rake %RAKE_TASK%'

data/bin/console

@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require 'bundler/setup'
-require 'webdrivers'
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require 'irb'
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/gemfiles/Gemfile.edge

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in webdrivers.gemspec
-gemspec path: '..'
-gem 'selenium-webdriver', github: 'seleniumhq/selenium', glob: 'rb/*.gemspec'

data/support/install_jruby.ps1

@@ -1,7 +0,0 @@
-$downloadLink = "https://repo1.maven.org/maven2/org/jruby/jruby-dist/9.2.11.1/jruby-dist-9.2.11.1-bin.zip"
-$zipPath = "c:\jruby-dist-9.2.11.1-bin.zip"
-
-Write-Host "Installing $($env:RUBY_VERSION)" -ForegroundColor cyan
-appveyor DownloadFile "$($downloadLink)" -FileName "$($zipPath)"
-7z x "$($zipPath)" -oc:\ -y # Unzip to c:\
-Write-Host "JRuby installed.`n" -ForegroundColor green

data/support/install_msedge.ps1

@@ -1,11 +0,0 @@
-$downloadLink = "https://go.microsoft.com/fwlink/?linkid=2108834&Channel=Stable&language=en"
-$installerFile = "C:\MicrosoftEdgeSetup.exe"
-
-#  Note: We're purposely skipping the -Wait flag in Start-Process.
-#  This is because Edge auto-launches after the setup is done and
-#  Start-Process continues to indefinitely wait on that process.
-Write-Host "Downloading Microsoft Edge (Stable)..." -ForegroundColor cyan
-Invoke-WebRequest $downloadLink -OutFile $installerFile
-Write-Host "Installing..." -ForegroundColor cyan
-Start-Process $installerFile
-Write-Host "Microsoft Edge (Stable) installed.`n" -ForegroundColor green

data/webdrivers.gemspec

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-lib = File.expand_path('lib', __dir__)
-$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
-require 'webdrivers/version'
-
-Gem::Specification.new do |s|
-  s.name        = 'webdrivers'
-  s.version     = Webdrivers::VERSION
-  s.required_ruby_version = '>= 2.4.0'
-  s.authors     = ['Titus Fortner', 'Lakshya Kapoor', 'Thomas Walpole']
-  s.email       = %w[titusfortner@gmail.com kapoorlakshya@gmail.com]
-  s.homepage    = 'https://github.com/titusfortner/webdrivers'
-  s.summary     = 'Easy download and use of browser drivers.'
-  s.description = 'Run Selenium tests more easily with install and updates for all supported webdrivers.'
-  s.licenses    = ['MIT']
-
-  s.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/#{Webdrivers::VERSION}",
-    'source_code_uri' => "https://github.com/titusfortner/webdrivers/tree/v#{Webdrivers::VERSION}"
-  }
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = []
-  s.require_paths = ['lib']
-
-  s.add_development_dependency 'ffi', '~> 1.0' # For selenium-webdriver on Windows
-  s.add_development_dependency 'rake', '~> 12.0'
-  s.add_development_dependency 'rspec', '~> 3.0'
-  s.add_development_dependency 'rubocop', '~>0.66'
-  s.add_development_dependency 'rubocop-performance'
-  s.add_development_dependency 'rubocop-rspec', '~>1.32'
-  s.add_development_dependency 'simplecov', '~>0.16'
-
-  s.add_runtime_dependency 'nokogiri', '~> 1.6'
-  s.add_runtime_dependency 'rubyzip', '>= 1.3.0'
-  s.add_runtime_dependency 'selenium-webdriver', '>= 3.0', '< 4.0'
-end