[rb] change default edge to chrome and get tests passing

Rakefile

@@ -256,15 +256,14 @@ task test_rb_local: [
   ('//rb:safari-preview-test' if SeleniumRake::Checks.mac?),
   ('//rb:safari-test' if SeleniumRake::Checks.mac?),
   ('//rb:ie-test' if SeleniumRake::Checks.windows?),
-  ('//rb:edge-test' if SeleniumRake::Checks.windows?)
+  ('//rb:edge-test' unless SeleniumRake::Checks.linux?)
 ].compact
 
 task test_rb_remote: [
   '//rb:remote-chrome-test',
   '//rb:remote-firefox-test',
   ('//rb:remote-safari-test' if SeleniumRake::Checks.mac?),
   ('//rb:remote-ie-test' if SeleniumRake::Checks.windows?),
-  ('//rb:remote-edge-test' if SeleniumRake::Checks.windows?)
 ].compact
 
 task test_py: [:py_prep_for_install_release, 'py:marionette_test']

rake_tasks/selenium_rake/checks.rb

@@ -15,6 +15,10 @@ def mac?
         (RbConfig::CONFIG['host_os'] =~ /darwin|mac os/) != nil
       end
 
+      def linux?
+        !windows? && !mac?
+      end
+
       def dir_separator
         File::ALT_SEPARATOR || File::SEPARATOR
       end

rb/build.desc

@@ -4,8 +4,8 @@ rubygem(
     "//rb:chrome",
     "//rb:common",
     "//rb:devtools",
-    "//rb:edge",
     "//rb:edge-chrome",
+    "//rb:edge-html",
     "//rb:firefox",
     "//rb:ie",
     "//rb:safari",
@@ -87,51 +87,39 @@ ruby_test(name = "remote-chrome",
   deps = [":chrome"]
 )
 
-ruby_library(name = "edge",
+ruby_library(name = "edge-html",
   srcs = [
     "lib/selenium/webdriver/edge_html/**/*.rb",
     "lib/selenium/webdriver/edge.rb"
   ],
   deps = [":common"]
 )
 
-ruby_test(name = "edge",
+ruby_library(name = "edge-chrome",
   srcs = [
-    "spec/integration/selenium/webdriver/*_spec.rb",
-    "spec/integration/selenium/webdriver/edge_html/**/*_spec.rb"
-  ],
-  include = [
-    "rb/spec/integration",
-    "build/rb/lib"
+    "lib/selenium/webdriver/edge_chrome/**/*.rb",
+    "lib/selenium/webdriver/edge.rb"
   ],
-  deps = [":edge"]
+  deps = [":chrome"]
 )
 
-ruby_test(name = "remote-edge",
+ruby_test(name = "edge",
   srcs = [
     "spec/integration/selenium/webdriver/*_spec.rb",
-    "spec/integration/selenium/webdriver/edge_html/**/*_spec.rb",
-    "spec/integration/selenium/webdriver/remote/**/*_spec.rb"
+    "spec/integration/selenium/webdriver/edge/**/*_spec.rb"
   ],
   include = [
     "rb/spec/integration",
     "build/rb/lib"
   ],
-  deps = [":edge"]
-)
-
-ruby_library(name = "edge-chrome",
-  srcs = [
-    "lib/selenium/webdriver/edge_chrome/**/*.rb",
-    "lib/selenium/webdriver/edge.rb"
-  ],
-  deps = [":chrome"]
+  deps = [":edge-chrome"]
 )
 
-ruby_test(name = "edge-chrome",
+ruby_test(name = "remote-edge",
   srcs = [
     "spec/integration/selenium/webdriver/*_spec.rb",
-    "spec/integration/selenium/webdriver/edge_chrome/**/*_spec.rb"
+    "spec/integration/selenium/webdriver/edge/**/*_spec.rb",
+    "spec/integration/selenium/webdriver/remote/**/*_spec.rb"
   ],
   include = [
     "rb/spec/integration",
@@ -286,7 +274,8 @@ ruby_test(name = "unit",
   ],
   deps = [
     ":chrome",
-    ":edge",
+    ":edge-html",
+    ":edge-chrome",
     ":firefox",
     ":ie",
     ":safari",

rb/lib/selenium/webdriver/edge.rb

@@ -56,8 +56,8 @@ def self.path=(path)
       def self.path
         @path ||= nil
       end
-    end # EdgeChrome
+    end # EdgeHtml
 
-    Edge = EdgeHtml # Alias EdgeHtml as Edge for now
+    Edge = EdgeChrome
   end # WebDriver
 end # Selenium

rb/lib/selenium/webdriver/edge_chrome/options.rb

@@ -23,7 +23,8 @@ module Selenium
   module WebDriver
     module EdgeChrome
       class Options < Selenium::WebDriver::Chrome::Options
-        BROWSER = 'MSEdge'
+        KEY = 'ms:edgeOptions'
+        BROWSER = 'MicrosoftEdge'
 
         private
 

rb/lib/selenium/webdriver/edge_html/driver.rb

@@ -31,7 +31,7 @@ class Driver < WebDriver::Driver
         include DriverExtensions::TakesScreenshot
 
         def browser
-          :edge
+          :edge_html
         end
       end # Driver
     end # EdgeHtml

rb/lib/selenium/webdriver/remote/capabilities.rb

@@ -82,7 +82,7 @@ def chrome(opts = {})
           end
 
           def edge(opts = {})
-            edge_html(opts)
+            edge_chrome(opts)
           end
 
           def edge_html(opts = {})

rb/spec/integration/selenium/webdriver/action_builder_spec.rb

@@ -38,7 +38,7 @@ module WebDriver
           expect(driver.find_element(id: 'result').text.strip).to be_empty
         end
 
-        it 'can send keys with shift pressed', except: {browser: %i[edge safari safari_preview]} do
+        it 'can send keys with shift pressed', except: {browser: %i[safari safari_preview]} do
           driver.navigate.to url_for('javascriptPage.html')
 
           event_input = driver.find_element(id: 'theworks')
@@ -53,7 +53,7 @@ module WebDriver
           expect(keylogger.text.strip).to match(/^(focus )?keydown keydown keypress keyup keydown keypress keyup keyup$/)
         end
 
-        it 'can press and release modifier keys', except: {browser: %i[edge safari]} do
+        it 'can press and release modifier keys', except: {browser: :safari} do
           driver.navigate.to url_for('javascriptPage.html')
 
           event_input = driver.find_element(id: 'theworks')
@@ -161,7 +161,7 @@ module WebDriver
 
         it 'can release pressed buttons via release action', except: [{browser: :safari},
                                                                       {driver: :remote, browser: :ie}],
-                                                             only: {browser: %i[edge chrome edge_chrome firefox ie]} do
+                                                             only: {browser: %i[edge chrome firefox ie]} do
           driver.navigate.to url_for('javascriptPage.html')
 
           event_input = driver.find_element(id: 'clickField')

rb/spec/integration/selenium/webdriver/driver_spec.rb

@@ -22,7 +22,7 @@
 module Selenium
   module WebDriver
     describe Driver do
-      it_behaves_like 'driver that can be started concurrently', except: {browser: %i[edge safari safari_preview]}
+      it_behaves_like 'driver that can be started concurrently', except: {browser: %i[safari safari_preview]}
 
       it 'should get the page title' do
         driver.navigate.to url_for('xhtmlTest.html')
@@ -292,7 +292,7 @@ def save_screenshot_and_assert(path)
           expect(driver.execute_script('return true;')).to eq(true)
         end
 
-        it 'should raise if the script is bad', except: {browser: %i[edge]} do
+        it 'should raise if the script is bad' do
           driver.navigate.to url_for('xhtmlTest.html')
           expect { driver.execute_script('return squiggle();') }.to raise_error(Selenium::WebDriver::Error::JavascriptError)
         end
@@ -363,9 +363,8 @@ def save_screenshot_and_assert(path)
           expect(result).to eq(3)
         end
 
-        # Edge BUG - https://connect.microsoft.com/IE/feedback/details/1849991/
         # Safari raises TimeoutError instead
-        it 'times out if the callback is not invoked', except: {browser: %i[edge safari safari_preview]} do
+        it 'times out if the callback is not invoked', except: {browser: %i[safari safari_preview]} do
           expect {
             # Script is expected to be async and explicitly callback, so this should timeout.
             driver.execute_async_script 'return 1 + 2;'

rb/spec/integration/selenium/webdriver/edge_chrome/driver_spec.rb → rb/spec/integration/selenium/webdriver/edge/driver_spec.rb

@@ -21,8 +21,8 @@
 
 module Selenium
   module WebDriver
-    module EdgeChrome
-      describe Driver, only: {driver: :edge_chrome} do
+    module Edge
+      describe Driver, only: {driver: :edge} do
         it 'gets and sets network conditions' do
           driver.network_conditions = {offline: false, latency: 56, throughput: 789}
           expect(driver.network_conditions).to eq(
@@ -53,6 +53,6 @@ module EdgeChrome
           end
         end
       end
-    end # EdgeChrome
+    end # Edge
   end # WebDriver
 end # Selenium

rb/spec/integration/selenium/webdriver/edge_chrome/options_spec.rb → rb/spec/integration/selenium/webdriver/edge/options_spec.rb

@@ -22,7 +22,7 @@
 module Selenium
   module WebDriver
     module EdgeChrome
-      describe Options, only: {browser: :edge_chrome} do
+      describe Options, only: {browser: :edge} do
         subject(:options) { Options.new }
 
         it 'passes emulated device correctly' do

rb/spec/integration/selenium/webdriver/edge_chrome/profile_spec.rb → rb/spec/integration/selenium/webdriver/edge/profile_spec.rb

@@ -21,7 +21,7 @@
 
 module Selenium
   module WebDriver
-    module EdgeChrome
+    module Edge
       describe Profile do
         let(:profile) { Profile.new }
 
@@ -54,6 +54,6 @@ module EdgeChrome
           }.to raise_error(Selenium::WebDriver::Error::WebDriverError)
         end
       end
-    end # Chrome
+    end # Edge
   end # WebDriver
 end # Selenium

rb/spec/integration/selenium/webdriver/manager_spec.rb

@@ -22,8 +22,8 @@
 module Selenium
   module WebDriver
     describe Manager do
-      describe 'logs', except: [{browser: %i[edge edge_chrome firefox ie safari safari_preview]},
-                                {driver: :remote, browser: :chrome}] do
+      describe 'logs', except: [{browser: %i[firefox ie safari safari_preview]},
+                                {driver: :remote, browser: %i[chrome edge]}] do
         it 'can fetch remote log types', only: {driver: :remote} do
           expect(driver.manage.logs.available_types).to include(:server, :browser, :driver)
         end
@@ -43,7 +43,7 @@ module WebDriver
         end
 
         # Chrome - turned off by default
-        it 'can get the driver log', except: {browser: %i[chrome edge_chrome]} do
+        it 'can get the driver log', except: {browser: %i[chrome edge]} do
           driver.navigate.to url_for('simpleTest.html')
 
           entries = driver.manage.logs.get(:driver)
@@ -64,14 +64,14 @@ module WebDriver
           expect(cookies.first[:value]).to eq('bar')
         end
 
-        it 'should add sameSite cookie with attribute Strict', only: {browser: :chrome} do
+        it 'should add sameSite cookie with attribute Strict', only: {browser: %i[chrome edge]} do
           driver.navigate.to url_for('xhtmlTest.html')
           driver.manage.add_cookie name: 'foo', value: 'bar', same_site: 'Strict'
 
           expect(driver.manage.cookie_named('foo')[:same_site]).to eq('Strict')
         end
 
-        it 'should add sameSite cookie with attribute Lax', only: {browser: :chrome} do
+        it 'should add sameSite cookie with attribute Lax', only: {browser: %i[chrome edge]} do
           driver.navigate.to url_for('xhtmlTest.html')
           driver.manage.add_cookie name: 'foo', value: 'bar', same_site: 'Lax'
           expect(driver.manage.cookie_named('foo')[:same_site]).to eq('Lax')
@@ -84,16 +84,15 @@ module WebDriver
           expect(driver.manage.cookie_named('foo')[:value]).to eq('bar')
         end
 
-        # Edge BUG - https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/5751773/
-        it 'should delete one', except: {browser: :edge} do
+        it 'should delete one' do
           driver.navigate.to url_for('xhtmlTest.html')
           driver.manage.add_cookie name: 'foo', value: 'bar'
 
           driver.manage.delete_cookie('foo')
           expect(driver.manage.all_cookies.find { |c| c[:name] == 'foo' }).to be_nil
         end
 
-        it 'should delete all', except: {browser: :edge} do
+        it 'should delete all' do
           driver.navigate.to url_for('xhtmlTest.html')
 
           driver.manage.add_cookie name: 'foo', value: 'bar'

rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb

@@ -220,9 +220,9 @@ def create_safari_preview_driver(opt = {})
           WebDriver::Driver.for :safari, opt
         end
 
-        def create_edge_chrome_driver(opt = {})
+        def create_edge_driver(opt = {})
           WebDriver::EdgeChrome.path = ENV['EDGE_BINARY'] if ENV['EDGE_BINARY']
-          WebDriver::Driver.for :edge_chrome, opt
+          WebDriver::Driver.for :edge, opt
         end
       end
     end # SpecSupport

rb/spec/integration/selenium/webdriver/window_spec.rb

@@ -75,7 +75,7 @@ module WebDriver
         expect(new_pos.y).to eq(target_y)
       end
 
-      it 'gets the rect of the current window', only: {browser: %i[edge edge_chrome firefox ie chrome safari safari_preview]} do
+      it 'gets the rect of the current window' do
         rect = window.rect
 
         expect(rect).to be_a(Rectangle)
@@ -86,7 +86,7 @@ module WebDriver
         expect(rect.height).to be >= 0
       end
 
-      it 'sets the rect of the current window', only: {browser: %i[edge_chrome firefox ie chrome safari safari_preview]} do
+      it 'sets the rect of the current window' do
         rect = window.rect
 
         target_x = rect.x + 10
@@ -120,7 +120,7 @@ module WebDriver
       # https://github.com/mozilla/geckodriver/issues/1281
       it 'can make window full screen', only: {window_manager: true},
                                         exclude: [{driver: :remote, browser: :firefox, platform: :linux},
-                                                  {browser: %i[chrome edge_chrome]}] do
+                                                  {browser: %i[chrome edge]}] do
         window.size = old_size = Dimension.new(700, 700)
 
         window.full_screen

rb/spec/unit/selenium/webdriver/chrome/options_spec.rb

@@ -232,7 +232,7 @@ module Chrome
                                                'windowTypes' => %w[normal devtools]})
           end
         end
-      end # Options
+      end
     end # Chrome
   end # WebDriver
 end # Selenium