Merge branch 'trunk' into syber911911-feature-branch

Author: syber911911

java/src/org/openqa/selenium/grid/node/config/DriverServiceSessionFactory.java

@@ -308,12 +308,13 @@ private Capabilities readPrefixedCaps(Capabilities requestedCaps, Capabilities r
     Map<String, Object> requestedCapsMap = requestedCaps.asMap();
     Map<String, Object> returnedCapsMap = returnedCaps.asMap();
 
-    requestedCapsMap.forEach(
-        (k, v) -> {
-          if (k.startsWith("se:") && !returnedCapsMap.containsKey(k)) {
-            returnPrefixedCaps.setCapability(k, v);
-          }
-        });
+    for (Map.Entry<String, Object> entry : requestedCapsMap.entrySet()) {
+      String key = entry.getKey();
+      Object value = entry.getValue();
+      if (key.startsWith("se:") && !returnedCapsMap.containsKey(key)) {
+        returnPrefixedCaps = returnPrefixedCaps.setCapability(key, value);
+      }
+    }
 
     return returnPrefixedCaps;
   }

java/test/org/openqa/selenium/bidi/input/DefaultKeyboardTest.java

@@ -198,9 +198,6 @@ void canGenerateKeyboardShortcuts() {
   }
 
   @Test
-  @NotYetImplemented(
-      value = CHROME,
-      reason = "https://github.com/GoogleChromeLabs/chromium-bidi/issues/2321")
   @NotYetImplemented(
       value = EDGE,
       reason = "https://github.com/GoogleChromeLabs/chromium-bidi/issues/2321")

py/test/selenium/webdriver/common/api_example_tests.py

@@ -257,6 +257,7 @@ def test_move_window_position(driver, pages):
     assert loc["y"] == new_y
 
 
+@pytest.mark.xfail_edge(reason="Window does not resize")
 def test_change_window_size(driver, pages):
     pages.load("blank.html")
     size = driver.get_window_size()