[grid] Matching webview2 browser name with EdgeDriverService

diemol · diemol · commit 2d36ea2cd98a · 2022-02-23T15:06:17.000+01:00
This is to support https://docs.microsoft.com/en-us/microsoft-edge/webview2/how-to/webdriver #9714
diff --git a/java/src/org/openqa/selenium/edge/EdgeDriverInfo.java b/java/src/org/openqa/selenium/edge/EdgeDriverInfo.java
@@ -16,7 +16,11 @@
 // under the License.
 package org.openqa.selenium.edge;
 
+import static org.openqa.selenium.remote.Browser.EDGE;
+import static org.openqa.selenium.remote.CapabilityType.BROWSER_NAME;
+
 import com.google.auto.service.AutoService;
+
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.ImmutableCapabilities;
 import org.openqa.selenium.SessionNotCreatedException;
@@ -25,12 +29,8 @@
 import org.openqa.selenium.WebDriverInfo;
 import org.openqa.selenium.chromium.ChromiumDriverInfo;
 
-import java.util.Objects;
 import java.util.Optional;
 
-import static org.openqa.selenium.remote.Browser.EDGE;
-import static org.openqa.selenium.remote.CapabilityType.BROWSER_NAME;
-
 @AutoService(WebDriverInfo.class)
 public class EdgeDriverInfo extends ChromiumDriverInfo {
 
@@ -46,7 +46,9 @@ public Capabilities getCanonicalCapabilities() {
 
   @Override
   public boolean isSupporting(Capabilities capabilities) {
+    //webview2 - support https://docs.microsoft.com/en-us/microsoft-edge/webview2/how-to/webdriver
     return EDGE.is(capabilities.getBrowserName())
+           || "webview2".equalsIgnoreCase(capabilities.getBrowserName())
            || capabilities.getCapability("ms:edgeOptions") != null
            || capabilities.getCapability("edgeOptions") != null;
   }
diff --git a/java/src/org/openqa/selenium/edge/EdgeDriverService.java b/java/src/org/openqa/selenium/edge/EdgeDriverService.java
@@ -16,7 +16,12 @@
 // under the License.
 package org.openqa.selenium.edge;
 
+import static java.util.Collections.unmodifiableList;
+import static java.util.Collections.unmodifiableMap;
+import static org.openqa.selenium.remote.Browser.EDGE;
+
 import com.google.auto.service.AutoService;
+
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.remote.service.DriverService;
@@ -28,11 +33,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
-
-import static java.util.Collections.unmodifiableList;
-import static java.util.Collections.unmodifiableMap;
-import static org.openqa.selenium.remote.Browser.EDGE;
 
 /**
  * Manages the life and death of the EdgeDriver (MicrosoftWebDriver or MSEdgeDriver).
@@ -125,6 +125,11 @@ public int score(Capabilities capabilities) {
         score++;
       }
 
+      //webview2 - support https://docs.microsoft.com/en-us/microsoft-edge/webview2/how-to/webdriver
+      if ("webview2".equalsIgnoreCase(capabilities.getBrowserName())) {
+        score++;
+      }
+
       if (capabilities.getCapability(EdgeOptions.CAPABILITY) != null) {
         score++;
       }
