heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issue #5372: test_comment_notification fails with werkzeug 0.11 or newer

Browse Source 
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.
This commit is contained in:
Christopher Allan Webber 2015-12-10 11:29:20 -06:00
parent e2b44bd7a7
commit 600a170ecf
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mediagoblin/tests/test_notifications.py
View File

@ -114,7 +114,13 @@ class TestNotifications:
assert notification.obj().content == u'Test comment #42' assert notification.obj().content == u'Test comment #42'
if wants_email == True: if wants_email == True:
assert mail.EMAIL_TEST_MBOX_INBOX == [ # 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', {'from': 'notice@mediagoblin.example.org',
'message': 'Content-Type: text/plain; \ 'message': 'Content-Type: text/plain; \
charset="utf-8"\nMIME-Version: 1.0\nContent-Transfer-Encoding: \ charset="utf-8"\nMIME-Version: 1.0\nContent-Transfer-Encoding: \
@ -122,6 +128,14 @@ base64\nSubject: GNU MediaGoblin - chris commented on your \
post\nFrom: notice@mediagoblin.example.org\nTo: \ post\nFrom: notice@mediagoblin.example.org\nTo: \
otherperson@example.com\n\nSGkgb3RoZXJwZXJzb24sCmNocmlzIGNvbW1lbnRlZCBvbiB5b3VyIHBvc3QgKGh0dHA6Ly9sb2Nh\nbGhvc3Q6ODAvdS9vdGhlcnBlcnNvbi9tL3NvbWUtdGl0bGUvYy8xLyNjb21tZW50KSBhdCBHTlUg\nTWVkaWFHb2JsaW4KClRlc3QgY29tbWVudCAjNDIKCkdOVSBNZWRpYUdvYmxpbg==\n', 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: else:
assert mail.EMAIL_TEST_MBOX_INBOX == [] assert mail.EMAIL_TEST_MBOX_INBOX == []