Merge pull request #84 from xsnippet/aiohttp-3

Use aiohttp_client fixture instead of test_client

tests/conftest.py

@@ -34,7 +34,7 @@ async def testdatabase(request, loop, testconf):
 
 
 @pytest.fixture(scope='function')
-async def testapp(request, test_client, testconf, testdatabase):
+async def testapp(request, aiohttp_client, testconf, testdatabase):
     box = picobox.Box()
     box.put('conf', testconf)
     box.put('database', testdatabase)
@@ -46,7 +46,7 @@ async def testapp(request, test_client, testconf, testdatabase):
     # This is especially weird as Picobox provides convenient context manager
     # and no plain functions, that's why manual triggering is required.
     request.addfinalizer(lambda: picobox.pop())
-    return await test_client(
+    return await aiohttp_client(
         create_app(),
 
         # If 'Content-Type' is not passed to HTTP request, aiohttp client will

tests/middlewares/test_auth.py

@@ -16,7 +16,7 @@
 
 
 @pytest.fixture(scope='function')
-async def testapp(test_client):
+async def testapp(aiohttp_client):
     app = web.Application(middlewares=[
         middlewares.auth.auth({'secret': 'SWORDFISH'}),
     ])
@@ -35,7 +35,7 @@ async def handler(request):
         return web.Response(text='success')
     app.router.add_get('/success-no-token', handler)
 
-    return await test_client(app)
+    return await aiohttp_client(app)
 
 
 @pytest.mark.parametrize('token', [

tests/test_resource.py

@@ -55,7 +55,7 @@ async def post(self):
 
 
 @pytest.fixture(scope='function')
-async def testapp(test_client):
+async def testapp(aiohttp_client):
     app = web.Application()
     app.router.add_route('*', '/test', _TestResource)
     app.router.add_route('*', '/test-encoders', _TestEncodersResource)
@@ -66,7 +66,7 @@ async def testapp(test_client):
     # ridiculous because in case of RESTful API this is completely wrong
     # and APIs usually have their own defaults. So turn off this feature,
     # and do not set 'Content-Type' for us if it wasn't passed.
-    return await test_client(app, skip_auto_headers={'Content-Type'})
+    return await aiohttp_client(app, skip_auto_headers={'Content-Type'})
 
 
 @pytest.mark.parametrize('headers,', [

tests/test_router.py

@@ -15,7 +15,7 @@
 
 
 @pytest.fixture(scope='function')
-async def testapp(test_client):
+async def testapp(aiohttp_client):
     class _TestResource1(web.View):
         async def get(self):
             return web.Response(text='I am the night!')
@@ -39,7 +39,7 @@ async def get(self):
             default='2',
         )
     )
-    return await test_client(app)
+    return await aiohttp_client(app)
 
 
 async def test_version_1(testapp):