Merge branch 'master' into load-service-err

tests/app/main/test_errorhandlers.py

@@ -1,4 +1,5 @@
 from flask import Response
+import pytest
 from bs4 import BeautifulSoup
 from notifications_python_client.errors import HTTPError
 
@@ -21,3 +22,19 @@ def test_load_service_before_request_handles_404(client_request, mocker):
     )
 
     get_service.assert_called_once_with('00000000-0000-0000-0000-000000000000')
+
+
+@pytest.mark.parametrize('url', [
+    '/invitation/MALFORMED_TOKEN',
+    '/new-password/MALFORMED_TOKEN',
+    '/user-profile/email/confirm/MALFORMED_TOKEN',
+    '/verify-email/MALFORMED_TOKEN'
+])
+def test_malformed_token_returns_page_not_found(logged_in_client, url):
+    response = logged_in_client.get(url)
+
+    assert response.status_code == 404
+    page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
+    assert page.h1.string.strip() == 'Page could not be found'
+    flash_banner = page.find('div', class_='banner-dangerous').string.strip()
+    assert flash_banner == "There’s something wrong with the link you’ve used."