[plugin-web-app] Drop support of EdgeHTML browser

Selenium 4 doesn't support EdgeHTML: SeleniumHQ/selenium#9166

Author: valfirst

.github/workflows/gradle.yml

@@ -179,7 +179,7 @@ jobs:
       shell: bash
       run: |
         if [[ -n $LAMBDATEST_USER && -n $LAMBDATEST_KEY ]]; then
-          declare -a profiles=( iexplore chrome firefox edge safari )
+          declare -a profiles=( iexplore chrome firefox edge/chromium safari )
           for profile in "${profiles[@]}"; do
             ./gradlew :vividus-tests:debugStories -Pvividus.configuration.environments=system/lambdatest \
                                                   -Pvividus.configuration.suites=lambdatest \
@@ -200,7 +200,7 @@ jobs:
       shell: bash
       run: |
         if [[ -n $SAUCELABS_USER && -n $SAUCELABS_KEY ]]; then
-          declare -a profiles=( iexplore chrome firefox edge edge/chromium safari )
+          declare -a profiles=( iexplore chrome firefox edge/chromium safari )
           for profile in "${profiles[@]}"; do
             ./gradlew :vividus-tests:debugStories -Pvividus.configuration.environments=system/saucelabs \
                                                   -Pvividus.configuration.suites=grid \
@@ -344,7 +344,7 @@ jobs:
       shell: bash
       run: |
         if [[ -n $BROWSERSTACK_USER && -n $BROWSERSTACK_KEY ]]; then
-          declare -a profiles=( iexplore chrome firefox edge safari )
+          declare -a profiles=( iexplore chrome firefox edge/chromium safari )
           for profile in "${profiles[@]}"; do
             ./gradlew :vividus-tests:debugStories -Pvividus.configuration.suites=grid \
                                                   -Pvividus.configuration.profiles=browserstack/web,web/desktop/${profile} \

vividus-plugin-web-app/src/main/java/org/vividus/selenium/WebDriverType.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2020 the original author or authors.
+ * Copyright 2019-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -134,24 +134,6 @@ public WebDriver getWebDriver(DesiredCapabilities desiredCapabilities, WebDriver
             return new SafariDriver(SafariOptions.fromCapabilities(desiredCapabilities));
         }
     },
-    EDGE(false, false, false, Set.of(), BrowserType.EDGE)
-    {
-        @Override
-        public WebDriver getWebDriver(DesiredCapabilities desiredCapabilities, WebDriverConfiguration configuration)
-        {
-            EdgeOptions edgeOptions = new EdgeOptions();
-            edgeOptions.merge(desiredCapabilities);
-            edgeOptions.setCapability("ms:inPrivate", true);
-            return new EdgeDriver(edgeOptions);
-        }
-
-        @Override
-        void setDriverExecutablePath(Optional<String> driverExecutablePath)
-        {
-            setDriverExecutablePathImpl(driverExecutablePath, EdgeDriverService.EDGE_DRIVER_EXE_PROPERTY,
-                    WebDriverManager::edgedriver);
-        }
-    },
     OPERA(true, true, false, Set.of(OperaOptions.CAPABILITY), BrowserType.OPERA_BLINK)
     {
         @Override

vividus-plugin-web-app/src/main/java/org/vividus/ui/web/action/MouseActions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2020 the original author or authors.
+ * Copyright 2019-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -195,9 +195,9 @@ public void moveToElement(WebElement element)
     {
         if (element != null)
         {
-            // Safari, Firefox and Edge Drivers don't scroll to element before moveTo action
+            // Safari and Firefox Drivers don't scroll to element before moveTo action
             if (webDriverManager.isMobile()
-                    || webDriverManager.isTypeAnyOf(WebDriverType.SAFARI, WebDriverType.FIREFOX, WebDriverType.EDGE))
+                    || webDriverManager.isTypeAnyOf(WebDriverType.SAFARI, WebDriverType.FIREFOX))
             {
                 javascriptActions.scrollIntoView(element, true);
             }

vividus-plugin-web-app/src/main/resources/properties/profile/web/desktop/edge/chromium/profile.properties

@@ -1,5 +1,8 @@
 selenium.browser=edge_chromium
 
 selenium.grid.capabilities.platformName=ANY
+selenium.grid.capabilities.browserName=MicrosoftEdge
+
+selenium.screenshot.strategy=VIEWPORT_PASTING
 
 selenium.grid.screen-resolution=1920x1080

vividus-plugin-web-app/src/main/resources/properties/profile/web/desktop/edge/profile.properties

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2020 the original author or authors.
+ * Copyright 2019-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -189,23 +189,6 @@ void testGetSafariWebDriver()
         }
     }
 
-    @Test
-    void testGetEdgeWebDriver()
-    {
-        DesiredCapabilities desiredCapabilities = new DesiredCapabilities();
-        EdgeOptions edgeOptions = new EdgeOptions();
-        edgeOptions.merge(desiredCapabilities);
-        edgeOptions.setCapability("ms:inPrivate", true);
-        try (MockedConstruction<EdgeDriver> edgeDriverMock = mockConstruction(EdgeDriver.class, (mock, context) -> {
-            assertEquals(1, context.getCount());
-            assertEquals(List.of(edgeOptions), context.arguments());
-        }))
-        {
-            WebDriver actual = WebDriverType.EDGE.getWebDriver(desiredCapabilities, new WebDriverConfiguration());
-            assertEquals(edgeDriverMock.constructed().get(0), actual);
-        }
-    }
-
     @Test
     void testGetEdgeChromiumWebDriver()
     {
@@ -263,7 +246,6 @@ private static void testGetOperaWebDriver(WebDriverConfiguration configuration,
         "IEXPLORE,      false",
         "CHROME,        true",
         "SAFARI,        false",
-        "EDGE,          false",
         "EDGE_CHROMIUM, false",
         "OPERA,         true"
     })
@@ -278,7 +260,6 @@ void testIsBinaryPathSupported(WebDriverType type, boolean binaryPathSupported)
         "IEXPLORE,      true",
         "CHROME,        true",
         "SAFARI,        false",
-        "EDGE,          false",
         "EDGE_CHROMIUM, false",
         "OPERA,         true"
     })
@@ -293,7 +274,6 @@ void testIsCommandLineArgumentsSupported(WebDriverType type, boolean commandLine
         "IEXPLORE,      true",
         "CHROME,        false",
         "SAFARI,        false",
-        "EDGE,          false",
         "EDGE_CHROMIUM, false",
         "OPERA,         false"
     })
@@ -308,7 +288,6 @@ void testIsUseW3C(WebDriverType type, boolean useW3C)
         "IEXPLORE,      false",
         "CHROME,        false",
         "SAFARI,        false",
-        "EDGE,          true",
         "EDGE_CHROMIUM, true",
         "OPERA,         false"
     })
@@ -322,7 +301,6 @@ void testGetDriverSpecificCapabilities(WebDriverType type, boolean empty)
         "FIREFOX,       webdriver.gecko.driver",
         "IEXPLORE,      webdriver.ie.driver",
         "CHROME,        webdriver.chrome.driver",
-        "EDGE,          webdriver.edge.driver",
         "EDGE_CHROMIUM, webdriver.edge.driver",
         "OPERA,         webdriver.opera.driver"
     })
@@ -369,12 +347,6 @@ void testSetOperaDriverExecutablePathViaAutomaticManager()
         testSetDriverExecutablePathViaAutomaticManager(WebDriverType.OPERA, WebDriverManager::operadriver);
     }
 
-    @Test
-    void testSetEdgeDriverExecutablePathViaAutomaticManager()
-    {
-        testSetDriverExecutablePathViaAutomaticManager(WebDriverType.EDGE, WebDriverManager::edgedriver);
-    }
-
     private static void testSetDriverExecutablePathViaAutomaticManager(WebDriverType type,
             Supplier<WebDriverManager> managerSupplier)
     {

vividus-plugin-web-app/src/test/java/org/vividus/selenium/WebDriverTypeTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2020 the original author or authors.
+ * Copyright 2019-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -156,8 +156,6 @@ static Stream<Arguments> webDriverTypeChecks()
             Arguments.of(BrowserType.FIREFOX_CHROME,  WebDriverType.FIREFOX,      false  ),
             Arguments.of(BrowserType.CHROME,          WebDriverType.CHROME,       true   ),
             Arguments.of(BrowserType.FIREFOX_CHROME,  WebDriverType.CHROME,       false  ),
-            Arguments.of(BrowserType.EDGE,            WebDriverType.EDGE,         true   ),
-            Arguments.of(BrowserType.IE,              WebDriverType.EDGE,         false  ),
             Arguments.of(BrowserType.IEXPLORE,        WebDriverType.IEXPLORE,     true   ),
             Arguments.of(BrowserType.IE_HTA,          WebDriverType.IEXPLORE,     false  ),
             Arguments.of(BrowserType.SAFARI,          WebDriverType.SAFARI,       true   ),
@@ -173,7 +171,6 @@ static Stream<Arguments> webDriverTypeDetections()
             Arguments.of(BrowserType.FIREFOX_CHROME,  null                    ),
             Arguments.of(BrowserType.CHROME,          WebDriverType.CHROME    ),
             Arguments.of(BrowserType.FIREFOX_CHROME,  null                    ),
-            Arguments.of(BrowserType.EDGE,            WebDriverType.EDGE      ),
             Arguments.of(BrowserType.IE,              WebDriverType.IEXPLORE  ),
             Arguments.of(BrowserType.IEXPLORE,        WebDriverType.IEXPLORE  ),
             Arguments.of(BrowserType.IE_HTA,          null                    ),

vividus-plugin-web-app/src/test/java/org/vividus/selenium/manager/WebDriverManagerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2020 the original author or authors.
+ * Copyright 2019-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -495,8 +495,7 @@ void shouldScrollToElementOnBrowsersNotPerformingScrollAutomatically()
         when(webDriverProvider.get()).thenReturn(webDriver);
         when(((HasInputDevices) webDriver).getMouse()).thenReturn(mouse);
         when(webDriverManager.isMobile()).thenReturn(false);
-        when(webDriverManager.isTypeAnyOf(WebDriverType.SAFARI, WebDriverType.FIREFOX, WebDriverType.EDGE))
-            .thenReturn(true);
+        when(webDriverManager.isTypeAnyOf(WebDriverType.SAFARI, WebDriverType.FIREFOX)).thenReturn(true);
         mouseActions.moveToElement(locatableWebElement);
         verify(javascriptActions).scrollIntoView(locatableWebElement, true);
     }