resolve merge conflicts

tests/app/main/notify_client/test_sender.py

@@ -0,0 +1,35 @@
+from itsdangerous import BadSignature
+from pytest import fail
+
+from app.notify_client.sender import generate_token, check_token
+
+
+def test_should_return_email_from_signed_token(notifications_admin,
+                                               notifications_admin_db,
+                                               notify_db_session):
+    email = 'email@something.com'
+    token = generate_token(email)
+    assert email == check_token(token)
+
+
+def test_should_throw_exception_when_token_is_tampered_with(notifications_admin,
+                                                            notifications_admin_db,
+                                                            notify_db_session):
+    email = 'email@something.com'
+    token = generate_token(email)
+    try:
+        check_token(token + 'qerqwer')
+        fail()
+    except BadSignature:
+        pass
+
+
+def test_return_none_when_token_is_expired(notifications_admin,
+                                           notifications_admin_db,
+                                           notify_db_session):
+    with notifications_admin.test_request_context():
+        notifications_admin.config['TOKEN_MAX_AGE_SECONDS'] = -1000
+        email = 'email@something.com'
+        token = generate_token(email)
+        assert check_token(token) is None
+        notifications_admin.config['TOKEN_MAX_AGE_SECONDS'] = 120000

tests/app/main/views/test_forgot_password.py

@@ -1,15 +1,14 @@
 from flask import url_for
-
 from app.main.dao import users_dao
-from app.main.views import generate_token
 from tests.app.main import create_test_user
 
 
 def test_should_render_forgot_password(notifications_admin, notifications_admin_db, notify_db_session):
-    response = notifications_admin.test_client().get('/forgot-password')
-    assert response.status_code == 200
-    assert 'If you have forgotten your password, we can send you an email to create a new password.' \
-           in response.get_data(as_text=True)
+    with notifications_admin.test_request_context():
+        response = notifications_admin.test_client().get(url_for('.forgot_password'))
+        assert response.status_code == 200
+        assert 'If you have forgotten your password, we can send you an email to create a new password.' \
+               in response.get_data(as_text=True)
 
 
 def test_should_redirect_to_password_reset_sent_and_state_updated(notifications_admin,
@@ -17,25 +16,11 @@ def test_should_redirect_to_password_reset_sent_and_state_updated(notifications_
                                                                   mocker,
                                                                   notify_db_session):
     mocker.patch("app.admin_api_client.send_email")
-    user = create_test_user('active')
-    response = notifications_admin.test_client().post('/forgot-password',
-                                                      data={'email_address': user.email_address})
-    assert response.status_code == 200
-    assert 'You have been sent an email containing a link to reset your password.' in response.get_data(
-        as_text=True)
-    assert users_dao.get_user_by_id(user.id).state == 'request_password_reset'
-
-
-def test_should_redirect_to_forgot_password_with_flash_message_when_token_is_expired(notifications_admin,
-                                                                                     notifications_admin_db,
-                                                                                     notify_db_session):
     with notifications_admin.test_request_context():
-        with notifications_admin.test_client() as client:
-            notifications_admin.config['TOKEN_MAX_AGE_SECONDS'] = -1000
-            user = create_test_user('active')
-            token = generate_token(user.email_address)
-        response = client.post('/new-password/{}'.format(token),
-                               data={'new_password': 'a-new_password'})
-        assert response.status_code == 302
-        assert response.location == url_for('.forgot_password', _external=True)
-        notifications_admin.config['TOKEN_MAX_AGE_SECONDS'] = 86400
+        user = create_test_user('active')
+        response = notifications_admin.test_client().post(url_for('.forgot_password'),
+                                                          data={'email_address': user.email_address})
+        assert response.status_code == 200
+        assert 'You have been sent an email containing a link to reset your password.' in response.get_data(
+            as_text=True)
+        assert users_dao.get_user_by_id(user.id).state == 'request_password_reset'

tests/app/main/views/test_new_password.py

@@ -2,7 +2,7 @@ from flask import url_for
 
 from app.main.dao import users_dao
 from app.main.encryption import check_hash
-from app.main.views import generate_token
+from app.notify_client.sender import generate_token
 from tests.app.main import create_test_user
 
 
@@ -56,7 +56,7 @@ def test_should_redirect_to_forgot_password_with_flash_message_when_token_is_exp
         response = client.post(url_for('.new_password', token=token), data={'new_password': 'a-new_password'})
         assert response.status_code == 302
         assert response.location == url_for('.forgot_password', _external=True)
-        notifications_admin.config['TOKEN_MAX_AGE_SECONDS'] = 86400
+        notifications_admin.config['TOKEN_MAX_AGE_SECONDS'] = 3600
 
 
 def test_should_redirect_to_forgot_password_when_user_is_active_should_be_request_password_reset(notifications_admin,

tests/app/main/views/test_styleguide.py

@@ -0,0 +1,4 @@
+def test_styleguide_can_render(notifications_admin):
+    response = notifications_admin.test_client().get('/_styleguide')
+
+    assert response.status_code == 200