diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2015-12-10 11:29:20 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2015-12-10 11:29:20 -0600 |
| commit | 600a170ecf208f3ae67cc16369d50c1d6e0a7dce (patch) | |
| tree | 5844392fcc4cc0a3c0c1171a2dfbe6c60dfdaaf6 | |
| parent | e2b44bd7a7478792be47c98086f5c91d0da283e2 (diff) | |
| download | mediagoblin-600a170ecf208f3ae67cc16369d50c1d6e0a7dce.tar.lz mediagoblin-600a170ecf208f3ae67cc16369d50c1d6e0a7dce.tar.xz mediagoblin-600a170ecf208f3ae67cc16369d50c1d6e0a7dce.zip | |
Fix issue #5372: test_comment_notification fails with werkzeug 0.11 or newer
Formerly like:
chris commented on your post (http://localhost:80/u/otherperson/m/some-title/c/1/#comment) at GNU MediaGoblin
With werkzeug 0.11.0 or higher:
chris commented on your post (http://localhost/u/otherperson/m/some-title/c/1/#comment) at GNU MediaGoblin
Easy enough just to be flexible.
| -rw-r--r-- | mediagoblin/tests/test_notifications.py | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/mediagoblin/tests/test_notifications.py b/mediagoblin/tests/test_notifications.py index a1dc60ed..19bf8665 100644 --- a/mediagoblin/tests/test_notifications.py +++ b/mediagoblin/tests/test_notifications.py @@ -114,14 +114,28 @@ class TestNotifications: assert notification.obj().content == u'Test comment #42' if wants_email == True: - assert mail.EMAIL_TEST_MBOX_INBOX == [ - {'from': 'notice@mediagoblin.example.org', - 'message': 'Content-Type: text/plain; \ + # Why the `or' here? In Werkzeug 0.11.0 and above + # werkzeug stopped showing the port for localhost when + # rendering something like this. As long as we're + # supporting pre-0.11.0 we'll keep this `or', but maybe + # in the future we can kill it. + assert ( + mail.EMAIL_TEST_MBOX_INBOX == [ + {'from': 'notice@mediagoblin.example.org', + 'message': 'Content-Type: text/plain; \ charset="utf-8"\nMIME-Version: 1.0\nContent-Transfer-Encoding: \ base64\nSubject: GNU MediaGoblin - chris commented on your \ post\nFrom: notice@mediagoblin.example.org\nTo: \ otherperson@example.com\n\nSGkgb3RoZXJwZXJzb24sCmNocmlzIGNvbW1lbnRlZCBvbiB5b3VyIHBvc3QgKGh0dHA6Ly9sb2Nh\nbGhvc3Q6ODAvdS9vdGhlcnBlcnNvbi9tL3NvbWUtdGl0bGUvYy8xLyNjb21tZW50KSBhdCBHTlUg\nTWVkaWFHb2JsaW4KClRlc3QgY29tbWVudCAjNDIKCkdOVSBNZWRpYUdvYmxpbg==\n', - 'to': [u'otherperson@example.com']}] + 'to': [u'otherperson@example.com']}] + or mail.EMAIL_TEST_MBOX_INBOX == [ + {'from': 'notice@mediagoblin.example.org', + 'message': 'Content-Type: text/plain; \ +charset="utf-8"\nMIME-Version: 1.0\nContent-Transfer-Encoding: \ +base64\nSubject: GNU MediaGoblin - chris commented on your \ +post\nFrom: notice@mediagoblin.example.org\nTo: \ +otherperson@example.com\n\nSGkgb3RoZXJwZXJzb24sCmNocmlzIGNvbW1lbnRlZCBvbiB5b3VyIHBvc3QgKGh0dHA6Ly9sb2Nh\nbGhvc3QvdS9vdGhlcnBlcnNvbi9tL3NvbWUtdGl0bGUvYy8xLyNjb21tZW50KSBhdCBHTlUgTWVk\naWFHb2JsaW4KClRlc3QgY29tbWVudCAjNDIKCkdOVSBNZWRpYUdvYmxpbg==\n', + 'to': [u'otherperson@example.com']}]) else: assert mail.EMAIL_TEST_MBOX_INBOX == [] |