darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-05-05 00:20:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into forgot-password

Browse Source 
Conflicts:
	app/main/views/two_factor.py
This commit is contained in:
Rebecca Law
2016-03-08 15:03:25 +00:00
parent e735d772fe d3825b253a
commit 29ddad60e7
19 changed files with 293 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/__init__.py
View File

@@ -48,12 +48,12 @@ def api_key_json(id_, name, expiry_date=None):
}
def invite_json(id, from_user, service_id, email_address, permissions, created_at):
def invite_json(id, from_user, service_id, email_address, permissions, created_at, status):
return {'id': id,
'from_user': from_user,
'service': service_id,
'email_address': email_address,
'status': 'pending',
'status': status,
'permissions': permissions,
'created_at': created_at
}
@@ -110,6 +110,7 @@ def job_json():
'file_name': '{}.csv'.format(job_id),
'created_at': created_at,
'notification_count': 1,
'notifications_sent': 1,
'status': ''
}
return data

20
tests/app/main/notify_client/test_invite_client.py Normal file
View File

@@ -0,0 +1,20 @@
from app.notify_client.invite_api_client import InviteApiClient
def test_client_returns_invite(mocker, sample_invite):
sample_invite['status'] = 'pending'
service_id = sample_invite['service']
expected_data = {'data': [sample_invite]}
expected_url = '/service/{}/invite'.format(service_id)
client = InviteApiClient()
mock_get = mocker.patch('app.notify_client.invite_api_client.InviteApiClient.get', return_value=expected_data)
invites = client.get_invites_for_service(service_id)
mock_get.assert_called_once_with(expected_url)
assert len(invites) == 1
assert invites[0].status == 'pending'

105
tests/app/main/views/test_accept_invite.py
View File

@@ -2,27 +2,33 @@ from flask import url_for
from bs4 import BeautifulSoup
import app
from tests.conftest import sample_invite as create_sample_invite
from tests.conftest import mock_check_invite_token as mock_check_token_invite
def test_existing_user_accept_invite_calls_api_and_redirects_to_dashboard(app_,
service_one,
api_user_active,
sample_invite,
sample_invited_user,
mock_accept_invite,
mock_check_invite_token,
mock_get_user_by_email,
mock_add_user_to_service):
mock_add_user_to_service,
mock_accept_invite):
expected_service = service_one['id']
expected_redirect_location = 'http://localhost/services/{}/dashboard'.format(expected_service)
expected_permissions = ['send_messages', 'manage_service', 'manage_api_keys']
with app_.test_request_context():
with app_.test_client() as client:
response = client.get(url_for('main.accept_invite', token='thisisnotarealtoken'))
mock_accept_invite.assert_called_with('thisisnotarealtoken')
mock_check_invite_token.assert_called_with('thisisnotarealtoken')
mock_get_user_by_email.assert_called_with('invited_user@test.gov.uk')
mock_add_user_to_service.assert_called_with(expected_service, api_user_active.id, sample_invited_user)
mock_add_user_to_service.assert_called_with(expected_service, api_user_active.id, expected_permissions)
mock_accept_invite.assert_called_with(expected_service, sample_invite['id'])
assert response.status_code == 302
assert response.location == expected_redirect_location
@@ -32,21 +38,22 @@ def test_existing_signed_out_user_accept_invite_redirects_to_sign_in(app_,
service_one,
api_user_active,
sample_invite,
sample_invited_user,
mock_accept_invite,
mock_check_invite_token,
mock_get_user_by_email,
mock_add_user_to_service):
mock_add_user_to_service,
mock_accept_invite):
expected_service = service_one['id']
expected_permissions = ['send_messages', 'manage_service', 'manage_api_keys']
with app_.test_request_context():
with app_.test_client() as client:
response = client.get(url_for('main.accept_invite', token='thisisnotarealtoken'), follow_redirects=True)
mock_accept_invite.assert_called_with('thisisnotarealtoken')
mock_check_invite_token.assert_called_with('thisisnotarealtoken')
mock_get_user_by_email.assert_called_with('invited_user@test.gov.uk')
mock_add_user_to_service.assert_called_with(expected_service, api_user_active.id, sample_invited_user)
mock_add_user_to_service.assert_called_with(expected_service, api_user_active.id, expected_permissions)
mock_accept_invite.assert_called_with(expected_service, sample_invite['id'])
assert response.status_code == 200
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
@@ -55,10 +62,10 @@ def test_existing_signed_out_user_accept_invite_redirects_to_sign_in(app_,
def test_new_user_accept_invite_calls_api_and_redirects_to_registration(app_,
service_one,
sample_invite,
mock_accept_invite,
mock_check_invite_token,
mock_dont_get_user_by_email,
mock_add_user_to_service):
mock_add_user_to_service,
mock_accept_invite):
expected_redirect_location = 'http://localhost/register-from-invite'
@@ -67,21 +74,73 @@ def test_new_user_accept_invite_calls_api_and_redirects_to_registration(app_,
response = client.get(url_for('main.accept_invite', token='thisisnotarealtoken'))
mock_accept_invite.assert_called_with('thisisnotarealtoken')
mock_check_invite_token.assert_called_with('thisisnotarealtoken')
mock_dont_get_user_by_email.assert_called_with('invited_user@test.gov.uk')
assert response.status_code == 302
assert response.location == expected_redirect_location
def test_new_user_accept_invite_calls_api_and_views_registration_page(app_,
service_one,
mock_check_invite_token,
mock_dont_get_user_by_email,
mock_add_user_to_service,
mock_accept_invite):
with app_.test_request_context():
with app_.test_client() as client:
response = client.get(url_for('main.accept_invite', token='thisisnotarealtoken'), follow_redirects=True)
mock_check_invite_token.assert_called_with('thisisnotarealtoken')
mock_dont_get_user_by_email.assert_called_with('invited_user@test.gov.uk')
assert response.status_code == 200
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
assert page.h1.string.strip() == 'Create an account'
form = page.find('form')
email = form.find('input', id='email_address')
name = form.find('input', id='name')
password = form.find('input', id='password')
service = form.find('input', type='hidden', id='service')
assert email
assert email.attrs['disabled']
assert name
assert password
assert service
assert service.attrs['value'] == service_one['id']
def test_cancelled_invited_user_accepts_invited_redirect_to_cancelled_invitation(app_,
service_one,
mocker,
mock_get_user,
mock_get_service
):
with app_.test_request_context():
with app_.test_client() as client:
cancelled_invitation = create_sample_invite(mocker, service_one, status='cancelled')
mock_check_token_invite(mocker, cancelled_invitation)
response = client.get(url_for('main.accept_invite', token='thisisnotarealtoken'))
app.invite_api_client.check_token.assert_called_with('thisisnotarealtoken')
assert response.status_code == 200
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
assert page.h1.string.strip() == 'The invitation you were sent has been cancelled'
def test_new_user_accept_invite_completes_new_registration_redirects_to_verify(app_,
service_one,
sample_invite,
mock_accept_invite,
mock_check_invite_token,
mock_dont_get_user_by_email,
mock_register_user,
mock_send_verify_code,
mock_add_user_to_service):
mock_add_user_to_service,
mock_accept_invite):
expected_service = service_one['id']
expected_email = sample_invite['email_address']
@@ -122,8 +181,7 @@ def test_new_user_accept_invite_completes_new_registration_redirects_to_verify(a
def test_new_invited_user_verifies_and_added_to_service(app_,
service_one,
sample_invite,
sample_invited_user,
mock_accept_invite,
mock_check_invite_token,
mock_dont_get_user_by_email,
mock_register_user,
mock_send_verify_code,
@@ -131,6 +189,7 @@ def test_new_invited_user_verifies_and_added_to_service(app_,
mock_get_user,
mock_update_user,
mock_add_user_to_service,
mock_accept_invite,
mock_get_service,
mock_get_service_templates,
mock_get_jobs):
@@ -156,12 +215,18 @@ def test_new_invited_user_verifies_and_added_to_service(app_,
# when they post codes back to admin user should be added to
# service and sent on to dash board
expected_permissions = ['send_messages', 'manage_service', 'manage_api_keys']
with client.session_transaction() as session:
new_user_id = session['user_id']
mock_add_user_to_service.assert_called_with(data['service'], new_user_id, sample_invited_user)
mock_add_user_to_service.assert_called_with(data['service'], new_user_id, expected_permissions)
mock_accept_invite.assert_called_with(data['service'], sample_invite['id'])
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
element = page.find('h2', class_='navigation-service-name').find('a')
assert element.text == 'Test Service'
service_link = element.attrs['href']
assert service_link == '/services/{}/dashboard'.format(service_one['id'])
flash_banner = page.find('div', class_='banner-default-with-tick').string.strip()
assert flash_banner == 'You have sucessfully accepted your invitation and been added to Test Service'

64
tests/app/main/views/test_manage_users.py
View File

@@ -2,6 +2,8 @@ from flask import url_for
from bs4 import BeautifulSoup
from app.notify_client.models import InvitedUser
def test_should_show_overview_page(
app_,
@@ -180,3 +182,65 @@ def test_cancel_invited_user_cancels_user_invitations(app_,
assert response.status_code == 302
assert response.location == url_for('main.manage_users', service_id=service_id, _external=True)
def test_manage_users_shows_invited_user(app_,
mocker,
api_user_active,
mock_get_service,
mock_login,
mock_has_permissions,
mock_get_users_by_service,
sample_invite):
import uuid
invited_user_id = uuid.uuid4()
sample_invite['id'] = invited_user_id
data = [InvitedUser(**sample_invite)]
with app_.test_request_context():
with app_.test_client() as client:
client.login(api_user_active)
mocker.patch('app.invite_api_client.get_invites_for_service', return_value=data)
response = client.get(url_for('main.manage_users', service_id=55555))
assert response.status_code == 200
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
assert page.h1.string.strip() == 'Manage team'
invites_table = page.find_all('table')[1]
cols = invites_table.find_all('td')
assert cols[0].text.strip() == 'invited_user@test.gov.uk'
assert cols[4].text.strip() == 'Cancel invitation'
def test_manage_users_does_not_show_accepted_invite(app_,
mocker,
api_user_active,
mock_get_service,
mock_login,
mock_has_permissions,
mock_get_users_by_service,
sample_invite):
import uuid
invited_user_id = uuid.uuid4()
sample_invite['id'] = invited_user_id
sample_invite['status'] = 'accepted'
data = [InvitedUser(**sample_invite)]
with app_.test_request_context():
with app_.test_client() as client:
client.login(api_user_active)
mocker.patch('app.invite_api_client.get_invites_for_service', return_value=data)
response = client.get(url_for('main.manage_users', service_id=55555))
assert response.status_code == 200
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
assert page.h1.string.strip() == 'Manage team'
tables = page.find_all('table')
assert len(tables) == 1
assert not page.find(text='invited_user@test.gov.uk')

19
tests/conftest.py
View File

@@ -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)