Merge branch 'trunk' into firefox-profile

RenderMichael · web-flow · commit 5bf3f62f48ab · 2024-11-14T13:20:47.000-05:00
diff --git a/.github/workflows/ci-python.yml b/.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 --local_test_jobs 1 --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 }}
diff --git a/.skipped-tests b/.skipped-tests
@@ -31,6 +31,8 @@
 -//py:test-chrome-test/selenium/webdriver/chrome/chrome_launcher_tests.py
 -//py:test-chrome-test/selenium/webdriver/chrome/chrome_service_tests.py
 -//py:test-chrome-test/selenium/webdriver/chrome/proxy_tests.py
+-//py:test-edge-test/selenium/webdriver/edge/edge_launcher_tests.py
+-//py:test-edge-test/selenium/webdriver/edge/edge_service_tests.py
 -//rb/spec/integration/selenium/webdriver/chrome:service-chrome
 -//rb/spec/integration/selenium/webdriver/chrome:service-chrome-bidi
 -//rb/spec/integration/selenium/webdriver/chrome:service-chrome-remote
diff --git a/README.md b/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
diff --git a/java/src/org/openqa/selenium/devtools/CdpEndpointFinder.java b/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();
diff --git a/java/src/org/openqa/selenium/firefox/FirefoxDriver.java b/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;
diff --git a/javascript/node/selenium-webdriver/lib/webdriver.js b/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())
diff --git a/py/test/selenium/webdriver/common/typing_tests.py b/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"
 
 
diff --git a/py/test/selenium/webdriver/edge/__init__.py b/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.
diff --git a/py/test/selenium/webdriver/edge/conftest.py b/py/test/selenium/webdriver/edge/conftest.py
@@ -0,0 +1,21 @@
+# 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.
+
+
+def pytest_generate_tests(metafunc):
+    if "driver" in metafunc.fixturenames and metafunc.config.option.drivers:
+        metafunc.parametrize("driver", metafunc.config.option.drivers, indirect=True)
diff --git a/py/test/selenium/webdriver/edge/edge_launcher_tests.py b/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()
diff --git a/py/test/selenium/webdriver/edge/edge_service_tests.py b/py/test/selenium/webdriver/edge/edge_service_tests.py
@@ -0,0 +1,123 @@
+# 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 os
+import subprocess
+import time
+
+import pytest
+
+from selenium.common.exceptions import WebDriverException
+from selenium.webdriver.edge.service import Service
+
+
+@pytest.mark.xfail_edge(raises=WebDriverException)
+@pytest.mark.no_driver_after_test
+def test_uses_edgedriver_logging(clean_driver, driver_executable) -> None:
+    log_file = "msedgedriver.log"
+    service_args = ["--append-log"]
+
+    service = Service(
+        log_output=log_file,
+        service_args=service_args,
+        executable_path=driver_executable,
+    )
+    driver2 = None
+    try:
+        driver1 = clean_driver(service=service)
+        with open(log_file) as fp:
+            lines = len(fp.readlines())
+        driver2 = clean_driver(service=service)
+        with open(log_file) as fp:
+            assert len(fp.readlines()) >= 2 * lines
+    finally:
+        driver1.quit()
+        if driver2:
+            driver2.quit()
+        os.remove(log_file)
+
+
+@pytest.mark.no_driver_after_test
+def test_log_output_as_filename(clean_driver, driver_executable) -> None:
+    log_file = "msedgedriver.log"
+    service = Service(log_output=log_file, executable_path=driver_executable)
+    try:
+        assert "--log-path=msedgedriver.log" in service.service_args
+        driver = clean_driver(service=service)
+        with open(log_file) as fp:
+            assert "Starting Microsoft Edge WebDriver" in fp.readline()
+    finally:
+        driver.quit()
+        os.remove(log_file)
+
+
+@pytest.mark.no_driver_after_test
+def test_log_output_as_file(clean_driver, driver_executable) -> None:
+    log_name = "msedgedriver.log"
+    log_file = open(log_name, "w", encoding="utf-8")
+    service = Service(log_output=log_file, executable_path=driver_executable)
+    try:
+        driver = clean_driver(service=service)
+        time.sleep(1)
+        with open(log_name) as fp:
+            assert "Starting Microsoft Edge WebDriver" in fp.readline()
+    finally:
+        driver.quit()
+        log_file.close()
+        os.remove(log_name)
+
+
+@pytest.mark.no_driver_after_test
+def test_log_output_as_stdout(clean_driver, capfd, driver_executable) -> None:
+    service = Service(log_output=subprocess.STDOUT, executable_path=driver_executable)
+    driver = clean_driver(service=service)
+
+    out, err = capfd.readouterr()
+    assert "Starting Microsoft Edge WebDriver" in out
+    driver.quit()
+
+
+@pytest.mark.no_driver_after_test
+def test_log_output_null_default(driver, capfd) -> None:
+    out, err = capfd.readouterr()
+    assert "Starting Microsoft Edge WebDriver" not in out
+    driver.quit()
+
+
+@pytest.fixture
+def service():
+    return Service()
+
+
+@pytest.mark.usefixtures("service")
+class TestEdgeDriverService:
+    service_path = "/path/to/msedgedriver"
+
+    @pytest.fixture(autouse=True)
+    def setup_and_teardown(self):
+        os.environ["SE_EDGEDRIVER"] = self.service_path
+        yield
+        os.environ.pop("SE_EDGEDRIVER", None)
+
+    def test_uses_path_from_env_variable(self, service):
+        assert "msedgedriver" in service.path
+
+    def test_updates_path_after_setting_env_variable(self, service):
+        new_path = "/foo/bar"
+        os.environ["SE_EDGEDRIVER"] = new_path
+        service.executable_path = self.service_path  # Simulating the update
+
+        assert "msedgedriver" in service.executable_path
diff --git a/py/test/selenium/webdriver/marionette/mn_options_tests.py b/py/test/selenium/webdriver/marionette/mn_options_tests.py
