Bug 1987935 - [wdspec] Fix tests for "emulation.setUserAgentOverride" command. r=webdriver-reviewers,jdescottes

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

Author: lutien

testing/web-platform/tests/webdriver/tests/bidi/emulation/set_user_agent_override/conftest.py

@@ -57,7 +57,7 @@ async def assert_fetch_user_agent(bidi_session, url):
     Helper to assert the right `user-agent` header sent in fetch.
     """
 
-    async def assert_navigation_user_agent(context, expected_user_agent):
+    async def assert_fetch_user_agent(context, expected_user_agent):
         echo_link = url("webdriver/tests/support/http_handlers/headers_echo.py")
         await bidi_session.browsing_context.navigate(context=context["context"],
                                                      url=echo_link,
@@ -75,7 +75,7 @@ async def assert_navigation_user_agent(context, expected_user_agent):
         assert user_agent == expected_user_agent, \
             f"Fetch expected to send user agent '{expected_user_agent}' but sent '{user_agent}'"
 
-    return assert_navigation_user_agent
+    return assert_fetch_user_agent
 
 
 @pytest_asyncio.fixture

testing/web-platform/tests/webdriver/tests/bidi/emulation/set_user_agent_override/global.py

@@ -68,7 +68,7 @@ async def test_user_agent_set_override_and_reset_globally_and_per_context(
 
     # Reset global override.
     await bidi_session.emulation.set_user_agent_override(
-        user_agent=ANOTHER_USER_AGENT
+        user_agent=None
     )
 
     # The override should be disabled.

testing/web-platform/tests/webdriver/tests/bidi/emulation/set_user_agent_override/user_contexts.py

@@ -136,7 +136,7 @@ async def test_set_to_user_context_and_then_to_context(bidi_session,
 
     # Remove user context override.
     await bidi_session.emulation.set_user_agent_override(
-        contexts=[context_in_user_context["context"]],
+        user_contexts=[user_context],
         user_agent=None,
     )
 
@@ -147,4 +147,4 @@ async def test_set_to_user_context_and_then_to_context(bidi_session,
     await bidi_session.browsing_context.reload(
         context=context_in_user_context["context"], wait="complete"
     )
-    await assert_user_agent(context_in_user_context, SOME_USER_AGENT)
+    await assert_user_agent(context_in_user_context, default_user_agent)

testing/web-platform/tests/webdriver/tests/support/http_handlers/headers_echo.py

@@ -5,7 +5,7 @@ def main(request, response):
     """Simple handler that returns a response with Cache-Control max-age=3600.
     """
 
-    response.headers.set(b"Content-Type", b"application/json")
+    response.headers.set(b"Content-Type", b"text/plain")
 
     headers_dict = {}
     for key, value in request.headers.items():
@@ -24,4 +24,3 @@ def main(request, response):
     response.content = json.dumps({
         "headers": headers_dict
     })
-