Merge branch 'trunk' into pinned-browser-updates

Author: VietND96

.github/workflows/ci-python.yml

@@ -100,13 +100,35 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - browser: safari
-            os: macos
           - browser: chrome
+            os: ubuntu
+          - browser: edge
+            os: ubuntu
+          - browser: firefox
+            os: ubuntu
+    with:
+      name: Integration Tests (${{ matrix.browser }}, ${{ matrix.os }})
+      browser: ${{ matrix.browser }}
+      os: ${{ matrix.os }}
+      cache-key: py-browser-${{ matrix.browser }}
+      run: |
+        bazel test --flaky_test_attempts 3 //py:common-${{ matrix.browser }}-bidi
+        bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-${{ matrix.browser }}
+
+  safari-tests:
+    name: Browser Tests
+    needs: build
+    uses: ./.github/workflows/bazel.yml
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - browser: safari
             os: macos
     with:
       name: Integration Tests (${{ matrix.browser }}, ${{ matrix.os }})
       browser: ${{ matrix.browser }}
       os: ${{ matrix.os }}
       cache-key: py-browser-${{ matrix.browser }}
-      run: bazel test --flaky_test_attempts 3 //py:test-${{ matrix.browser }}
+      run: |
+        bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-${{ matrix.browser }}

README.md

@@ -317,6 +317,18 @@ Run unit tests with:
 bazel test //py:unit
 ```
 
+To run common tests with a specific browser:
+
+```sh
+bazel test //py:common-<browsername>
+```
+
+To run common tests with a specific browser (include BiDi tests):
+
+```sh
+bazel test //py:common-<browsername>-bidi
+```
+
 To run tests with a specific browser:
 
 ```sh

java/src/org/openqa/selenium/devtools/CdpEndpointFinder.java

@@ -91,6 +91,9 @@ public static Optional<URI> getReportedUri(Capabilities caps) {
         break;
       case "firefox":
         key = "moz:debuggerAddress";
+        LOG.warning(
+            "CDP support for Firefox is deprecated and will be removed in future versions. "
+                + "Please switch to WebDriver BiDi.");
         break;
       default:
         return Optional.empty();

java/src/org/openqa/selenium/firefox/FirefoxDriver.java

@@ -164,6 +164,13 @@ private FirefoxDriver(
 
     Optional<URI> reportedUri =
         CdpEndpointFinder.getReportedUri("moz:debuggerAddress", capabilities);
+
+    if (reportedUri.isPresent()) {
+      LOG.warning(
+          "CDP support for Firefox is deprecated and will be removed in future versions. "
+              + "Please switch to WebDriver BiDi.");
+    }
+
     Optional<HttpClient> client =
         reportedUri.map(uri -> CdpEndpointFinder.getHttpClient(factory, uri));
     Optional<URI> cdpUri;

javascript/node/selenium-webdriver/lib/webdriver.js

@@ -1230,6 +1230,12 @@ class WebDriver {
 
     const caps = await this.getCapabilities()
 
+    if (caps['map_'].get('browserName') === 'firefox') {
+      console.warn(
+        'CDP support for Firefox is deprecated and will be removed in future versions. Please switch to WebDriver BiDi.',
+      )
+    }
+
     if (process.env.SELENIUM_REMOTE_URL) {
       const host = new URL(process.env.SELENIUM_REMOTE_URL).host
       const sessionId = await this.getSession().then((session) => session.getId())

py/test/selenium/webdriver/common/typing_tests.py

@@ -19,6 +19,8 @@
 
 from selenium.webdriver.common.by import By
 from selenium.webdriver.common.keys import Keys
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.wait import WebDriverWait
 
 
 def test_should_fire_key_press_events(driver, pages):
@@ -49,6 +51,7 @@ def test_should_type_lower_case_letters(driver, pages):
     pages.load("javascriptPage.html")
     keyReporter = driver.find_element(by=By.ID, value="keyReporter")
     keyReporter.send_keys("abc def")
+    WebDriverWait(driver, 2).until(EC.text_to_be_present_in_element_value((By.ID, "keyReporter"), "abc def"))
     assert keyReporter.get_attribute("value") == "abc def"
 
 
@@ -98,6 +101,7 @@ def test_should_be_able_to_use_arrow_keys(driver, pages):
     pages.load("javascriptPage.html")
     keyReporter = driver.find_element(by=By.ID, value="keyReporter")
     keyReporter.send_keys("Tet", Keys.ARROW_LEFT, "s")
+    WebDriverWait(driver, 2).until(EC.text_to_be_present_in_element_value((By.ID, "keyReporter"), "Test"))
     assert keyReporter.get_attribute("value") == "Test"
 
 
@@ -212,6 +216,7 @@ def test_lower_case_alpha_keys(driver, pages):
     element = driver.find_element(by=By.ID, value="keyReporter")
     lowerAlphas = "abcdefghijklmnopqrstuvwxyz"
     element.send_keys(lowerAlphas)
+    WebDriverWait(driver, 2).until(EC.text_to_be_present_in_element_value((By.ID, "keyReporter"), lowerAlphas))
     assert element.get_attribute("value") == lowerAlphas
 
 
@@ -235,7 +240,7 @@ def test_all_printable_keys(driver, pages):
     element = driver.find_element(by=By.ID, value="keyReporter")
     allPrintable = "!\"#$%&'()*+,-./0123456789:<=>?@ ABCDEFGHIJKLMNOPQRSTUVWXYZ [\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
     element.send_keys(allPrintable)
-
+    WebDriverWait(driver, 2).until(EC.text_to_be_present_in_element_value((By.ID, "keyReporter"), allPrintable))
     assert element.get_attribute("value") == allPrintable
     assert "up: 16" in result.text.strip()
 
@@ -282,6 +287,7 @@ def test_special_space_keys(driver, pages):
     pages.load("javascriptPage.html")
     element = driver.find_element(by=By.ID, value="keyReporter")
     element.send_keys("abcd" + Keys.SPACE + "fgh" + Keys.SPACE + "ij")
+    WebDriverWait(driver, 2).until(EC.text_to_be_present_in_element_value((By.ID, "keyReporter"), "abcd fgh ij"))
     assert element.get_attribute("value") == "abcd fgh ij"
 
 

py/test/selenium/webdriver/edge/__init__.py

@@ -0,0 +1,16 @@
+# Licensed to the Software Freedom Conservancy (SFC) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The SFC licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.

py/test/selenium/webdriver/edge/edge_launcher_tests.py

@@ -0,0 +1,34 @@
+# Licensed to the Software Freedom Conservancy (SFC) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The SFC licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+import pytest
+
+
+@pytest.mark.no_driver_after_test
+def test_launch_and_close_browser(clean_driver, clean_service):
+    driver = clean_driver(service=clean_service)
+    driver.quit()
+
+
+@pytest.mark.no_driver_after_test
+def test_we_can_launch_multiple_edge_instances(clean_driver, clean_service):
+    driver1 = clean_driver(service=clean_service)
+    driver2 = clean_driver(service=clean_service)
+    driver3 = clean_driver(service=clean_service)
+    driver1.quit()
+    driver2.quit()
+    driver3.quit()

py/test/selenium/webdriver/marionette/mn_options_tests.py

@@ -41,20 +41,20 @@ def test_we_can_pass_options(self, driver, pages):
 class TestUnit:
     def test_ctor(self):
         opts = Options()
-        assert opts._binary is None
-        assert not opts._preferences
+        assert opts.binary_location == ""
+        assert opts._preferences == {"remote.active-protocols": 3}
         assert opts._profile is None
         assert not opts._arguments
         assert isinstance(opts.log, Log)
 
     def test_binary(self):
         opts = Options()
-        assert opts.binary is None
+        assert opts.binary_location == ""
 
         other_binary = FirefoxBinary()
-        assert other_binary != opts.binary
+        assert other_binary != opts.binary_location
         opts.binary = other_binary
-        assert other_binary == opts.binary
+        assert other_binary._start_cmd == opts.binary_location
 
         path = "/path/to/binary"
         opts.binary = path
@@ -63,16 +63,16 @@ def test_binary(self):
 
     def test_prefs(self):
         opts = Options()
-        assert len(opts.preferences) == 0
+        assert len(opts.preferences) == 1
         assert isinstance(opts.preferences, dict)
 
         opts.set_preference("spam", "ham")
-        assert len(opts.preferences) == 1
-        opts.set_preference("eggs", True)
         assert len(opts.preferences) == 2
+        opts.set_preference("eggs", True)
+        assert len(opts.preferences) == 3
         opts.set_preference("spam", "spam")
-        assert len(opts.preferences) == 2
-        assert opts.preferences == {"spam": "spam", "eggs": True}
+        assert len(opts.preferences) == 3
+        assert opts.preferences == {"eggs": True, "remote.active-protocols": 3, "spam": "spam"}
 
     def test_profile(self, tmpdir_factory):
         opts = Options()
@@ -99,7 +99,12 @@ def test_arguments(self):
     def test_to_capabilities(self):
         opts = Options()
         firefox_caps = DesiredCapabilities.FIREFOX.copy()
-        firefox_caps.update({"pageLoadStrategy": PageLoadStrategy.normal})
+        firefox_caps.update(
+            {
+                "pageLoadStrategy": PageLoadStrategy.normal,
+                "moz:firefoxOptions": {"prefs": {"remote.active-protocols": 3}},
+            }
+        )
         assert opts.to_capabilities() == firefox_caps
 
         profile = FirefoxProfile()