Merge branch 'master' into forgot-password

Conflicts:
	app/main/views/two_factor.py

tests/conftest.py

@@ -602,7 +602,7 @@ def mock_s3_upload(mocker):
 
 
 @pytest.fixture(scope='function')
-def sample_invite(mocker, service_one):
+def sample_invite(mocker, service_one, status='pending'):
     import datetime
     id = str(uuid.uuid4())
     from_user = service_one['users'][0]
@@ -610,7 +610,7 @@ def sample_invite(mocker, service_one):
     service_id = service_one['id']
     permissions = 'send_messages,manage_service,manage_api_keys'
     created_at = str(datetime.datetime.now())
-    return invite_json(id, from_user, service_id, email_address, permissions, created_at)
+    return invite_json(id, from_user, service_id, email_address, permissions, created_at, status)
 
 
 @pytest.fixture(scope='function')
@@ -646,15 +646,22 @@ def mock_get_invites_for_service(mocker, service_one, sample_invite):
 
 
 @pytest.fixture(scope='function')
-def mock_accept_invite(mocker, sample_invite):
-    def _accept_token(token):
+def mock_check_invite_token(mocker, sample_invite):
+    def _check_token(token):
         return InvitedUser(**sample_invite)
-    return mocker.patch('app.invite_api_client.accept_invite', side_effect=_accept_token)
+    return mocker.patch('app.invite_api_client.check_token', side_effect=_check_token)
+
+
+@pytest.fixture(scope='function')
+def mock_accept_invite(mocker, sample_invite):
+    def _accept(service_id, invite_id):
+        return InvitedUser(**sample_invite)
+    return mocker.patch('app.invite_api_client.accept_invite', side_effect=_accept)
 
 
 @pytest.fixture(scope='function')
 def mock_add_user_to_service(mocker, service_one, api_user_active):
-    def _add_user(service_id, user_id, invited_user):
+    def _add_user(service_id, user_id, permissions):
         return api_user_active
     return mocker.patch('app.user_api_client.add_user_to_service', side_effect=_add_user)