diff --git a/tests/test_source_phone.py b/tests/test_source_phone.py index f648b1e..2547674 100644 --- a/tests/test_source_phone.py +++ b/tests/test_source_phone.py @@ -22,6 +22,7 @@ import pytest from django.core.urlresolvers import reverse from django.test import override_settings from django.utils import six +from django.utils.encoding import force_text from django.utils.timezone import now, timedelta from welco.sources.phone import models @@ -43,7 +44,7 @@ def test_call_start_stop(client): content_type='application/json') assert response.status_code == 200 assert response['content-type'] == 'application/json' - assert json.loads(response.content) == {'err': 0} + assert response.json() == {'err': 0} assert models.PhoneCall.objects.count() == 1 assert models.PhoneCall.objects.filter( caller='0033699999999', @@ -54,7 +55,7 @@ def test_call_start_stop(client): content_type='application/json') assert response.status_code == 200 assert response['content-type'] == 'application/json' - assert json.loads(response.content) == {'err': 0} + assert response.json() == {'err': 0} assert models.PhoneCall.objects.count() == 2 assert models.PhoneCall.objects.filter( caller='0033699999999', @@ -70,7 +71,7 @@ def test_call_start_stop(client): content_type='application/json') assert response.status_code == 200 assert response['content-type'] == 'application/json' - assert json.loads(response.content) == {'err': 0} + assert response.json() == {'err': 0} assert models.PhoneCall.objects.count() == 2 assert models.PhoneCall.objects.filter( caller='0033699999999', @@ -81,7 +82,7 @@ def test_call_start_stop(client): content_type='application/json') assert response.status_code == 200 assert response['content-type'] == 'application/json' - assert json.loads(response.content) == {'err': 0} + assert response.json() == {'err': 0} assert models.PhoneCall.objects.count() == 2 assert models.PhoneCall.objects.filter( caller='0033699999999', @@ -141,7 +142,7 @@ def test_current_calls(user, client): content_type='application/json') assert response.status_code == 200 assert response['content-type'] == 'application/json' - assert json.loads(response.content) == {'err': 0} + assert response.json() == {'err': 0} # register user to some lines # then remove from some @@ -153,7 +154,7 @@ def test_current_calls(user, client): response = client.get(reverse('phone-current-calls')) assert response.status_code == 200 assert response['content-type'] == 'application/json' - payload = json.loads(response.content) + payload = response.json() assert isinstance(payload, dict) assert set(payload.keys()) == set(['err', 'data']) assert payload['err'] == 0 @@ -181,7 +182,7 @@ def test_current_calls(user, client): response = client.get(reverse('phone-current-calls')) assert response.status_code == 200 assert response['content-type'] == 'application/json' - payload = json.loads(response.content) + payload = response.json() assert isinstance(payload, dict) assert set(payload.keys()) == set(['err', 'data']) assert payload['err'] == 0 @@ -202,7 +203,7 @@ def test_take_release_line(user, client): content_type='application/json') assert response.status_code == 200 assert response['content-type'] == 'application/json' - assert json.loads(response.content) == {'err': 0} + assert response.json() == {'err': 0} assert models.PhoneLine.objects.count() == 1 assert models.PhoneLine.objects.filter( users=user, callee='102').count() == 1 @@ -210,7 +211,7 @@ def test_take_release_line(user, client): content_type='application/json') assert response.status_code == 200 assert response['content-type'] == 'application/json' - assert json.loads(response.content) == {'err': 0} + assert response.json() == {'err': 0} assert models.PhoneLine.objects.count() == 1 assert models.PhoneLine.objects.filter( users=user, callee='102').count() == 0 @@ -220,18 +221,18 @@ def test_phone_zone(user, client): client.login(username='toto', password='toto') response = client.get(reverse('phone-zone')) assert response.status_code == 200 - assert 'You do not have a phoneline configured' in response.content + assert 'You do not have a phoneline configured' in force_text(response.content) models.PhoneLine.take(callee='102', user=user) response = client.get(reverse('phone-zone')) assert response.status_code == 200 - assert 'You do not have a phoneline configured' not in response.content - assert '