Removed unused Response functionality - refined tests. All that fails is continue_request and continue_with_auth

Author: shbenzer

py/selenium/webdriver/common/bidi/network.py

@@ -300,38 +300,4 @@ def continue_request(self, **kwargs):
         if self.url is not None:
             params["url"] = self.url
 
-        self.network.conn.execute(self.command_builder("network.continueWithRequest", params))
-
-
-class Response:
-    """Represents an intercepted network response."""
-
-    def __init__(self, request_id, url, status_code, headers, body, network: Network):
-        self.request_id = request_id
-        self.url = url
-        self.status_code = status_code
-        self.headers = headers
-        self.body = body
-        self.conn = network
-
-    def command_builder(self, method, params):
-        """Build a command iterator to send to the network.
-
-        Parameters:
-        ----------
-            method (str): The method to execute.
-            params (dict): The parameters to pass to the method.
-        """
-        command = {"method": method, "params": params}
-        cmd = yield command
-        return cmd
-
-    # def continue_response(self):
-    #     """Continue after receiving a response."""
-    #     params = {"requestId": self.request_id, "status": self.status_code}
-    #     if self.headers is not None:
-    #         params["headers"] = self.headers
-    #     if self.body is not None:
-    #         params["body"] = self.body
-    #     command = {"method": "network.continueResponse", "params": params}
-    #     self.network.conn.execute(self._command_iterator(command))
+        self.network.conn.execute(self.command_builder("network.continueWithRequest", params))

py/test/selenium/webdriver/common/bidi_network_tests.py

@@ -38,23 +38,8 @@ def test_remove_intercept(driver):
     driver.network.remove_intercept(result["intercept"])
     assert driver.network.intercepts == [], "Intercept not removed"
 
-
 @pytest.mark.xfail_safari
-def test_add_request_handler(driver, pages):
-
-    requests = []
-
-    def callback(request):
-        requests.append(request)
-
-    callback_id = driver.network.add_request_handler("before_request", callback)
-    assert callback_id is not None, "Request handler not added"
-    driver.get("http://www.google.com")
-    assert requests, "No requests intercepted"
-
-
-@pytest.mark.xfail_safari
-def test_remove_request_handler(driver, pages):
+def test_add_and_remove_request_handler(driver, pages):
 
     requests = []
 
@@ -64,9 +49,9 @@ def callback(request):
     callback_id = driver.network.add_request_handler("before_request", callback)
     assert callback_id is not None, "Request handler not added"
     driver.network.remove_request_handler("before_request", callback_id)
-    driver.get("http://www.google.com")
-    assert not requests, "No requests intercepted"
-
+    pages.load("formPage.html")
+    assert not requests, "Requests intercepted"
+    assert driver.find_element(By.NAME, "login").is_displayed(), "Request not continued"
 
 @pytest.mark.xfail_safari
 def test_continue_request(driver, pages):
@@ -76,8 +61,8 @@ def callback(request: Request):
 
     callback_id = driver.network.add_request_handler("before_request", callback)
     assert callback_id is not None, "Request handler not added"
-    driver.get("http://www.google.com")
-    assert driver.title == "Site is not secure", "Request not continued"
+    pages.load("formPage.html")
+    assert driver.find_element(By.NAME, "login").is_displayed(), "Request not continued"
 
 
 @pytest.mark.xfail_safari
@@ -86,4 +71,4 @@ def test_continue_with_auth(driver, pages):
     callback_id = driver.network.add_auth_handler("test", "test")
     assert callback_id is not None, "Request handler not added"
     pages.load("basicAuth")
-    assert driver.find_element(By.TAG_NAME, "h1").text == "authorized", "Authorization failed"
+    assert driver.find_element(By.TAG_NAME, "h1").text == "authorized", "Authorization failed"