tests: adapt client response checks for encoding

This commit is contained in:
Frédéric Péters 2020-07-28 13:54:09 +02:00
parent 88fcce8f37
commit 840b1c4f8e
1 changed files with 6 additions and 5 deletions

View File

@ -11,6 +11,7 @@ from django.core.management import call_command
from django.http.request import HttpRequest, QueryDict
from django.forms.fields import DateField
from django.test.client import RequestFactory, Client
from django.utils.encoding import force_text
from django.core.urlresolvers import reverse
from mandayejs.mandaye.models import UserCredentials
@ -111,7 +112,7 @@ def test_phantom_invalid_json(mocked_popen, caplog, user_john):
client = Client()
client.login(username='john', password='john')
response = client.get(reverse('post-login-do'))
assert 'window.top.location = "/_mandaye/associate/"' in response.content
assert 'window.top.location = "/_mandaye/associate/"' in force_text(response.content)
for message in response.context['messages']:
assert message.level_tag == 'error'
@ -212,9 +213,9 @@ def test_password_redirection(mocked_popen, user_john, redirect_url):
request.user = user_john
response = post_login_do(request)
if 'url1' in redirect_url:
assert 'window.top.location = "/update_password.aspx"' in response.content
assert 'window.top.location = "/update_password.aspx"' in force_text(response.content)
else:
assert 'window.top.location = "/index?path=change_pass"' in response.content
assert 'window.top.location = "/index?path=change_pass"' in force_text(response.content)
@mock.patch('mandayejs.mandaye.utils.subprocess.Popen')
@ -256,7 +257,7 @@ def test_post_login_do_with_next_url(mocked_popen, user_john):
request = request.get(url)
request.user = user_john
response = post_login_do(request)
assert 'window.top.location = "http://example.net/"' not in response.content
assert 'window.top.location = "http://example.net/"' not in force_text(response.content)
# when SSO succeeds
expected_output = {
@ -270,7 +271,7 @@ def test_post_login_do_with_next_url(mocked_popen, user_john):
request = request.get(url)
request.user = user_john
response = post_login_do(request)
assert 'window.top.location = "http://example.net/"' in response.content
assert 'window.top.location = "http://example.net/"' in force_text(response.content)
@mock.patch('mandayejs.applications.Test.SITE_LOCATORS', MOCKED_SITE_LOCATORS)