Modify tests with new variable_values and operation_name to remove warnings in tests

Author: leszekhanusz

docs/code_examples/console_async.py

@@ -39,9 +39,7 @@ async def get_continent_name(self, code):
 
         assert self._session is not None
 
-        answer = await self._session.execute(
-            self.get_continent_name_query
-        )
+        answer = await self._session.execute(self.get_continent_name_query)
 
         return answer.get("continent").get("name")  # type: ignore
 

docs/code_examples/fastapi_async.py

@@ -93,7 +93,7 @@ async def get_continent(continent_code):
 
     try:
         assert isinstance(client.session, ReconnectingAsyncClientSession)
-        query.variable_values={"code": continent_code}
+        query.variable_values = {"code": continent_code}
         result = await client.session.execute(query)
     except Exception as e:
         log.debug(f"get_continent Error: {e}")

tests/custom_scalars/test_datetime.py

@@ -117,11 +117,11 @@ def test_shift_days():
 
     query = gql("query shift5days($time: Datetime) {shiftDays(time: $time, days: 5)}")
 
-    variable_values = {
+    query.variable_values = {
         "time": now,
     }
 
-    result = client.execute(query, variable_values=variable_values)
+    result = client.execute(query)
 
     print(result)
 
@@ -151,11 +151,11 @@ def test_shift_days_serialized_manually_in_variables():
 
     query = gql("query shift5days($time: Datetime) {shiftDays(time: $time, days: 5)}")
 
-    variable_values = {
+    query.variable_values = {
         "time": "2021-11-12T11:58:13.461161",
     }
 
-    result = client.execute(query, variable_values=variable_values)
+    result = client.execute(query)
 
     print(result)
 
@@ -171,13 +171,11 @@ def test_latest():
 
     query = gql("query latest($times: [Datetime!]!) {latest(times: $times)}")
 
-    variable_values = {
+    query.variable_values = {
         "times": [now, in_five_days],
     }
 
-    result = client.execute(
-        query, variable_values=variable_values, serialize_variables=True
-    )
+    result = client.execute(query, serialize_variables=True)
 
     print(result)
 
@@ -194,11 +192,9 @@ def test_seconds():
         "query seconds($interval: IntervalInput) {seconds(interval: $interval)}"
     )
 
-    variable_values = {"interval": {"start": now, "end": in_five_days}}
+    query.variable_values = {"interval": {"start": now, "end": in_five_days}}
 
-    result = client.execute(
-        query, variable_values=variable_values, serialize_variables=True
-    )
+    result = client.execute(query, serialize_variables=True)
 
     print(result)
 
@@ -214,11 +210,9 @@ def test_seconds_omit_optional_start_argument():
         "query seconds($interval: IntervalInput) {seconds(interval: $interval)}"
     )
 
-    variable_values = {"interval": {"end": in_five_days}}
+    query.variable_values = {"interval": {"end": in_five_days}}
 
-    result = client.execute(
-        query, variable_values=variable_values, serialize_variables=True
-    )
+    result = client.execute(query, serialize_variables=True)
 
     print(result)
 

tests/custom_scalars/test_enum_colors.py

@@ -165,11 +165,11 @@ def test_opposite_color_variable_serialized_manually():
         }"""
     )
 
-    variable_values = {
+    query.variable_values = {
         "color": "RED",
     }
 
-    result = client.execute(query, variable_values=variable_values)
+    result = client.execute(query)
 
     print(result)
 
@@ -190,13 +190,11 @@ def test_opposite_color_variable_serialized_by_gql():
         }"""
     )
 
-    variable_values = {
+    query.variable_values = {
         "color": RED,
     }
 
-    result = client.execute(
-        query, variable_values=variable_values, serialize_variables=True
-    )
+    result = client.execute(query, serialize_variables=True)
 
     print(result)
 
@@ -328,13 +326,12 @@ def test_parse_results_with_operation_type():
         """
     )
 
-    variable_values = {
+    query.variable_values = {
         "color": "RED",
     }
+    query.operation_name = "GetOppositeColor"
 
-    result = client.execute(
-        query, variable_values=variable_values, operation_name="GetOppositeColor"
-    )
+    result = client.execute(query)
 
     print(result)
 

tests/custom_scalars/test_json.py

@@ -166,17 +166,15 @@ def test_json_value_input_in_ast_with_variables():
 }"""
     )
 
-    variable_values = {
+    query.variable_values = {
         "name": "Barbara",
         "level": 1,
         "is_connected": False,
         "score": 69,
         "friends": ["Alex", "John"],
     }
 
-    result = client.execute(
-        query, variable_values=variable_values, root_value=root_value
-    )
+    result = client.execute(query, root_value=root_value)
 
     print(result)
 

tests/custom_scalars/test_money.py

@@ -20,7 +20,7 @@
 )
 from graphql.utilities import value_from_ast_untyped
 
-from gql import Client, GraphQLRequest, gql
+from gql import Client, gql
 from gql.transport.exceptions import TransportQueryError
 from gql.utilities import serialize_value, update_schema_scalar, update_schema_scalars
 
@@ -275,11 +275,9 @@ def test_custom_scalar_in_input_variable_values():
 
     money_value = {"amount": 10, "currency": "DM"}
 
-    variable_values = {"money": money_value}
+    query.variable_values = {"money": money_value}
 
-    result = client.execute(
-        query, variable_values=variable_values, root_value=root_value
-    )
+    result = client.execute(query, root_value=root_value)
 
     assert result["toEuros"] == 5
 
@@ -292,11 +290,10 @@ def test_custom_scalar_in_input_variable_values_serialized():
 
     money_value = Money(10, "DM")
 
-    variable_values = {"money": money_value}
+    query.variable_values = {"money": money_value}
 
     result = client.execute(
         query,
-        variable_values=variable_values,
         root_value=root_value,
         serialize_variables=True,
     )
@@ -312,14 +309,13 @@ def test_custom_scalar_in_input_variable_values_serialized_with_operation_name()
 
     money_value = Money(10, "DM")
 
-    variable_values = {"money": money_value}
+    query.variable_values = {"money": money_value}
+    query.operation_name = "myquery"
 
     result = client.execute(
         query,
-        variable_values=variable_values,
         root_value=root_value,
         serialize_variables=True,
-        operation_name="myquery",
     )
 
     assert result["toEuros"] == 5
@@ -342,12 +338,11 @@ def test_serialize_variable_values_exception_multiple_ops_without_operation_name
 
     money_value = Money(10, "DM")
 
-    variable_values = {"money": money_value}
+    query.variable_values = {"money": money_value}
 
     with pytest.raises(GraphQLError) as exc_info:
         client.execute(
             query,
-            variable_values=variable_values,
             root_value=root_value,
             serialize_variables=True,
         )
@@ -374,15 +369,14 @@ def test_serialize_variable_values_exception_operation_name_not_found():
 
     money_value = Money(10, "DM")
 
-    variable_values = {"money": money_value}
+    query.variable_values = {"money": money_value}
+    query.operation_name = "invalid_operation_name"
 
     with pytest.raises(GraphQLError) as exc_info:
         client.execute(
             query,
-            variable_values=variable_values,
             root_value=root_value,
             serialize_variables=True,
-            operation_name="invalid_operation_name",
         )
 
     exception = exc_info.value
@@ -398,13 +392,12 @@ def test_custom_scalar_subscribe_in_input_variable_values_serialized():
 
     money_value = Money(10, "DM")
 
-    variable_values = {"money": money_value}
+    query.variable_values = {"money": money_value}
 
     expected_result = {"spend": Money(10, "DM")}
 
     for result in client.subscribe(
         query,
-        variable_values=variable_values,
         root_value=root_value,
         serialize_variables=True,
         parse_result=True,
@@ -544,9 +537,9 @@ async def test_custom_scalar_in_input_variable_values_with_transport(aiohttp_ser
         money_value = {"amount": 10, "currency": "DM"}
         # money_value = Money(10, "DM")
 
-        variable_values = {"money": money_value}
+        query.variable_values = {"money": money_value}
 
-        result = await session.execute(query, variable_values=variable_values)
+        result = await session.execute(query)
 
         print(f"result = {result!r}")
         assert result["toEuros"] == 5
@@ -570,9 +563,9 @@ async def test_custom_scalar_in_input_variable_values_split_with_transport(
 }"""
         )
 
-        variable_values = {"amount": 10, "currency": "DM"}
+        query.variable_values = {"amount": 10, "currency": "DM"}
 
-        result = await session.execute(query, variable_values=variable_values)
+        result = await session.execute(query)
 
         print(f"result = {result!r}")
         assert result["toEuros"] == 5
@@ -590,11 +583,9 @@ async def test_custom_scalar_serialize_variables(aiohttp_server):
 
         query = gql("query myquery($money: Money) {toEuros(money: $money)}")
 
-        variable_values = {"money": Money(10, "DM")}
+        query.variable_values = {"money": Money(10, "DM")}
 
-        result = await session.execute(
-            query, variable_values=variable_values, serialize_variables=True
-        )
+        result = await session.execute(query, serialize_variables=True)
 
         print(f"result = {result!r}")
         assert result["toEuros"] == 5
@@ -611,12 +602,10 @@ async def test_custom_scalar_serialize_variables_no_schema(aiohttp_server):
 
         query = gql("query myquery($money: Money) {toEuros(money: $money)}")
 
-        variable_values = {"money": Money(10, "DM")}
+        query.variable_values = {"money": Money(10, "DM")}
 
         with pytest.raises(TransportQueryError):
-            await session.execute(
-                query, variable_values=variable_values, serialize_variables=True
-            )
+            await session.execute(query, serialize_variables=True)
 
 
 @pytest.mark.asyncio
@@ -643,11 +632,9 @@ async def test_custom_scalar_serialize_variables_schema_from_introspection(
 
         query = gql("query myquery($money: Money) {toEuros(money: $money)}")
 
-        variable_values = {"money": Money(10, "DM")}
+        query.variable_values = {"money": Money(10, "DM")}
 
-        result = await session.execute(
-            query, variable_values=variable_values, serialize_variables=True
-        )
+        result = await session.execute(query, serialize_variables=True)
 
         print(f"result = {result!r}")
         assert result["toEuros"] == 5
@@ -667,11 +654,9 @@ async def test_update_schema_scalars(aiohttp_server):
 
         query = gql("query myquery($money: Money) {toEuros(money: $money)}")
 
-        variable_values = {"money": Money(10, "DM")}
+        query.variable_values = {"money": Money(10, "DM")}
 
-        result = await session.execute(
-            query, variable_values=variable_values, serialize_variables=True
-        )
+        result = await session.execute(query, serialize_variables=True)
 
         print(f"result = {result!r}")
         assert result["toEuros"] == 5
@@ -743,11 +728,9 @@ def test_code():
 
             query = gql("query myquery($money: Money) {toEuros(money: $money)}")
 
-            variable_values = {"money": Money(10, "DM")}
+            query.variable_values = {"money": Money(10, "DM")}
 
-            result = session.execute(
-                query, variable_values=variable_values, serialize_variables=True
-            )
+            result = session.execute(query, serialize_variables=True)
 
             print(f"result = {result!r}")
             assert result["toEuros"] == 5
@@ -765,14 +748,14 @@ async def test_custom_scalar_serialize_variables_sync_transport_2(
     def test_code():
         with Client(schema=schema, transport=transport, parse_results=True) as session:
 
-            query = "query myquery($money: Money) {toEuros(money: $money)}"
+            query = gql("query myquery($money: Money) {toEuros(money: $money)}")
 
-            variable_values = {"money": Money(10, "DM")}
+            query.variable_values = {"money": Money(10, "DM")}
 
             results = session.execute_batch(
                 [
-                    GraphQLRequest(query, variable_values=variable_values),
-                    GraphQLRequest(query, variable_values=variable_values),
+                    query,
+                    query,
                 ],
                 serialize_variables=True,
             )
@@ -793,14 +776,14 @@ async def test_custom_scalar_serialize_variables_async_transport(aiohttp_server)
         schema=schema, transport=transport, parse_results=True
     ) as session:
 
-        query = "query myquery($money: Money) {toEuros(money: $money)}"
+        query = gql("query myquery($money: Money) {toEuros(money: $money)}")
 
-        variable_values = {"money": Money(10, "DM")}
+        query.variable_values = {"money": Money(10, "DM")}
 
         results = await session.execute_batch(
             [
-                GraphQLRequest(query, variable_values=variable_values),
-                GraphQLRequest(query, variable_values=variable_values),
+                query,
+                query,
             ],
             serialize_variables=True,
         )