Fix deprecation warning, improve coverage (#13)

Cito · Cito · commit c40a2335d243 · 2020-01-24T17:03:16.000+01:00
diff --git a/aiohttp_graphql/graphqlview.py b/aiohttp_graphql/graphqlview.py
@@ -163,12 +163,6 @@ async def __call__(self, request):
             )
 
         except HttpQueryError as err:
-            if err.headers and "Allow" in err.headers:
-                # bug in graphql_server.execute_graphql_request
-                # https://github.com/graphql-python/graphql-server-core/pull/4
-                if isinstance(err.headers["Allow"], list):
-                    err.headers["Allow"] = ", ".join(err.headers["Allow"])
-
             return web.Response(
                 text=self.encoder({"errors": [self.error_formatter(err)]}),
                 status=err.status_code,
@@ -198,4 +192,18 @@ def process_preflight(self, request):
     @classmethod
     def attach(cls, app, *, route_path="/graphql", route_name="graphql", **kwargs):
         view = cls(**kwargs)
-        app.router.add_route("*", route_path, view, name=route_name)
+        app.router.add_route("*", route_path, _asyncify(view), name=route_name)
+
+
+def _asyncify(handler):
+    """Return an async version of the given handler.
+
+    This is mainly here because ``aiohttp`` can't infer the async definition of
+    :py:meth:`.GraphQLView.__call__` and raises a :py:class:`DeprecationWarning`
+    in tests. Wrapping it into an async function avoids the noisy warning.
+    """
+
+    async def _dispatch(request):
+        return await handler(request)
+
+    return _dispatch
diff --git a/tests/test_graphqlview.py b/tests/test_graphqlview.py
@@ -486,12 +486,18 @@ async def test_passes_request_into_request_context(client, url_builder):
 
 class TestCustomContext:
     @pytest.fixture
-    def view_kwargs(self, view_kwargs):
+    def view_kwargs(self, request, view_kwargs):
         # pylint: disable=no-self-use
         # pylint: disable=redefined-outer-name
-        view_kwargs.update(context="CUSTOM CONTEXT")
+        view_kwargs.update(context=request.param)
         return view_kwargs
 
+    @pytest.mark.parametrize(
+        "view_kwargs",
+        ["CUSTOM CONTEXT", {"CUSTOM_CONTEXT": "test"}],
+        indirect=True,
+        ids=repr,
+    )
     @pytest.mark.asyncio
     async def test_context_remapped(self, client, url_builder):
         response = await client.get(url_builder(query="{context}"))
@@ -501,6 +507,18 @@ async def test_context_remapped(self, client, url_builder):
         assert "request" in _json["data"]["context"]
         assert "CUSTOM CONTEXT" not in _json["data"]["context"]
 
+    @pytest.mark.parametrize(
+        "view_kwargs", [{"request": "test"}], indirect=True, ids=repr
+    )
+    @pytest.mark.asyncio
+    async def test_request_not_replaced(self, client, url_builder):
+        response = await client.get(url_builder(query="{context}"))
+
+        _json = await response.json()
+        assert response.status == 200
+        assert "request" in _json["data"]["context"]
+        assert _json["data"]["context"] == str({"request": "test"})
+
 
 @pytest.mark.asyncio
 async def test_post_multipart_data(client, base_url):
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = black, flake8, pylint, manifest, py{36,37,38}
+envlist = black, flake8, pylint, manifest, py{36,37,38,py3}
 
 [testenv:black]
 basepython = python3.8
