Remove IE App

tools/wpt/browser.py

@@ -1856,31 +1856,6 @@ def webdriver_version(self, webdriver_binary):
         return m.group(1)
 
 
-class InternetExplorer(Browser):
-    """Internet Explorer-specific interface."""
-
-    product = "ie"
-    requirements = "requirements_ie.txt"
-
-    def download(self, dest=None, channel=None, rename=None):
-        raise NotImplementedError
-
-    def install(self, dest=None, channel=None):
-        raise NotImplementedError
-
-    def find_binary(self, venv_path=None, channel=None):
-        raise NotImplementedError
-
-    def find_webdriver(self, venv_path=None, channel=None):
-        return which("IEDriverServer.exe")
-
-    def install_webdriver(self, dest=None, channel=None, browser_binary=None):
-        raise NotImplementedError
-
-    def version(self, binary=None, webdriver_binary=None):
-        return None
-
-
 class Safari(Browser):
     """Safari-specific interface.
 

tools/wpt/run.py

@@ -726,9 +726,15 @@ def setup_kwargs(self, kwargs):
             kwargs["binary_args"].append("--no-sandbox")
 
 
+<<<<<<< HEAD
 class InternetExplorer(BrowserSetup):
     name = "ie"
     browser_cls = browser.InternetExplorer
+=======
+class Edge(BrowserSetup):
+    name = "edge"
+    browser_cls = browser.Edge
+>>>>>>> ec44981b17 (Remove IE App)
 
     def install(self, channel=None):
         raise NotImplementedError
@@ -739,14 +745,29 @@ def setup_kwargs(self, kwargs):
 
             if webdriver_binary is None:
                 raise WptrunError("""Unable to find WebDriver and we aren't yet clever enough to work out which
+<<<<<<< HEAD
 version to download. Please go to the following URL and install the driver for Internet Explorer
 somewhere on the %PATH%:
 
 https://selenium-release.storage.googleapis.com/index.html
+=======
+version to download. Please go to the following URL and install the correct
+version for your Edge/Windows release somewhere on the %PATH%:
+
+https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver/
+>>>>>>> ec44981b17 (Remove IE App)
 """)
             kwargs["webdriver_binary"] = webdriver_binary
 
 
+<<<<<<< HEAD
+=======
+class EdgeWebDriver(Edge):
+    name = "edge_webdriver"
+    browser_cls = browser.EdgeWebDriver
+
+
+>>>>>>> ec44981b17 (Remove IE App)
 class Safari(BrowserSetup):
     name = "safari"
     browser_cls = browser.Safari
@@ -898,7 +919,6 @@ def setup_kwargs(self, kwargs):
     "chromium": Chromium,
     "content_shell": ContentShell,
     "edgechromium": EdgeChromium,
-    "ie": InternetExplorer,
     "safari": Safari,
     "servo": Servo,
     "servodriver": ServoWebDriver,

tools/wptrunner/tox.ini

@@ -2,7 +2,7 @@
 xfail_strict=true
 
 [tox]
-envlist = py311-{base,chrome,firefox,ie,opera,safari,sauce,servo,webkit,webkitgtk_minibrowser,epiphany},{py37,py38,py39,py310}-base
+envlist = py311-{base,chrome,firefox,opera,safari,sauce,servo,webkit,webkitgtk_minibrowser,epiphany},{py37,py38,py39,py310}-base
 skip_missing_interpreters = False
 
 [testenv]
@@ -11,7 +11,6 @@ deps =
      -r{toxinidir}/requirements.txt
      chrome: -r{toxinidir}/requirements_chromium.txt
      firefox: -r{toxinidir}/requirements_firefox.txt
-     ie: -r{toxinidir}/requirements_ie.txt
      opera: -r{toxinidir}/requirements_opera.txt
      safari: -r{toxinidir}/requirements_safari.txt
      sauce: -r{toxinidir}/requirements_sauce.txt

tools/wptrunner/wptrunner/browsers/__init__.py

@@ -32,7 +32,6 @@
                 "edgechromium",
                 "firefox",
                 "firefox_android",
-                "ie",
                 "safari",
                 "sauce",
                 "servo",