Skip to content

Commit

Permalink
Fix aiohttp tests to include content type when parsing response to json
Browse files Browse the repository at this point in the history
  • Loading branch information
lamenezes committed May 7, 2018
1 parent 689d68a commit cd864b5
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 8 deletions.
4 changes: 2 additions & 2 deletions tests/integration/aiohttp_utils.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
18 changes: 12 additions & 6 deletions tests/integration/test_aiohttp.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
_, 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)
_, 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)
_, 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)
_, cassette_response_json = get(url, output='json', params=params, headers=headers)
assert cassette_response_json == response_json
assert cassette.play_count == 1

Expand Down

0 comments on commit cd864b5

Please sign in to comment.