fix: add fragment to url (#2079)

Closes #2077 --------- Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Lightning00Blade <Lightning00Blade@users.noreply.github.com>
GoogleChromeLabs · Mar 27, 2024 · d416b6c · d416b6c
1 parent d37d406
commit d416b6c
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 30 deletions.
diff --git a/src/bidiMapper/domains/network/NetworkRequest.ts b/src/bidiMapper/domains/network/NetworkRequest.ts
@@ -129,14 +129,19 @@ export class NetworkRequest {
   }
 
   get url(): string {
-    return (
+    const fragment =
+      this.#request.info?.request.urlFragment ??
+      this.#request.paused?.request.urlFragment ??
+      '';
+    const url =
       this.#response.info?.url ??
       this.#response.paused?.request.url ??
       this.#request.auth?.request.url ??
       this.#request.info?.request.url ??
       this.#request.paused?.request.url ??
-      NetworkRequest.unknownParameter
-    );
+      NetworkRequest.unknownParameter;
+
+    return `${url}${fragment}`;
   }
 
   get method(): string {

diff --git a/tests/network/test_network.py b/tests/network/test_network.py
@@ -69,6 +69,52 @@ async def test_network_before_request_sent_event_emitted(
     }
 
 
+@pytest.mark.asyncio
+async def test_network_before_request_sent_event_emitted_with_url_fragment(
+        websocket, context_id, base_url):
+    await subscribe(websocket, ["network.beforeRequestSent"], [context_id])
+
+    url_fragment = "#test"
+    url = f"{base_url}{url_fragment}"
+
+    await send_JSON_command(
+        websocket, {
+            "method": "browsingContext.navigate",
+            "params": {
+                "url": url,
+                "wait": "complete",
+                "context": context_id
+            }
+        })
+
+    resp = await read_JSON_message(websocket)
+
+    assert resp == {
+        'type': 'event',
+        "method": "network.beforeRequestSent",
+        "params": {
+            "isBlocked": False,
+            "context": context_id,
+            "navigation": ANY_STR,
+            "redirectCount": 0,
+            "request": {
+                "request": ANY_STR,
+                "url": url,
+                "method": "GET",
+                "headers": ANY_LIST,
+                "cookies": [],
+                "headersSize": ANY_NUMBER,
+                "bodySize": 0,
+                "timings": ANY_DICT
+            },
+            "initiator": {
+                "type": "other"
+            },
+            "timestamp": ANY_TIMESTAMP
+        }
+    }
+
+
 @pytest.mark.asyncio
 async def test_network_global_subscription_enabled_in_new_context(
         websocket, create_context, base_url):

diff --git a/...river/headful/webdriver/tests/bidi/network/before_request_sent/before_request_sent.py.ini b/...river/headful/webdriver/tests/bidi/network/before_request_sent/before_request_sent.py.ini
diff --git a/...edriver/headful/webdriver/tests/bidi/network/response_completed/response_completed.py.ini b/...edriver/headful/webdriver/tests/bidi/network/response_completed/response_completed.py.ini
@@ -7,6 +7,3 @@
 
   [test_redirect_document[https coop\]]
     expected: [FAIL, PASS]
-
-  [test_url_with_fragment]
-    expected: FAIL
diff --git a/...hromedriver/headful/webdriver/tests/bidi/network/response_started/response_started.py.ini b/...hromedriver/headful/webdriver/tests/bidi/network/response_started/response_started.py.ini
@@ -7,6 +7,3 @@
 
   [test_www_authenticate]
     expected: FAIL
-
-  [test_url_with_fragment]
-    expected: FAIL
diff --git a/...iver/headless/webdriver/tests/bidi/network/before_request_sent/before_request_sent.py.ini b/...iver/headless/webdriver/tests/bidi/network/before_request_sent/before_request_sent.py.ini
diff --git a/...driver/headless/webdriver/tests/bidi/network/response_completed/response_completed.py.ini b/...driver/headless/webdriver/tests/bidi/network/response_completed/response_completed.py.ini
@@ -7,6 +7,3 @@
 
   [test_redirect_document[https coop\]]
     expected: [FAIL, PASS]
-
-  [test_url_with_fragment]
-    expected: FAIL
diff --git a/...romedriver/headless/webdriver/tests/bidi/network/response_started/response_started.py.ini b/...romedriver/headless/webdriver/tests/bidi/network/response_started/response_started.py.ini
@@ -7,6 +7,3 @@
 
   [test_www_authenticate]
     expected: FAIL
-
-  [test_url_with_fragment]
-    expected: FAIL
diff --git a/...pper/headless/webdriver/tests/bidi/network/before_request_sent/before_request_sent.py.ini b/...pper/headless/webdriver/tests/bidi/network/before_request_sent/before_request_sent.py.ini
diff --git a/...mapper/headless/webdriver/tests/bidi/network/response_completed/response_completed.py.ini b/...mapper/headless/webdriver/tests/bidi/network/response_completed/response_completed.py.ini
@@ -7,6 +7,3 @@
 
   [test_redirect_document[https coop\]]
     expected: [FAIL, PASS]
-
-  [test_url_with_fragment]
-    expected: FAIL
diff --git a/...ata/mapper/headless/webdriver/tests/bidi/network/response_started/response_started.py.ini b/...ata/mapper/headless/webdriver/tests/bidi/network/response_started/response_started.py.ini
@@ -4,6 +4,3 @@
 
   [test_response_status[407-Proxy Authentication Required\]]
     expected: FAIL
-
-  [test_url_with_fragment]
-    expected: FAIL