[rb] remove support for legacy Edge HTML browser

Author: titusfortner

rb/build.desc

@@ -4,8 +4,7 @@ rubygem(
     "//rb:chrome",
     "//rb:common",
     "//rb:devtools",
-    "//rb:edge-chrome",
-    "//rb:edge-html",
+    "//rb:edge",
     "//rb:firefox",
     "//rb:ie",
     "//rb:safari",
@@ -101,17 +100,9 @@ ruby_test(name = "remote-chrome",
   ]
 )
 
-ruby_library(name = "edge-html",
+ruby_library(name = "edge",
   srcs = [
-    "lib/selenium/webdriver/edge_html/**/*.rb",
-    "lib/selenium/webdriver/edge.rb"
-  ],
-  deps = [":common"]
-)
-
-ruby_library(name = "edge-chrome",
-  srcs = [
-    "lib/selenium/webdriver/edge_chrome/**/*.rb",
+    "lib/selenium/webdriver/edge/**/*.rb",
     "lib/selenium/webdriver/edge.rb"
   ],
   deps = [":chrome"]
@@ -126,7 +117,7 @@ ruby_test(name = "edge",
     "rb/spec/integration",
     "build/rb/lib"
   ],
-  deps = [":edge-chrome"]
+  deps = [":edge"]
 )
 
 ruby_test(name = "remote-edge",
@@ -140,7 +131,7 @@ ruby_test(name = "remote-edge",
     "build/rb/lib"
   ],
   deps = [
-    ":edge-chrome",
+    ":edge",
     ":remote"
   ]
 )
@@ -308,8 +299,7 @@ ruby_test(name = "unit",
   ],
   deps = [
     ":chrome",
-    ":edge-html",
-    ":edge-chrome",
+    ":edge",
     ":firefox",
     ":ie",
     ":safari",

rb/lib/selenium/webdriver.rb

@@ -39,8 +39,6 @@ module WebDriver
     autoload :Chrome,     'selenium/webdriver/chrome'
     autoload :DevTools,   'selenium/webdriver/devtools'
     autoload :Edge,       'selenium/webdriver/edge'
-    autoload :EdgeHtml,   'selenium/webdriver/edge'
-    autoload :EdgeChrome, 'selenium/webdriver/edge'
     autoload :Firefox,    'selenium/webdriver/firefox'
     autoload :IE,         'selenium/webdriver/ie'
     autoload :Remote,     'selenium/webdriver/remote'

rb/lib/selenium/webdriver/common/driver.rb

@@ -53,10 +53,6 @@ def for(browser, opts = {})
             Firefox::Driver.new(**opts)
           when :edge
             Edge::Driver.new(**opts)
-          when :edge_chrome
-            EdgeChrome::Driver.new(**opts)
-          when :edge_html
-            EdgeHtml::Driver.new(**opts)
           when :remote
             Remote::Driver.new(**opts)
           else

rb/lib/selenium/webdriver/common/service.rb

@@ -45,14 +45,6 @@ def edge(**opts)
           Edge::Service.new(**opts)
         end
 
-        def edge_chrome(**opts)
-          EdgeChrome::Service.new(**opts)
-        end
-
-        def edge_html(**opts)
-          EdgeHtml::Service.new(**opts)
-        end
-
         def safari(**opts)
           Safari::Service.new(**opts)
         end

rb/lib/selenium/webdriver/edge.rb

@@ -21,32 +21,12 @@
 
 module Selenium
   module WebDriver
-    module EdgeHtml
-      autoload :Driver, 'selenium/webdriver/edge_html/driver'
-      autoload :Options, 'selenium/webdriver/edge_html/options'
-      autoload :Service, 'selenium/webdriver/edge_html/service'
-
-      def self.driver_path=(path)
-        WebDriver.logger.deprecate 'Selenium::WebDriver::Edge#driver_path=',
-                                   'Selenium::WebDriver::Edge::Service#driver_path=',
-                                   id: :driver_path
-        Selenium::WebDriver::Edge::Service.driver_path = path
-      end
-
-      def self.driver_path
-        WebDriver.logger.deprecate 'Selenium::WebDriver::Edge#driver_path',
-                                   'Selenium::WebDriver::Edge::Service#driver_path',
-                                   id: :driver_path
-        Selenium::WebDriver::Edge::Service.driver_path
-      end
-    end # EdgeHtml
-
-    module EdgeChrome
-      autoload :Bridge, 'selenium/webdriver/edge_chrome/bridge'
-      autoload :Driver, 'selenium/webdriver/edge_chrome/driver'
-      autoload :Profile, 'selenium/webdriver/edge_chrome/profile'
-      autoload :Options, 'selenium/webdriver/edge_chrome/options'
-      autoload :Service, 'selenium/webdriver/edge_chrome/service'
+    module Edge
+      autoload :Bridge, 'selenium/webdriver/edge/bridge'
+      autoload :Driver, 'selenium/webdriver/edge/driver'
+      autoload :Profile, 'selenium/webdriver/edge/profile'
+      autoload :Options, 'selenium/webdriver/edge/options'
+      autoload :Service, 'selenium/webdriver/edge/service'
 
       def self.path=(path)
         Platform.assert_executable path
@@ -56,8 +36,6 @@ def self.path=(path)
       def self.path
         @path ||= nil
       end
-    end # EdgeHtml
-
-    Edge = EdgeChrome
+    end # Edge
   end # WebDriver
 end # Selenium

rb/lib/selenium/webdriver/edge_chrome/bridge.rb renamed to rb/lib/selenium/webdriver/edge/bridge.rb

@@ -21,7 +21,7 @@
 
 module Selenium
   module WebDriver
-    module EdgeChrome
+    module Edge
       class Bridge < WebDriver::Chrome::Bridge
 
         COMMANDS = WebDriver::Chrome::Bridge::COMMANDS.merge(
@@ -32,6 +32,6 @@ def commands(command)
           COMMANDS[command] || super
         end
       end # Bridge
-    end # EdgeChrome
+    end # Edge
   end # WebDriver
 end # Selenium

rb/lib/selenium/webdriver/edge_chrome/driver.rb renamed to rb/lib/selenium/webdriver/edge/driver.rb

@@ -21,16 +21,16 @@
 
 module Selenium
   module WebDriver
-    module EdgeChrome
+    module Edge
 
       #
-      # Driver implementation for EdgeChrome.
+      # Driver implementation for Microsoft Edge.
       # @api private
       #
 
       class Driver < Selenium::WebDriver::Chrome::Driver
         def browser
-          :edge_chrome
+          :edge
         end
 
         def bridge_class
@@ -43,6 +43,6 @@ def debugger_address
           capabilities['ms:edgeOptions']['debuggerAddress']
         end
       end # Driver
-    end # EdgeChrome
+    end # Edge
   end # WebDriver
 end # Selenium

rb/lib/selenium/webdriver/edge_chrome/options.rb renamed to rb/lib/selenium/webdriver/edge/options.rb

@@ -21,17 +21,17 @@
 
 module Selenium
   module WebDriver
-    module EdgeChrome
+    module Edge
       class Options < Selenium::WebDriver::Chrome::Options
         KEY = 'ms:edgeOptions'
         BROWSER = 'MicrosoftEdge'
 
         private
 
         def binary_path
-          EdgeChrome.path
+          Edge.path
         end
       end # Options
-    end # EdgeChrome
+    end # Edge
   end # WebDriver
 end # Selenium

rb/lib/selenium/webdriver/edge_chrome/profile.rb renamed to rb/lib/selenium/webdriver/edge/profile.rb

@@ -21,13 +21,13 @@
 
 module Selenium
   module WebDriver
-    module EdgeChrome
+    module Edge
       #
       # @private
       #
 
       class Profile < Selenium::WebDriver::Chrome::Profile
       end # Profile
-    end # EdgeChrome
+    end # Edge
   end # WebDriver
 end # Selenium

rb/lib/selenium/webdriver/edge_chrome/service.rb renamed to rb/lib/selenium/webdriver/edge/service.rb

@@ -21,7 +21,7 @@
 
 module Selenium
   module WebDriver
-    module EdgeChrome
+    module Edge
       class Service < Selenium::WebDriver::Chrome::Service
         DEFAULT_PORT = 9515
         EXECUTABLE = 'msedgedriver'
@@ -31,6 +31,6 @@ class Service < Selenium::WebDriver::Chrome::Service
         ERROR
         SHUTDOWN_SUPPORTED = true
       end # Service
-    end # EdgeChrome
+    end # Edge
   end # WebDriver
 end # Selenium