Skip to content

use charset in raw body test instead of relying on Django test client #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

use charset in raw body test instead of relying on Django test client #158

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions tests/contrib/django/django_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1164,7 +1164,7 @@ def test_tracing_middleware_uses_test_client(client, django_elasticapm_client):
{'capture_body': 'off'},
], indirect=True)
def test_capture_post_errors_dict(client, django_elasticapm_client):
with pytest.raises(Exception):
with pytest.raises(MyException):
client.post(reverse('elasticapm-raise-exc'), {'username': 'john', 'password': 'smith'})
error = django_elasticapm_client.events[0]
if django_elasticapm_client.config.capture_body in ('errors', 'all'):
Expand All @@ -1180,7 +1180,7 @@ def test_capture_post_errors_dict(client, django_elasticapm_client):
{'capture_body': 'off'},
], indirect=True)
def test_capture_post_errors_multivalue_dict(client, django_elasticapm_client):
with pytest.raises(Exception):
with pytest.raises(MyException):
client.post(reverse('elasticapm-raise-exc'), 'key=value1&key=value2&test=test&key=value3',
content_type='application/x-www-form-urlencoded')
error = django_elasticapm_client.events[0]
Expand All @@ -1200,9 +1200,9 @@ def test_capture_post_errors_multivalue_dict(client, django_elasticapm_client):
], indirect=True)
def test_capture_post_errors_raw(client, django_sending_elasticapm_client):
# use "sending" client to ensure that we encode the payload correctly
with pytest.raises(Exception):
client.post(reverse('elasticapm-raise-exc'), json.dumps({'a': 'b'}).encode('utf8'),
content_type='application/json')
with pytest.raises(MyException):
client.post(reverse('elasticapm-raise-exc'), json.dumps({'a': 'b'}),
content_type='application/json; charset=utf8')
error = django_sending_elasticapm_client.httpserver.payloads[0]
if django_sending_elasticapm_client.config.capture_body in ('errors', 'all'):
assert error['errors'][0]['context']['request']['body'] == '{"a": "b"}'
Expand All @@ -1217,7 +1217,7 @@ def test_capture_post_errors_raw(client, django_sending_elasticapm_client):
{'capture_body': 'off'},
], indirect=True)
def test_capture_empty_body(client, django_elasticapm_client):
with pytest.raises(Exception):
with pytest.raises(MyException):
client.post(reverse('elasticapm-raise-exc'), data={})
error = django_elasticapm_client.events[0]
# body should be empty no matter if we capture it or not
Expand Down