From 87e3833c04af07236ebb7c3f4259a949358ccfb7 Mon Sep 17 00:00:00 2001
From: Brandon Walderman <bwalderman@outlook.com>
Date: Wed, 13 Oct 2021 03:30:49 -0700
Subject: [PATCH] [python] Remove Edge legacy options. (#9908)

Co-authored-by: David Burns <david.burns@theautomatedtester.co.uk>
---
 py/BUILD.bazel                                |  2 +-
 py/conftest.py                                |  1 -
 py/selenium/webdriver/edge/options.py         | 21 +++----------------
 py/selenium/webdriver/edge/webdriver.py       |  3 +--
 .../webdriver/edge/edge_options_tests.py      |  8 -------
 5 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/py/BUILD.bazel b/py/BUILD.bazel
index 9d830cc53c49c..73011ff62bed4 100644
--- a/py/BUILD.bazel
+++ b/py/BUILD.bazel
@@ -308,7 +308,7 @@ py_test_suite(
     ]),
     args = [
         "--instafail",
-        "--driver=Edge",
+        "--driver=edge",
     ],
     tags = [
         "no-sandbox",
diff --git a/py/conftest.py b/py/conftest.py
index d481edb4cb533..b25ab7c3ef9dd 100644
--- a/py/conftest.py
+++ b/py/conftest.py
@@ -146,7 +146,6 @@ def get_options(driver_class, config):
 
     if driver_class == 'ChromiumEdge':
         options = getattr(webdriver, 'EdgeOptions')()
-        options.use_chromium = True
 
     if browser_path or browser_args:
         if not options:
diff --git a/py/selenium/webdriver/edge/options.py b/py/selenium/webdriver/edge/options.py
index 3a617eea81119..f957323918139 100644
--- a/py/selenium/webdriver/edge/options.py
+++ b/py/selenium/webdriver/edge/options.py
@@ -24,17 +24,8 @@ class Options(ChromiumOptions):
 
     def __init__(self):
         super(Options, self).__init__()
-        self._use_chromium = True
         self._use_webview = False
 
-    @property
-    def use_chromium(self) -> bool:
-        return self._use_chromium
-
-    @use_chromium.setter
-    def use_chromium(self, value: bool):
-        self._use_chromium = bool(value)
-
     @property
     def use_webview(self) -> bool:
         return self._use_webview
@@ -48,16 +39,10 @@ def to_capabilities(self) -> dict:
         Creates a capabilities with all the options that have been set and
         :Returns: A dictionary with everything
         """
-        caps = self._caps
-
-        if self._use_chromium:
-            caps = super(Options, self).to_capabilities()
-            if self._use_webview:
-                caps['browserName'] = 'webview2'
-        else:
-            caps['platform'] = 'windows'
+        caps = super(Options, self).to_capabilities()
+        if self._use_webview:
+            caps['browserName'] = 'webview2'
 
-        caps['ms:edgeChromium'] = self._use_chromium
         return caps
 
     @property
diff --git a/py/selenium/webdriver/edge/webdriver.py b/py/selenium/webdriver/edge/webdriver.py
index ef4d827a98d9a..3ec8bd0741d5c 100644
--- a/py/selenium/webdriver/edge/webdriver.py
+++ b/py/selenium/webdriver/edge/webdriver.py
@@ -28,8 +28,7 @@
 class WebDriver(ChromiumDriver):
     """
     Controls the Microsoft Edge driver and allows you to drive the browser.
-    You will need to download either the MicrosoftWebDriver (Legacy)
-    or MSEdgeDriver (Chromium) executable from
+    You will need to download the MSEdgeDriver (Chromium) executable from
     https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver/
     """
 
diff --git a/py/test/unit/selenium/webdriver/edge/edge_options_tests.py b/py/test/unit/selenium/webdriver/edge/edge_options_tests.py
index 282fff8e32b7e..58b4434924746 100644
--- a/py/test/unit/selenium/webdriver/edge/edge_options_tests.py
+++ b/py/test/unit/selenium/webdriver/edge/edge_options_tests.py
@@ -59,16 +59,8 @@ def test_is_a_baseoptions(options):
     assert isinstance(options, BaseOptions)
 
 
-def test_use_chromium():
-    options = Options()
-    options.use_chromium = True
-    caps = options.to_capabilities()
-    assert caps['ms:edgeChromium'] is True
-
-
 def test_use_webview():
     options = Options()
-    options.use_chromium = True
     options.use_webview = True
     caps = options.to_capabilities()
     assert caps['browserName'] == "webview2"