From 926b32ed80ad7d8d2e2d7c0ea509ad47fbd4509f Mon Sep 17 00:00:00 2001 From: Nicolas ROCHE Date: Wed, 19 Feb 2020 16:44:22 +0100 Subject: [PATCH] python3: accept byte content from django.template.response.TemplateResponse (#40012) --- tests/test_emails.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/tests/test_emails.py b/tests/test_emails.py index b922685..02983eb 100644 --- a/tests/test_emails.py +++ b/tests/test_emails.py @@ -11,6 +11,8 @@ import socket import threading from django.core.exceptions import ValidationError +from django.utils.encoding import force_text + from hobo.emails.validators import validate_email_address @@ -98,28 +100,28 @@ def test_invalid_address(client, admin_user): client.post('/login/', {'username': 'admin', 'password': 'password'}) response = client.post('/emails/', {'default_from_email': 'foobar'}) assert response.status_code == 200 - assert 'Enter a valid email address' in response.content + assert 'Enter a valid email address' in force_text(response.content) def test_unkown_address(client, admin_user, dns_resolver, smtp_server): client.post('/login/', {'username': 'admin', 'password': 'password'}) response = client.post('/emails/', {'default_from_email': 'john.doe@unknown.com'}) assert response.status_code == 200 - assert 'Email address not found' in response.content + assert 'Email address not found' in force_text(response.content) def test_kown_address_nospf(client, admin_user, dns_resolver, smtp_server): client.post('/login/', {'username': 'admin', 'password': 'password'}) response = client.post('/emails/', {'default_from_email': 'john.doe@example.com'}, follow=True) assert response.status_code == 200 - assert 'Emails settings have been updated. It will take a few seconds to be effective.' in response.content + assert 'Emails settings have been updated. It will take a few seconds to be effective.' in force_text(response.content) def test_spf_allow_all_mail(client, admin_user, dns_resolver, smtp_server, settings): client.post('/login/', {'username': 'admin', 'password': 'password'}) response = client.post('/emails/', {'default_from_email': 'john.doe@example-spf-allow-all.com'}, follow=True) assert response.status_code == 200 - assert 'Emails settings have been updated. It will take a few seconds to be effective.' in response.content + assert 'Emails settings have been updated. It will take a few seconds to be effective.' in force_text(response.content) def test_invalid_spf(client, admin_user, dns_resolver, smtp_server, settings): @@ -127,7 +129,7 @@ def test_invalid_spf(client, admin_user, dns_resolver, smtp_server, settings): client.post('/login/', {'username': 'admin', 'password': 'password'}) response = client.post('/emails/', {'default_from_email': 'john.doe@example-invalid-spf.com'}) assert response.status_code == 200 - assert 'No suitable SPF record found' in response.content + assert 'No suitable SPF record found' in force_text(response.content) def test_strict_nospf(client, admin_user, dns_resolver, smtp_server, monkeypatch, settings): @@ -136,7 +138,7 @@ def test_strict_nospf(client, admin_user, dns_resolver, smtp_server, monkeypatch client.post('/login/', {'username': 'admin', 'password': 'password'}) response = client.post('/emails/', {'default_from_email': 'john.doe@example.com'}, follow=True) assert response.status_code == 200 - assert 'No suitable SPF record found' in response.content + assert 'No suitable SPF record found' in force_text(response.content) def test_valid_spf(client, admin_user, dns_resolver, smtp_server, settings): @@ -144,7 +146,7 @@ def test_valid_spf(client, admin_user, dns_resolver, smtp_server, settings): client.post('/login/', {'username': 'admin', 'password': 'password'}) response = client.post('/emails/', {'default_from_email': 'john.doe@example-spf.com'}, follow=True) assert response.status_code == 200 - assert 'Emails settings have been updated. It will take a few seconds to be effective.' in response.content + assert 'Emails settings have been updated. It will take a few seconds to be effective.' in force_text(response.content) def test_no_spf_validation(client, admin_user, dns_resolver, smtp_server, settings): @@ -152,4 +154,4 @@ def test_no_spf_validation(client, admin_user, dns_resolver, smtp_server, settin client.post('/login/', {'username': 'admin', 'password': 'password'}) response = client.post('/emails/', {'default_from_email': 'john.doe@example-invalid-spf.com'}, follow=True) assert response.status_code == 200 - assert 'Emails settings have been updated. It will take a few seconds to be effective.' in response.content + assert 'Emails settings have been updated. It will take a few seconds to be effective.' in force_text(response.content)