Consolidate and clean up extensions tests

- Merge 6 unit tests into one test_graphql_request_extensions
- Merge aiohttp execute + subscribe into one test
- Drop redundant httpx sync batch test (same code path as async)
- Tighten assertions and remove unnecessary comments
- Parse WS logged message as JSON instead of fragile string matching

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: magicmark

tests/test_aiohttp.py

@@ -88,17 +88,16 @@ async def handler(request):
 
 
 @pytest.mark.asyncio
-async def test_aiohttp_query_with_extensions(aiohttp_server):
+async def test_aiohttp_request_extensions(aiohttp_server):
     from aiohttp import web
 
     from gql.transport.aiohttp import AIOHTTPTransport
 
+    extensions = {"persistedQuery": {"version": 1, "sha256Hash": "abc123"}}
+
     async def handler(request):
         body = await request.json()
-        assert "extensions" in body
-        assert body["extensions"] == {
-            "persistedQuery": {"version": 1, "sha256Hash": "abc123"}
-        }
+        assert body["extensions"] == extensions
         return web.Response(
             text=query1_server_answer,
             content_type="application/json",
@@ -112,19 +111,17 @@ async def handler(request):
 
     transport = AIOHTTPTransport(url=url, timeout=10)
 
-    async with Client(transport=transport) as session:
+    request = GraphQLRequest(query1_str, extensions=extensions)
 
-        request = GraphQLRequest(
-            query1_str,
-            extensions={
-                "persistedQuery": {"version": 1, "sha256Hash": "abc123"}
-            },
-        )
+    async with Client(transport=transport) as session:
 
+        # execute
         result = await session.execute(request)
+        assert result["continents"][0]["code"] == "AF"
 
-        continents = result["continents"]
-        assert continents[0]["code"] == "AF"
+        # subscribe
+        async for result in session.subscribe(request):
+            assert result["continents"][0]["code"] == "AF"
 
 
 @pytest.mark.asyncio
@@ -619,46 +616,6 @@ def test_code():
     await run_sync_test(server, test_code)
 
 
-@pytest.mark.asyncio
-async def test_aiohttp_subscribe_with_extensions(aiohttp_server):
-    from aiohttp import web
-
-    from gql.transport.aiohttp import AIOHTTPTransport
-
-    async def handler(request):
-        body = await request.json()
-        assert "extensions" in body
-        assert body["extensions"] == {
-            "persistedQuery": {"version": 1, "sha256Hash": "abc123"}
-        }
-        return web.Response(
-            text=query1_server_answer,
-            content_type="application/json",
-        )
-
-    app = web.Application()
-    app.router.add_route("POST", "/", handler)
-    server = await aiohttp_server(app)
-
-    url = server.make_url("/")
-
-    transport = AIOHTTPTransport(url=url, timeout=10)
-
-    request = GraphQLRequest(
-        query1_str,
-        extensions={"persistedQuery": {"version": 1, "sha256Hash": "abc123"}},
-    )
-
-    async with Client(transport=transport) as session:
-
-        results = []
-        async for result in session.subscribe(request):
-            results.append(result)
-
-        assert len(results) == 1
-        assert results[0]["continents"][0]["code"] == "AF"
-
-
 file_upload_mutation_1 = """
     mutation($file: Upload!) {
       uploadFile(input:{other_var:$other_var, file:$file}) {

tests/test_aiohttp_batch.py

@@ -90,18 +90,17 @@ async def handler(request):
 
 
 @pytest.mark.asyncio
-async def test_aiohttp_batch_query_with_extensions(aiohttp_server):
+async def test_aiohttp_batch_request_extensions(aiohttp_server):
     from aiohttp import web
 
     from gql.transport.aiohttp import AIOHTTPTransport
 
+    extensions = {"persistedQuery": {"version": 1, "sha256Hash": "abc123"}}
+
     async def handler(request):
         body = await request.json()
         assert isinstance(body, list)
-        assert "extensions" in body[0]
-        assert body[0]["extensions"] == {
-            "persistedQuery": {"version": 1, "sha256Hash": "abc123"}
-        }
+        assert body[0]["extensions"] == extensions
         return web.Response(
             text=query1_server_answer_list,
             content_type="application/json",
@@ -117,19 +116,9 @@ async def handler(request):
 
     async with Client(transport=transport) as session:
 
-        query = [
-            GraphQLRequest(
-                query1_str,
-                extensions={
-                    "persistedQuery": {"version": 1, "sha256Hash": "abc123"}
-                },
-            )
-        ]
-
+        query = [GraphQLRequest(query1_str, extensions=extensions)]
         results = await session.execute_batch(query)
-
-        continents = results[0]["continents"]
-        assert continents[0]["code"] == "AF"
+        assert results[0]["continents"][0]["code"] == "AF"
 
 
 @pytest.mark.asyncio

tests/test_aiohttp_websocket_subscription.py

@@ -485,9 +485,10 @@ async def test_aiohttp_websocket_subscription_with_extensions(
 
     assert count == -1
 
-    # Check that the query contains the extensions
-    assert '"persistedQuery"' in logged_messages[0]
-    assert '"sha256Hash": "abc123"' in logged_messages[0]
+    message = json.loads(logged_messages[0])
+    assert message["payload"]["extensions"] == {
+        "persistedQuery": {"version": 1, "sha256Hash": "abc123"}
+    }
 
 
 WITH_KEEPALIVE = True

tests/test_graphql_request.py

@@ -238,55 +238,26 @@ def test_graphql_request_init_with_graphql_request():
     assert request_3.variable_values["money"] == money_value_2
 
 
-def test_graphql_request_extensions_in_payload():
-    extensions = {"persistedQuery": {"version": 1, "sha256Hash": "abc123"}}
-    request = GraphQLRequest("{balance}", extensions=extensions)
-
-    payload = request.payload
-    assert payload["extensions"] == extensions
-
-
-def test_graphql_request_extensions_not_in_payload_when_none():
-    request = GraphQLRequest("{balance}")
-    assert "extensions" not in request.payload
-
-
-def test_graphql_request_extensions_copied_from_graphql_request():
-    extensions = {"persistedQuery": {"version": 1, "sha256Hash": "abc123"}}
-    request_1 = GraphQLRequest("{balance}", extensions=extensions)
-    request_2 = GraphQLRequest(request_1)
-
-    assert request_2.extensions == extensions
-    assert request_2.payload["extensions"] == extensions
-
-
-def test_graphql_request_extensions_override_from_graphql_request():
+def test_graphql_request_extensions():
     extensions_1 = {"persistedQuery": {"version": 1, "sha256Hash": "abc123"}}
     extensions_2 = {"custom": "value"}
-    request_1 = GraphQLRequest("{balance}", extensions=extensions_1)
-    request_2 = GraphQLRequest(request_1, extensions=extensions_2)
+    money_value = Money(10, "DM")
 
-    assert request_2.extensions == extensions_2
+    assert "extensions" not in GraphQLRequest("{balance}").payload
 
+    request_1 = GraphQLRequest("{balance}", extensions=extensions_1)
+    assert request_1.payload["extensions"] == extensions_1
 
-def test_graphql_request_extensions_preserved_by_serialize_variable_values():
-    extensions = {"persistedQuery": {"version": 1, "sha256Hash": "abc123"}}
-    money_value = Money(10, "DM")
+    request_2 = GraphQLRequest(request_1)
+    assert request_2.extensions == extensions_1
 
-    request = GraphQLRequest(
+    request_3 = GraphQLRequest(request_1, extensions=extensions_2)
+    assert request_3.extensions == extensions_2
+
+    request_4 = GraphQLRequest(
         "query myquery($money: Money) {toEuros(money: $money)}",
         variable_values={"money": money_value},
-        extensions=extensions,
+        extensions=extensions_1,
     )
-
-    serialized = request.serialize_variable_values(schema)
-    assert serialized.extensions == extensions
-    assert serialized.payload["extensions"] == extensions
-
-
-def test_graphql_request_str_includes_extensions():
-    extensions = {"key": "value"}
-    request = GraphQLRequest("{balance}", extensions=extensions)
-    result = str(request)
-    assert "extensions" in result
-    assert "'key': 'value'" in result
+    serialized = request_4.serialize_variable_values(schema)
+    assert serialized.extensions == extensions_1

tests/test_httpx.py

@@ -86,17 +86,16 @@ def test_code():
 
 @pytest.mark.aiohttp
 @pytest.mark.asyncio
-async def test_httpx_query_with_extensions(aiohttp_server, run_sync_test):
+async def test_httpx_request_extensions(aiohttp_server, run_sync_test):
     from aiohttp import web
 
     from gql.transport.httpx import HTTPXTransport
 
+    extensions = {"persistedQuery": {"version": 1, "sha256Hash": "abc123"}}
+
     async def handler(request):
         body = await request.json()
-        assert "extensions" in body
-        assert body["extensions"] == {
-            "persistedQuery": {"version": 1, "sha256Hash": "abc123"}
-        }
+        assert body["extensions"] == extensions
         return web.Response(
             text=query1_server_answer,
             content_type="application/json",
@@ -112,18 +111,9 @@ def test_code():
         transport = HTTPXTransport(url=url)
 
         with Client(transport=transport) as session:
-
-            request = GraphQLRequest(
-                query1_str,
-                extensions={
-                    "persistedQuery": {"version": 1, "sha256Hash": "abc123"}
-                },
-            )
-
+            request = GraphQLRequest(query1_str, extensions=extensions)
             result = session.execute(request)
-
-            continents = result["continents"]
-            assert continents[0]["code"] == "AF"
+            assert result["continents"][0]["code"] == "AF"
 
     await run_sync_test(server, test_code)
 

tests/test_httpx_batch.py

@@ -120,18 +120,17 @@ def test_code():
 
 @pytest.mark.aiohttp
 @pytest.mark.asyncio
-async def test_httpx_async_batch_query_with_extensions(aiohttp_server):
+async def test_httpx_batch_request_extensions(aiohttp_server):
     from aiohttp import web
 
     from gql.transport.httpx import HTTPXAsyncTransport
 
+    extensions = {"persistedQuery": {"version": 1, "sha256Hash": "abc123"}}
+
     async def handler(request):
         body = await request.json()
         assert isinstance(body, list)
-        assert "extensions" in body[0]
-        assert body[0]["extensions"] == {
-            "persistedQuery": {"version": 1, "sha256Hash": "abc123"}
-        }
+        assert body[0]["extensions"] == extensions
         return web.Response(
             text=query1_server_answer_list,
             content_type="application/json",
@@ -147,66 +146,9 @@ async def handler(request):
 
     async with Client(transport=transport) as session:
 
-        query = [
-            GraphQLRequest(
-                query1_str,
-                extensions={
-                    "persistedQuery": {"version": 1, "sha256Hash": "abc123"}
-                },
-            )
-        ]
-
+        query = [GraphQLRequest(query1_str, extensions=extensions)]
         results = await session.execute_batch(query)
-
-        continents = results[0]["continents"]
-        assert continents[0]["code"] == "AF"
-
-
-@pytest.mark.aiohttp
-@pytest.mark.asyncio
-async def test_httpx_sync_batch_query_with_extensions(aiohttp_server, run_sync_test):
-    from aiohttp import web
-
-    from gql.transport.httpx import HTTPXTransport
-
-    async def handler(request):
-        body = await request.json()
-        assert isinstance(body, list)
-        assert "extensions" in body[0]
-        assert body[0]["extensions"] == {
-            "persistedQuery": {"version": 1, "sha256Hash": "abc123"}
-        }
-        return web.Response(
-            text=query1_server_answer_list,
-            content_type="application/json",
-        )
-
-    app = web.Application()
-    app.router.add_route("POST", "/", handler)
-    server = await aiohttp_server(app)
-
-    url = str(server.make_url("/"))
-
-    transport = HTTPXTransport(url=url, timeout=10)
-
-    def test_code():
-        with Client(transport=transport) as session:
-
-            query = [
-                GraphQLRequest(
-                    query1_str,
-                    extensions={
-                        "persistedQuery": {"version": 1, "sha256Hash": "abc123"}
-                    },
-                )
-            ]
-
-            results = session.execute_batch(query)
-
-            continents = results[0]["continents"]
-            assert continents[0]["code"] == "AF"
-
-    await run_sync_test(server, test_code)
+        assert results[0]["continents"][0]["code"] == "AF"
 
 
 @pytest.mark.aiohttp