From 34d04f2f82d7ea6f85e7b0c7bb25a28d899e4703 Mon Sep 17 00:00:00 2001 From: titusfortner Date: Thu, 14 Oct 2021 16:40:57 -0500 Subject: [PATCH] allow Edge on Linux but skip tests --- lib/webdrivers/edgedriver.rb | 10 +++++----- spec/webdrivers/edge_finder_spec.rb | 4 +++- spec/webdrivers/edgedriver_spec.rb | 4 +++- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/webdrivers/edgedriver.rb b/lib/webdrivers/edgedriver.rb index 4fc9af25..243c4ecf 100644 --- a/lib/webdrivers/edgedriver.rb +++ b/lib/webdrivers/edgedriver.rb @@ -76,15 +76,15 @@ def apple_m1_compatible?(driver_version) false end - # def linux_compatible?(driver_version) - # System.platform == 'linux' && driver_version >= normalize_version('89.0.731.0') - # 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 linux_compatible?(driver_version) + 'linux64' elsif System.platform == 'mac' # Determine M1 or Intel architecture apple_arch = apple_m1_compatible?(driver_version) ? 'arm' : 'mac' diff --git a/spec/webdrivers/edge_finder_spec.rb b/spec/webdrivers/edge_finder_spec.rb index 85b68dc1..97af8f59 100644 --- a/spec/webdrivers/edge_finder_spec.rb +++ b/spec/webdrivers/edge_finder_spec.rb @@ -7,7 +7,9 @@ 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" + skip 'The current selenium-webdriver does not include Chromium based Edge support' + elsif Webdrivers::System.platform == 'linux' + skip 'Edge is not yet supported on Linux' end end diff --git a/spec/webdrivers/edgedriver_spec.rb b/spec/webdrivers/edgedriver_spec.rb index 401cea60..e18f2bac 100644 --- a/spec/webdrivers/edgedriver_spec.rb +++ b/spec/webdrivers/edgedriver_spec.rb @@ -7,7 +7,9 @@ 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" + skip 'The current selenium-webdriver does not include Chromium based Edge support' + elsif Webdrivers::System.platform == 'linux' + skip 'Edge is not yet supported on Linux' end end