Add tests for deprecation warnings

Author: leszekhanusz

gql/graphql_request.py

@@ -41,19 +41,13 @@ def __init__(
 
         if isinstance(request, GraphQLRequest):
             self.document = request.document
-            self.variable_values: Optional[Dict[str, Any]] = (
-                request.variable_values
-                if request.variable_values is not None
-                else variable_values
-            )
-            self.operation_name: Optional[str] = (
-                request.operation_name
-                if request.operation_name is not None
-                else operation_name
-            )
-        else:
-            self.variable_values = variable_values
-            self.operation_name = operation_name
+            if variable_values is None:
+                variable_values = request.variable_values
+            if operation_name is None:
+                operation_name = request.operation_name
+
+        self.variable_values: Optional[Dict[str, Any]] = variable_values
+        self.operation_name: Optional[str] = operation_name
 
     def serialize_variable_values(self, schema: GraphQLSchema) -> "GraphQLRequest":
 

tests/test_aiohttp.py

@@ -1824,3 +1824,108 @@ async def handler(request):
             assert africa["code"] == "AF"
 
     await connector.close()
+
+
+@pytest.mark.asyncio
+async def test_aiohttp_deprecation_warning_using_document_node_execute(aiohttp_server):
+    from aiohttp import web
+
+    from gql.transport.aiohttp import AIOHTTPTransport
+
+    async def handler(request):
+        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)
+
+    async with Client(transport=transport) as session:
+
+        query = gql(query1_str)
+
+        with pytest.warns(
+            DeprecationWarning,
+            match="Using a DocumentNode is deprecated",
+        ):
+            result = await session.execute(query.document)
+
+        continents = result["continents"]
+
+        africa = continents[0]
+
+        assert africa["code"] == "AF"
+
+
+@pytest.mark.asyncio
+async def test_aiohttp_deprecation_warning_execute_variable_values(aiohttp_server):
+    from aiohttp import web
+
+    from gql.transport.aiohttp import AIOHTTPTransport
+
+    async def handler(request):
+        return web.Response(text=query2_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)
+
+    async with Client(transport=transport) as session:
+
+        params = {"code": "EU"}
+
+        query = gql(query2_str)
+
+        with pytest.warns(
+            DeprecationWarning,
+            match=(
+                "Using variable_values and operation_name arguments of "
+                "execute and subscribe methods is deprecated"
+            ),
+        ):
+            result = await session.execute(
+                query, variable_values=params, operation_name="getEurope"
+            )
+
+        continent = result["continent"]
+
+        assert continent["name"] == "Europe"
+
+
+@pytest.mark.asyncio
+async def test_aiohttp_type_error_execute(aiohttp_server):
+    from aiohttp import web
+
+    from gql.transport.aiohttp import AIOHTTPTransport
+
+    async def handler(request):
+        return web.Response(text=query2_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)
+
+    async with Client(transport=transport) as session:
+
+        params = {"code": "EU"}
+
+        query = gql(query2_str)
+
+        with pytest.raises(TypeError) as exc_info:
+            await session.execute("qmlsdkfj")
+
+        assert "request should be a GraphQLRequest object" in str(exc_info.value)

tests/test_graphql_request.py

@@ -210,3 +210,26 @@ def test_graphql_request_using_string_instead_of_document():
     print(request)
 
     assert str(request) == strip_braces_spaces(expected_payload)
+
+
+def test_graphql_request_init_with_graphql_request():
+    money_value_1 = Money(10, "DM")
+    money_value_2 = Money(20, "DM")
+
+    request_1 = GraphQLRequest(
+        "query myquery($money: Money) {toEuros(money: $money)}",
+        variable_values={"money": money_value_1},
+    )
+    request_2 = GraphQLRequest(
+        request_1,
+    )
+    request_3 = GraphQLRequest(
+        request_1,
+        variable_values={"money": money_value_2},
+    )
+
+    assert request_1.document == request_2.document
+    assert request_2.document == request_3.document
+    assert request_1.variable_values["money"] == money_value_1
+    assert request_2.variable_values["money"] == money_value_1
+    assert request_3.variable_values["money"] == money_value_2