From cd864b5eca6952cb32d7a43a729fbd8b7d2f3fc5 Mon Sep 17 00:00:00 2001 From: Luiz Menezes Date: Mon, 7 May 2018 09:55:12 -0300 Subject: [PATCH] Fix aiohttp tests to include content type when parsing response to json --- tests/integration/aiohttp_utils.py | 4 ++-- tests/integration/test_aiohttp.py | 22 ++++++++++++++-------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/tests/integration/aiohttp_utils.py b/tests/integration/aiohttp_utils.py index a4eea82..41d3595 100644 --- a/tests/integration/aiohttp_utils.py +++ b/tests/integration/aiohttp_utils.py @@ -1,8 +1,8 @@ import aiohttp -async def aiohttp_request(loop, method, url, output='text', encoding='utf-8', **kwargs): # NOQA: E999 - async with aiohttp.ClientSession(loop=loop) as session: # NOQA: E999 +async def aiohttp_request(loop, method, url, output='text', encoding='utf-8', headers=None, **kwargs): # NOQA: E999 + async with aiohttp.ClientSession(loop=loop, headers=headers or {}) as session: # NOQA: E999 async with session.request(method, url, **kwargs) as response: # NOQA: E999 if output == 'text': content = await response.text() # NOQA: E999 diff --git a/tests/integration/test_aiohttp.py b/tests/integration/test_aiohttp.py index abd2cf2..db61984 100644 --- a/tests/integration/test_aiohttp.py +++ b/tests/integration/test_aiohttp.py @@ -71,11 +71,13 @@ def test_text(tmpdir, scheme): def test_json(tmpdir, scheme): url = scheme + '://httpbin.org/get' + headers = {'Content-Type': 'application/json'} + with vcr.use_cassette(str(tmpdir.join('json.yaml'))): - _, response_json = get(url, output='json') + _, response_json = get(url, output='json', headers=headers) with vcr.use_cassette(str(tmpdir.join('json.yaml'))) as cassette: - _, cassette_response_json = get(url, output='json') + _, cassette_response_json = get(url, output='json', headers=headers) assert cassette_response_json == response_json assert cassette.play_count == 1 @@ -105,24 +107,28 @@ def test_post(tmpdir, scheme): def test_params(tmpdir, scheme): url = scheme + '://httpbin.org/get' + headers = {'Content-Type': 'application/json'} params = {'a': 1, 'b': False, 'c': 'c'} - with vcr.use_cassette(str(tmpdir.join('get.yaml'))) as cassette: - _, response_json = get(url, output='json', params=params) with vcr.use_cassette(str(tmpdir.join('get.yaml'))) as cassette: - _, cassette_response_json = get(url, output='json', params=params) + _, response_json = get(url, output='json', params=params, headers=headers) + + with vcr.use_cassette(str(tmpdir.join('get.yaml'))) as cassette: + _, cassette_response_json = get(url, output='json', params=params, headers=headers) assert cassette_response_json == response_json assert cassette.play_count == 1 def test_params_same_url_distinct_params(tmpdir, scheme): url = scheme + '://httpbin.org/get' + headers = {'Content-Type': 'application/json'} params = {'a': 1, 'b': False, 'c': 'c'} - with vcr.use_cassette(str(tmpdir.join('get.yaml'))) as cassette: - _, response_json = get(url, output='json', params=params) with vcr.use_cassette(str(tmpdir.join('get.yaml'))) as cassette: - _, cassette_response_json = get(url, output='json', params=params) + _, response_json = get(url, output='json', params=params, headers=headers) + + with vcr.use_cassette(str(tmpdir.join('get.yaml'))) as cassette: + _, cassette_response_json = get(url, output='json', params=params, headers=headers) assert cassette_response_json == response_json assert cassette.play_count == 1