Merge branch 'trunk' into mfest

sandeepsuryaprasad · web-flow · commit b149a630571a · 2024-11-04T20:31:13.000+05:30
diff --git a/.github/workflows/ci-python.yml b/.github/workflows/ci-python.yml
@@ -96,5 +96,4 @@ jobs:
       browser: safari
       os: macos
       cache-key: py-safari
-      run: |
-        bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-safari-test/selenium/webdriver/safari/launcher_tests.py
+      run: bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-safari
diff --git a/java/src/org/openqa/selenium/netty/server/RequestConverter.java b/java/src/org/openqa/selenium/netty/server/RequestConverter.java
@@ -96,7 +96,7 @@ protected void channelRead0(ChannelHandlerContext ctx, HttpObject msg) throws Ex
       length = -1;
     }
 
-    if (msg instanceof HttpContent) {
+    if (request != null && msg instanceof HttpContent) {
       ByteBuf buf = ((HttpContent) msg).content().retain();
       int nBytes = buf.readableBytes();
 
diff --git a/py/selenium/webdriver/remote/webelement.py b/py/selenium/webdriver/remote/webelement.py
@@ -173,6 +173,13 @@ def get_attribute(self, name) -> str | None:
             # Check if the "active" CSS class is applied to an element.
             is_active = "active" in target_element.get_attribute("class")
         """
+
+        warnings.warn(
+            "using WebElement.get_attribute() has been deprecated. Please use get_dom_attribute() instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+
         if getAttribute_js is None:
             _load_js()
         attribute_value = self.parent.execute_script(
diff --git a/py/test/selenium/webdriver/common/alerts_tests.py b/py/test/selenium/webdriver/common/alerts_tests.py
@@ -294,6 +294,7 @@ def test_alert_should_not_allow_additional_commands_if_dismissed(driver, pages):
 @pytest.mark.xfail_remote(reason="https://bugzilla.mozilla.org/show_bug.cgi?id=1279211")
 @pytest.mark.xfail_chrome
 @pytest.mark.xfail_edge
+@pytest.mark.xfail_safari
 def test_unexpected_alert_present_exception_contains_alert_text(driver, pages):
     pages.load("alerts.html")
     driver.find_element(by=By.ID, value="alert").click()
diff --git a/py/test/selenium/webdriver/common/api_example_tests.py b/py/test/selenium/webdriver/common/api_example_tests.py
@@ -240,6 +240,7 @@ def test_is_element_displayed(driver, pages):
 
 
 @pytest.mark.xfail_chrome
+@pytest.mark.xfail_safari
 def test_move_window_position(driver, pages):
     pages.load("blank.html")
     loc = driver.get_window_position()
diff --git a/py/test/selenium/webdriver/common/bidi_tests.py b/py/test/selenium/webdriver/common/bidi_tests.py
@@ -18,7 +18,6 @@
 
 from selenium.webdriver.common.by import By
 from selenium.webdriver.common.log import Log
-from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import WebDriverWait
 
 
@@ -76,8 +75,6 @@ async def test_collect_log_mutations(driver, pages):
             WebDriverWait(driver, 10).until(
                 lambda d: d.find_element(By.ID, "revealed").value_of_css_property("display") != "none"
             )
-            WebDriverWait(driver, 5).until(EC.visibility_of(driver.find_element(By.ID, "revealed")))
-
     assert event["attribute_name"] == "style"
     assert event["current_value"] == ""
     assert event["old_value"] == "display:none;"
diff --git a/py/test/selenium/webdriver/common/interactions_tests.py b/py/test/selenium/webdriver/common/interactions_tests.py
@@ -253,6 +253,7 @@ def test_can_pause(driver, pages):
 
 @pytest.mark.xfail_firefox
 @pytest.mark.xfail_remote
+@pytest.mark.xfail_safari
 def test_can_scroll_to_element(driver, pages):
     pages.load("scrolling_tests/frame_with_nested_scrolling_frame_out_of_view.html")
     iframe = driver.find_element(By.TAG_NAME, "iframe")
@@ -266,6 +267,7 @@ def test_can_scroll_to_element(driver, pages):
 
 @pytest.mark.xfail_firefox
 @pytest.mark.xfail_remote
+@pytest.mark.xfail_safari
 def test_can_scroll_from_element_by_amount(driver, pages):
     pages.load("scrolling_tests/frame_with_nested_scrolling_frame_out_of_view.html")
     iframe = driver.find_element(By.TAG_NAME, "iframe")
@@ -280,6 +282,7 @@ def test_can_scroll_from_element_by_amount(driver, pages):
 
 @pytest.mark.xfail_firefox
 @pytest.mark.xfail_remote
+@pytest.mark.xfail_safari
 def test_can_scroll_from_element_with_offset_by_amount(driver, pages):
     pages.load("scrolling_tests/frame_with_nested_scrolling_frame_out_of_view.html")
     footer = driver.find_element(By.TAG_NAME, "footer")
@@ -314,6 +317,7 @@ def test_can_scroll_from_viewport_by_amount(driver, pages):
     assert _in_viewport(driver, footer)
 
 
+@pytest.mark.xfail_safari
 def test_can_scroll_from_viewport_with_offset_by_amount(driver, pages):
     pages.load("scrolling_tests/frame_with_nested_scrolling_frame.html")
     scroll_origin = ScrollOrigin.from_viewport(10, 10)
diff --git a/py/test/selenium/webdriver/common/interactions_with_device_tests.py b/py/test/selenium/webdriver/common/interactions_with_device_tests.py
@@ -247,6 +247,7 @@ def test_can_pause_with_pointer(driver, pages):
 
 @pytest.mark.xfail_firefox
 @pytest.mark.xfail_remote
+@pytest.mark.xfail_safari
 def test_can_scroll_to_element_with_wheel(driver, pages):
     pages.load("scrolling_tests/frame_with_nested_scrolling_frame_out_of_view.html")
     iframe = driver.find_element(By.TAG_NAME, "iframe")
@@ -262,6 +263,7 @@ def test_can_scroll_to_element_with_wheel(driver, pages):
 
 @pytest.mark.xfail_firefox
 @pytest.mark.xfail_remote
+@pytest.mark.xfail_safari
 def test_can_scroll_from_element_by_amount_with_wheel(driver, pages):
     pages.load("scrolling_tests/frame_with_nested_scrolling_frame_out_of_view.html")
     iframe = driver.find_element(By.TAG_NAME, "iframe")
@@ -278,6 +280,7 @@ def test_can_scroll_from_element_by_amount_with_wheel(driver, pages):
 
 @pytest.mark.xfail_firefox
 @pytest.mark.xfail_remote
+@pytest.mark.xfail_safari
 def test_can_scroll_from_element_with_offset_by_amount_with_wheel(driver, pages):
     pages.load("scrolling_tests/frame_with_nested_scrolling_frame_out_of_view.html")
     footer = driver.find_element(By.TAG_NAME, "footer")
@@ -320,6 +323,7 @@ def test_can_scroll_from_viewport_by_amount_with_wheel(driver, pages):
 
 
 @pytest.mark.xfail_firefox
+@pytest.mark.xfail_safari
 def test_can_scroll_from_viewport_with_offset_by_amount_with_wheel(driver, pages):
     pages.load("scrolling_tests/frame_with_nested_scrolling_frame.html")
     scroll_origin = ScrollOrigin.from_viewport(10, 10)
diff --git a/py/test/selenium/webdriver/common/position_and_size_tests.py b/py/test/selenium/webdriver/common/position_and_size_tests.py
@@ -53,6 +53,7 @@ def test_should_get_coordinates_of_an_invisible_element(driver, pages):
     _check_location(element.location, x=0, y=0)
 
 
+@pytest.mark.xfail_safari
 def test_should_scroll_page_and_get_coordinates_of_an_element_that_is_out_of_view_port(driver, pages):
     pages.load("coordinates_tests/page_with_element_out_of_view.html")
     element = driver.find_element(By.ID, "box")
@@ -89,6 +90,7 @@ def test_should_get_coordinates_of_an_element_in_anested_frame(driver, pages):
     _check_location(element.location, x=10, y=10)
 
 
+@pytest.mark.xfail_safari
 def test_should_get_coordinates_of_an_element_with_fixed_position(driver, pages):
     pages.load("coordinates_tests/page_with_fixed_element.html")
     element = driver.find_element(By.ID, "fixed")
diff --git a/py/test/selenium/webdriver/common/selenium_manager_tests.py b/py/test/selenium/webdriver/common/selenium_manager_tests.py
@@ -15,6 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import json
+import platform
 import sys
 from pathlib import Path
 from unittest import mock
@@ -59,10 +60,14 @@ def test_uses_windows(monkeypatch):
 
 def test_uses_linux(monkeypatch):
     monkeypatch.setattr(sys, "platform", "linux")
-    binary = SeleniumManager()._get_binary()
 
-    project_root = Path(selenium.__file__).parent.parent
-    assert binary == project_root.joinpath("selenium/webdriver/common/linux/selenium-manager")
+    if platform.machine() == "arm64":
+        with pytest.raises(WebDriverException, match="Unsupported platform/architecture combination: linux/arm64"):
+            SeleniumManager()._get_binary()
+    else:
+        binary = SeleniumManager()._get_binary()
+        project_root = Path(selenium.__file__).parent.parent
+        assert binary == project_root.joinpath("selenium/webdriver/common/linux/selenium-manager")
 
 
 def test_uses_mac(monkeypatch):
diff --git a/py/test/selenium/webdriver/common/upload_tests.py b/py/test/selenium/webdriver/common/upload_tests.py
@@ -16,44 +16,48 @@
 # under the License.
 
 import os
+import textwrap
 
 import pytest
 
 from selenium.webdriver.common.by import By
 from selenium.webdriver.remote.webelement import WebElement
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.wait import WebDriverWait
 
 
 @pytest.fixture
 def get_local_path():
     current_dir = os.path.dirname(os.path.realpath(__file__))
 
     def wrapped(filename):
-        return os.path.join(current_dir, filename)
+        full_path = os.path.join(current_dir, filename)
+        return textwrap.fill(full_path, width=512)
 
     return wrapped
 
 
+@pytest.mark.xfail_safari
 def test_can_upload_file(driver, pages, get_local_path):
     pages.load("upload.html")
 
     driver.find_element(By.ID, "upload").send_keys(get_local_path("test_file.txt"))
     driver.find_element(By.ID, "go").click()
     driver.switch_to.frame(driver.find_element(By.ID, "upload_target"))
-    body = driver.find_element(By.CSS_SELECTOR, "body").text
 
-    assert "test_file.txt" in body
+    WebDriverWait(driver, 10).until(EC.text_to_be_present_in_element((By.CSS_SELECTOR, "body"), "test_file.txt"))
 
 
+@pytest.mark.xfail_safari
 def test_can_upload_two_files(driver, pages, get_local_path):
     pages.load("upload.html")
     two_file_paths = get_local_path("test_file.txt") + "\n" + get_local_path("test_file2.txt")
     driver.find_element(By.ID, "upload").send_keys(two_file_paths)
     driver.find_element(By.ID, "go").click()
     driver.switch_to.frame(driver.find_element(By.ID, "upload_target"))
-    body = driver.find_element(By.CSS_SELECTOR, "body").text
 
-    assert "test_file.txt" in body
-    assert "test_file2.txt" in body
+    WebDriverWait(driver, 10).until(EC.text_to_be_present_in_element((By.CSS_SELECTOR, "body"), "test_file.txt"))
+    WebDriverWait(driver, 10).until(EC.text_to_be_present_in_element((By.CSS_SELECTOR, "body"), "test_file2.txt"))
 
 
 @pytest.mark.xfail_firefox
diff --git a/py/test/selenium/webdriver/common/w3c_interaction_tests.py b/py/test/selenium/webdriver/common/w3c_interaction_tests.py
@@ -176,6 +176,7 @@ def test_dragging_element_with_mouse_fires_events(driver, pages):
 
 @pytest.mark.xfail_firefox
 @pytest.mark.xfail_remote
+@pytest.mark.xfail_safari
 def test_pen_pointer_properties(driver, pages):
     pages.load("pointerActionsPage.html")
 
@@ -223,6 +224,7 @@ def test_pen_pointer_properties(driver, pages):
 
 @pytest.mark.xfail_firefox
 @pytest.mark.xfail_remote
+@pytest.mark.xfail_safari
 def test_touch_pointer_properties(driver, pages):
     pages.load("pointerActionsPage.html")
     pointerArea = driver.find_element(By.CSS_SELECTOR, "#pointerArea")
diff --git a/py/test/selenium/webdriver/common/webdriverwait_tests.py b/py/test/selenium/webdriver/common/webdriverwait_tests.py
@@ -35,6 +35,7 @@ def throw_sere(driver):
 
 @pytest.mark.xfail_chrome(reason="https://bugs.chromium.org/p/chromedriver/issues/detail?id=4743")
 @pytest.mark.xfail_edge(reason="https://bugs.chromium.org/p/chromedriver/issues/detail?id=4743")
+@pytest.mark.xfail_safari
 def test_should_fail_with_invalid_selector_exception(driver, pages):
     pages.load("dynamic.html")
     with pytest.raises(InvalidSelectorException):
diff --git a/py/test/selenium/webdriver/common/webserver.py b/py/test/selenium/webdriver/common/webserver.py
@@ -59,62 +59,56 @@ def updir():
 
 
 class HtmlOnlyHandler(BaseHTTPRequestHandler):
-    """Http handler."""
+    """Handler for HTML responses and JSON files."""
+
+    def _serve_page(self, page_number):
+        """Serve a dynamically generated HTML page."""
+        html = f"""<html><head><title>Page{page_number}</title></head>
+        <body>Page number <span id="pageNumber">{page_number}</span>
+        <p><a href="../xhtmlTest.html" target="_top">top</a></p>
+        </body></html>"""
+        return html.encode("utf-8")
+
+    def _serve_file(self, file_path):
+        """Serve a file from the HTML root directory."""
+        with open(file_path, encoding="latin-1") as f:
+            return f.read().encode("utf-8")
+
+    def _send_response(self, content_type="text/html"):
+        """Send a response."""
+        self.send_response(200)
+        self.send_header("Content-type", content_type)
+        self.end_headers()
 
     def do_GET(self):
         """GET method handler."""
         try:
             path = self.path[1:].split("?")[0]
-            if path[:5] == "page/":
-                html = """<html><head><title>Page{page_number}</title></head>
-                <body>Page number <span id=\"pageNumber\">{page_number}</span>
-                <p><a href=\"../xhtmlTest.html\" target=\"_top\">top</a>
-                </body></html>""".format(
-                    page_number=path[5:]
-                )
-                html = html.encode("utf-8")
+            file_path = os.path.join(HTML_ROOT, path)
+            if path.startswith("page/"):
+                html = self._serve_page(path[5:])
+                self._send_response("text/html")
+                self.wfile.write(html)
+            elif os.path.isfile(file_path):
+                content_type = "application/json" if file_path.endswith(".json") else "text/html"
+                content = self._serve_file(file_path)
+                self._send_response(content_type)
+                self.wfile.write(content)
             else:
-                with open(os.path.join(HTML_ROOT, path), encoding="latin-1") as f:
-                    html = f.read().encode("utf-8")
-            self.send_response(200)
-            self.send_header("Content-type", "text/html")
-            self.end_headers()
-            self.wfile.write(html)
+                self.send_error(404, f"File Not Found: {path}")
         except OSError:
             self.send_error(404, f"File Not Found: {path}")
 
     def do_POST(self):
         """POST method handler."""
         try:
             remaining_bytes = int(self.headers["content-length"])
-            contents = ""
-            line = self.rfile.readline()
-            contents += line.decode("utf-8")
-            remaining_bytes -= len(line)
-            line = self.rfile.readline()
-            contents += line.decode("utf-8")
-            remaining_bytes -= len(line)
-            fn = re.findall(r'Content-Disposition.*name="upload"; filename="(.*)"', line.decode("utf-8"))
-            if not fn:
-                self.send_error(500, f"File not found. {contents}")
+            contents = self.rfile.read(remaining_bytes).decode("utf-8")
+            fn_match = re.search(r'Content-Disposition.*name="upload"; filename="(.*)"', contents)
+            if not fn_match:
+                self.send_error(500, f"File not found in content. {contents}")
                 return
-            line = self.rfile.readline()
-            remaining_bytes -= len(line)
-            contents += line.decode("utf-8")
-            line = self.rfile.readline()
-            remaining_bytes -= len(line)
-            contents += line.decode("utf-8")
-            preline = self.rfile.readline()
-            remaining_bytes -= len(preline)
-            while remaining_bytes > 0:
-                line = self.rfile.readline()
-                remaining_bytes -= len(line)
-                contents += line.decode("utf-8")
-
-            self.send_response(200)
-            self.send_header("Content-type", "text/html")
-            self.end_headers()
-
+            self._send_response("text/html")
             self.wfile.write(
                 f"""<!doctype html>
                 {contents}
diff --git a/py/test/selenium/webdriver/common/window_switching_tests.py b/py/test/selenium/webdriver/common/window_switching_tests.py
@@ -130,6 +130,7 @@ def test_should_throw_no_such_window_exception_on_any_element_operation_if_awind
         element.text
 
 
+@pytest.mark.xfail_safari
 def test_clicking_on_abutton_that_closes_an_open_window_does_not_cause_the_browser_to_hang(driver, pages):
     pages.load("xhtmlTest.html")
     current = driver.current_window_handle
diff --git a/py/test/selenium/webdriver/safari/__init__.py b/py/test/selenium/webdriver/safari/__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/safari/safari_service_tests.py b/py/test/selenium/webdriver/safari/safari_service_tests.py

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ protected void channelRead0(ChannelHandlerContext ctx, HttpObject msg) throws Ex`
`96`	`96`	`length = -1;`
`97`	`97`	`}`
`98`	`98`
`99`		`- if (msg instanceof HttpContent) {`
	`99`	`+ if (request != null && msg instanceof HttpContent) {`
`100`	`100`	`ByteBuf buf = ((HttpContent) msg).content().retain();`
`101`	`101`	`int nBytes = buf.readableBytes();`
`102`	`102`