[wdspec] Update network/continue_request/cookies.py to match specification about modified cookies

Differential Revision: https://phabricator.services.mozilla.com/D296756

bugzilla-url: https://bugzilla.mozilla.org/show_bug.cgi?id=2031237
gecko-commit: 8c1a81ff6ab10d0842004278a8553d39b0bfaf5f
gecko-reviewers: whimboo

Author: juliandescottes

webdriver/tests/bidi/network/continue_request/cookies.py

@@ -1,4 +1,5 @@
 import pytest
+import pytest_asyncio
 
 from webdriver.bidi.modules.network import CookieHeader, Header, NetworkStringValue
 from webdriver.bidi.modules.script import ContextTarget
@@ -9,13 +10,34 @@
 pytestmark = pytest.mark.asyncio
 
 
+@pytest_asyncio.fixture(autouse=True)
+async def delete_cookies(bidi_session):
+    await bidi_session.storage.delete_cookies()
+
+
 @pytest.mark.parametrize(
-    "document_cookies, modified_cookies",
+    "document_cookies, modified_cookies, expected_event_cookies",
     [
-        [{"a": "1"}, {}],
-        [{}, {"b": "2"}],
-        [{"a": "1", "b": "2"}, {"c": "3", "d": "4"}],
-        [{"a": "1"}, {"a": "not-1"}],
+        [{"a": "from-store"}, {}, []],
+        [{"a": "from-store"}, {"b": "from-command"}, []],
+        [{}, {"b": "from-command"}, []],
+        [
+            {"a": "from-store"},
+            {"a": "from-command"},
+            [{"name": "a", "value": {"type": "string", "value": "from-store"}}],
+        ],
+        [
+            {"a": "from-store-a", "b": "from-store-b"},
+            {"b": "from-command-b", "c": "from-command-c"},
+            [{"name": "b", "value": {"type": "string", "value": "from-store-b"}}],
+        ],
+    ],
+    ids=[
+        "store_cookie_removed",
+        "store_cookies_replaced",
+        "new_cookie_in_command",
+        "modified_cookie_in_command",
+        "common_cookie",
     ],
 )
 async def test_modify_cookies(
@@ -26,13 +48,14 @@ async def test_modify_cookies(
     top_context,
     document_cookies,
     modified_cookies,
-    url
+    expected_event_cookies,
+    url,
 ):
     # Navigate away from about:blank to make sure document.cookies can be used.
     await bidi_session.browsing_context.navigate(
         context=top_context["context"],
         url=url("/webdriver/tests/bidi/network/support/empty.html"),
-        wait="complete"
+        wait="complete",
     )
 
     expression = ""
@@ -57,12 +80,12 @@ async def test_modify_cookies(
     response_event = await on_response_completed
 
     event_cookies = response_event["request"]["cookies"]
-    assert len(event_cookies) == len(cookies)
-    for cookie in cookies:
+    assert len(event_cookies) == len(expected_event_cookies)
+    for expected in expected_event_cookies:
         event_cookie = next(
-            filter(lambda c: c["name"] == cookie["name"], event_cookies), None
+            filter(lambda c: c["name"] == expected["name"], event_cookies), None
         )
-        recursive_compare(cookie, event_cookie)
+        recursive_compare(expected, event_cookie)
 
     await bidi_session.storage.delete_cookies()
 
@@ -84,21 +107,23 @@ async def test_override_header_cookie(
     response_event = await on_response_completed
 
     event_cookies = response_event["request"]["cookies"]
-    recursive_compare([cookie], event_cookies)
+    assert event_cookies == []
 
     await bidi_session.storage.delete_cookies()
 
 
+@pytest.mark.parametrize(
+    "header_cookie",
+    ["a=from-header", "b=from-header"],
+    ids=["different_cookie", "same_cookie"],
+)
 async def test_override_modified_header_cookies(
-    setup_blocked_request,
-    subscribe_events,
-    wait_for_event,
-    bidi_session,
+    setup_blocked_request, subscribe_events, wait_for_event, bidi_session, header_cookie
 ):
     request = await setup_blocked_request("beforeRequestSent")
     await subscribe_events(events=[RESPONSE_COMPLETED_EVENT])
 
-    header = Header(name="Cookie", value=NetworkStringValue("a=1"))
+    header = Header(name="Cookie", value=NetworkStringValue(header_cookie))
     cookie = CookieHeader(name="b", value=NetworkStringValue("2"))
     on_response_completed = wait_for_event(RESPONSE_COMPLETED_EVENT)
     await bidi_session.network.continue_request(
@@ -107,6 +132,6 @@ async def test_override_modified_header_cookies(
     response_event = await on_response_completed
 
     event_cookies = response_event["request"]["cookies"]
-    recursive_compare([cookie], event_cookies)
+    assert event_cookies == []
 
     await bidi_session.storage.delete_cookies()