feat: support only statusCode in continueResponse (#2598)

Just a WIP for now --------- Co-authored-by: browser-automation-bot <133232582+browser-automation-bot@users.noreply.github.com>
GoogleChromeLabs · Sep 10, 2024 · 1eeff5b · 1eeff5b
1 parent 30a5920
commit 1eeff5b
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 466 deletions.
diff --git a/src/bidiMapper/modules/network/NetworkRequest.ts b/src/bidiMapper/modules/network/NetworkRequest.ts
@@ -88,6 +88,12 @@ export class NetworkRequest {
     bodySize?: number;
   };
 
+  #responseOverrides?: {
+    statusCode?: number;
+    headers?: Network.Header[];
+    cookies?: Network.CookieHeader[];
+  };
+
   #response: {
     hasExtraInfo?: boolean;
     info?: Protocol.Network.Response;
@@ -242,9 +248,10 @@ export class NetworkRequest {
   /** Returns the HTTP status code associated with this request if any. */
   get #statusCode(): number | undefined {
     return (
-      this.#response.paused?.responseStatusCode ??
+      this.#responseOverrides?.statusCode ??
+      this.#response.info?.status ??
       this.#response.extraInfo?.statusCode ??
-      this.#response.info?.status
+      this.#response.paused?.responseStatusCode
     );
   }
 
@@ -627,10 +634,18 @@ export class NetworkRequest {
         cdpFetchHeadersFromBidiNetworkHeaders(overrideHeaders);
 
       await this.#continueResponse({
-        responseCode: overrides.statusCode,
-        responsePhrase: overrides.reasonPhrase,
-        responseHeaders,
+        responseCode:
+          overrides.statusCode ?? this.#response.paused?.responseStatusCode,
+        responsePhrase:
+          overrides.reasonPhrase ?? this.#response.paused?.responseStatusText,
+        responseHeaders:
+          responseHeaders ?? this.#response.paused?.responseHeaders,
       });
+
+      this.#responseOverrides = {
+        statusCode: overrides.statusCode,
+        headers: overrideHeaders,
+      };
     }
   }
 
@@ -821,7 +836,7 @@ export class NetworkRequest {
         this.#response.info?.fromDiskCache ||
         this.#response.info?.fromPrefetchCache ||
         this.#servedFromCache,
-      headers,
+      headers: this.#responseOverrides?.headers ?? headers,
       mimeType: this.#response.info?.mimeType || '',
       bytesReceived: this.#response.info?.encodedDataLength || 0,
       headersSize: computeHeadersSize(headers),

diff --git a/tests/network/test_continue_response.py b/tests/network/test_continue_response.py
@@ -191,70 +191,6 @@ async def test_continue_response_non_blocked_request(websocket, context_id,
             })
 
 
-@pytest.mark.parametrize("continueResponseParams", [
-    {
-        "headers": [{
-            "name": "header1",
-            "value": {
-                "type": "string",
-                "value": "value1",
-            }
-        }]
-    },
-    {
-        "statusCode": 401,
-    },
-],
-                         ids=["headers-only", "statusCode-only"])
-@pytest.mark.asyncio
-async def test_continue_response_must_specify_both_status_and_headers(
-        websocket, context_id, url_example, continueResponseParams):
-    await subscribe(websocket,
-                    ["network.responseStarted", "network.responseCompleted"],
-                    [context_id])
-
-    await execute_command(
-        websocket, {
-            "method": "network.addIntercept",
-            "params": {
-                "phases": ["responseStarted"],
-                "urlPatterns": [{
-                    "type": "string",
-                    "pattern": url_example,
-                }, ],
-            },
-        })
-
-    await send_JSON_command(
-        websocket, {
-            "method": "browsingContext.navigate",
-            "params": {
-                "url": url_example,
-                "context": context_id,
-                "wait": "complete",
-            }
-        })
-
-    event_response = await wait_for_event(websocket, "network.responseStarted")
-    network_id = event_response["params"]["request"]["request"]
-
-    # TODO(https://github.com/w3c/webdriver-bidi/issues/572): Follow up with spec.
-    with pytest.raises(
-            Exception,
-            match=str({
-                "error": "unknown error",
-                "message": "Cannot override only status or headers, both should be provided"
-            })):
-        await execute_command(
-            websocket, {
-                "method": "network.continueResponse",
-                "params": {
-                    "request": network_id,
-                    "reasonPhrase": "Remember to drink water",
-                } | continueResponseParams,
-            })
-
-
 @pytest.mark.asyncio
 @pytest.mark.skip(reason="CDP does not update the response correctly")
 async def test_continue_response_completes(websocket, context_id, url_example):

diff --git a/...tadata/chromedriver/headful/webdriver/tests/bidi/network/continue_response/cookies.py.ini b/...tadata/chromedriver/headful/webdriver/tests/bidi/network/continue_response/cookies.py.ini
@@ -34,6 +34,3 @@
 
   [test_cookie_attributes_before_request_sent[same site strict\]]
     expected: FAIL
-
-  [test_no_cookie_before_request_sent]
-    expected: FAIL
diff --git a/...tadata/chromedriver/headful/webdriver/tests/bidi/network/continue_response/headers.py.ini b/...tadata/chromedriver/headful/webdriver/tests/bidi/network/continue_response/headers.py.ini
@@ -1,22 +1,4 @@
 [headers.py]
-  [test_headers[headers0\]]
-    expected: FAIL
-
-  [test_headers[headers1\]]
-    expected: FAIL
-
-  [test_headers[headers2\]]
-    expected: FAIL
-
-  [test_headers_overrides_original_headers[headers0\]]
-    expected: FAIL
-
-  [test_headers_overrides_original_headers[headers1\]]
-    expected: FAIL
-
-  [test_headers_overrides_original_headers[headers2\]]
-    expected: FAIL
-
   [test_set_cookie_header]
     expected: FAIL
 

diff --git a/.../chromedriver/headful/webdriver/tests/bidi/network/continue_response/reason_phrase.py.ini b/.../chromedriver/headful/webdriver/tests/bidi/network/continue_response/reason_phrase.py.ini
diff --git a/...ta/chromedriver/headful/webdriver/tests/bidi/network/continue_response/status_code.py.ini b/...ta/chromedriver/headful/webdriver/tests/bidi/network/continue_response/status_code.py.ini
diff --git a/...adata/chromedriver/headless/webdriver/tests/bidi/network/continue_response/cookies.py.ini b/...adata/chromedriver/headless/webdriver/tests/bidi/network/continue_response/cookies.py.ini
@@ -34,6 +34,3 @@
 
   [test_cookie_attributes_before_request_sent[same site strict\]]
     expected: FAIL
-
-  [test_no_cookie_before_request_sent]
-    expected: FAIL
diff --git a/...adata/chromedriver/headless/webdriver/tests/bidi/network/continue_response/headers.py.ini b/...adata/chromedriver/headless/webdriver/tests/bidi/network/continue_response/headers.py.ini
@@ -1,22 +1,4 @@
 [headers.py]
-  [test_headers[headers0\]]
-    expected: FAIL
-
-  [test_headers[headers1\]]
-    expected: FAIL
-
-  [test_headers[headers2\]]
-    expected: FAIL
-
-  [test_headers_overrides_original_headers[headers0\]]
-    expected: FAIL
-
-  [test_headers_overrides_original_headers[headers1\]]
-    expected: FAIL
-
-  [test_headers_overrides_original_headers[headers2\]]
-    expected: FAIL
-
   [test_set_cookie_header]
     expected: FAIL
 

diff --git a/...chromedriver/headless/webdriver/tests/bidi/network/continue_response/reason_phrase.py.ini b/...chromedriver/headless/webdriver/tests/bidi/network/continue_response/reason_phrase.py.ini