Skip to content

Commit

Permalink
Bugfix: EnvironBuilder doesn't take json
Browse files Browse the repository at this point in the history
  • Loading branch information
untitaker committed Aug 19, 2016
1 parent 5c4fa7e commit 136a833
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion flask/testing.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def make_test_environ_builder(app, path='/', base_url=None, *args, **kwargs):
if 'json' in kwargs:
if 'data' in kwargs:
raise ValueError('Client cannot provide both `json` and `data`')
kwargs['data'] = json_dumps(kwargs['json'])
kwargs['data'] = json_dumps(kwargs.pop('json'))

# Only set Content-Type when not explicitly provided
if 'content_type' not in kwargs:
Expand Down

0 comments on commit 136a833

Please sign in to comment.