darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-18 13:39:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #998 from alphagov/invite-nongov-users

Browse Source 
Invite nongov users
This commit is contained in:
imdadahad
2016-10-28 15:40:37 +01:00
committed by GitHub
parent df313ad3d4 4dbae97fd1
commit 847bb8ed57
17 changed files with 235 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/app/main/test_validators.py
View File

@@ -1,6 +1,6 @@
import pytest
from app.main.forms import RegisterUserForm, ServiceSmsSender
from app.main.validators import ValidEmailDomainRegex, NoCommasInPlaceHolders
from app.main.validators import ValidGovEmail, NoCommasInPlaceHolders
from wtforms import ValidationError
from unittest.mock import Mock
@@ -85,7 +85,7 @@ def _gen_mock_field(x):
])
def test_valid_list_of_white_list_email_domains(app_, email):
with app_.test_request_context():
email_domain_validators = ValidEmailDomainRegex()
email_domain_validators = ValidGovEmail()
email_domain_validators(None, _gen_mock_field(email))
@@ -117,7 +117,7 @@ def test_valid_list_of_white_list_email_domains(app_, email):
])
def test_invalid_list_of_white_list_email_domains(app_, email):
with app_.test_request_context():
email_domain_validators = ValidEmailDomainRegex()
email_domain_validators = ValidGovEmail()
with pytest.raises(ValidationError):
email_domain_validators(None, _gen_mock_field(email))

21
tests/app/main/views/test_add_service.py
View File

@@ -1,6 +1,7 @@
from flask import url_for, session
from unittest.mock import ANY
import app
from app.utils import is_gov_user
def test_get_should_render_add_service_template(app_,
@@ -101,3 +102,23 @@ def test_should_return_form_errors_with_duplicate_service_name_regardless_of_cas
assert 'This service name is already in use' in response.get_data(as_text=True)
app.service_api_client.find_all_service_email_from.assert_called_once_with()
assert not mock_create_service.called
def test_non_whitelist_user_cannot_access_create_service_page(client,
mock_login,
mock_get_non_govuser,
api_nongov_user_active):
client.login(api_nongov_user_active)
assert not is_gov_user(api_nongov_user_active.email_address)
response = client.get(url_for('main.add_service'))
assert response.status_code == 403
def test_non_whitelist_user_cannot_create_service(client,
mock_login,
mock_get_non_govuser,
api_nongov_user_active):
client.login(api_nongov_user_active)
assert not is_gov_user(api_nongov_user_active.email_address)
response = client.post(url_for('main.add_service'), data={'name': 'SERVICE TWO'})
assert response.status_code == 403

10
tests/app/main/views/test_all_services.py
View File

@@ -30,6 +30,16 @@ def test_all_service_returns_403_when_not_a_platform_admin(app_,
assert response.status_code == 403
def test_non_gov_user_cannot_see_add_service_button(client,
mock_login,
mock_get_non_govuser,
api_nongov_user_active):
client.login(api_nongov_user_active)
response = client.get(url_for('main.choose_service'))
assert 'Add a new service' not in response.get_data(as_text=True)
assert response.status_code == 200
def _login_user(client, mocker, platform_admin_user, service_one):
mocker.patch('app.user_api_client.get_user', return_value=platform_admin_user)
client.login(platform_admin_user)

15
tests/app/main/views/test_forgot_password.py
View File

@@ -1,5 +1,8 @@
import pytest
from flask import url_for, Response
from notifications_python_client.errors import HTTPError
from tests.conftest import api_user_active as create_active_user
import app
@@ -12,19 +15,25 @@ def test_should_render_forgot_password(app_):
in response.get_data(as_text=True)
@pytest.mark.parametrize('email_address', [
'test@user.gov.uk',
'someuser@notonwhitelist.com'
])
def test_should_redirect_to_password_reset_sent_for_valid_email(
app_,
api_user_active,
fake_uuid,
email_address,
mocker):
with app_.test_request_context():
sample_user = create_active_user(fake_uuid, email_address=email_address)
mocker.patch('app.user_api_client.send_reset_password_url', return_value=None)
response = app_.test_client().post(
url_for('.forgot_password'),
data={'email_address': api_user_active.email_address})
data={'email_address': sample_user.email_address})
assert response.status_code == 200
assert 'Click the link in the email to reset your password.' \
in response.get_data(as_text=True)
app.user_api_client.send_reset_password_url.assert_called_once_with(api_user_active.email_address)
app.user_api_client.send_reset_password_url.assert_called_once_with(sample_user.email_address)
def test_should_redirect_to_password_reset_sent_for_missing_email(

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

@@ -1,8 +1,10 @@
import pytest
from flask import url_for
from bs4 import BeautifulSoup
import app
from app.notify_client.models import InvitedUser
from tests.conftest import service_one as service_1
from app.utils import is_gov_user
from tests.conftest import service_one as create_sample_service
def test_should_show_overview_page(
@@ -11,7 +13,7 @@ def test_should_show_overview_page(
mocker,
mock_get_invites_for_service
):
service = service_1(active_user_with_permissions)
service = create_sample_service(active_user_with_permissions)
with app_.test_request_context():
with app_.test_client() as client:
client.login(active_user_with_permissions, mocker, service)
@@ -28,7 +30,7 @@ def test_should_show_page_for_one_user(
active_user_with_permissions,
mocker
):
service = service_1(active_user_with_permissions)
service = create_sample_service(active_user_with_permissions)
with app_.test_request_context():
with app_.test_client() as client:
client.login(active_user_with_permissions, mocker, service)
@@ -44,7 +46,7 @@ def test_edit_user_permissions(
mock_get_invites_for_service,
mock_set_user_permissions
):
service = service_1(active_user_with_permissions)
service = create_sample_service(active_user_with_permissions)
with app_.test_request_context():
with app_.test_client() as client:
client.login(active_user_with_permissions, mocker, service)
@@ -83,7 +85,7 @@ def test_edit_some_user_permissions(
mock_get_invites_for_service,
mock_set_user_permissions
):
service = service_1(active_user_with_permissions)
service = create_sample_service(active_user_with_permissions)
data = [InvitedUser(**sample_invite)]
with app_.test_request_context():
with app_.test_client() as client:
@@ -119,7 +121,7 @@ def test_should_show_page_for_inviting_user(
active_user_with_permissions,
mocker
):
service = service_1(active_user_with_permissions)
service = create_sample_service(active_user_with_permissions)
with app_.test_request_context():
with app_.test_client() as client:
client.login(active_user_with_permissions, mocker, service)
@@ -129,20 +131,26 @@ def test_should_show_page_for_inviting_user(
assert response.status_code == 200
@pytest.mark.parametrize('email_address, gov_user', [
('test@example.gov.uk', True),
('test@nonwhitelist.com', False)
])
def test_invite_user(
app_,
active_user_with_permissions,
mocker,
sample_invite
sample_invite,
email_address,
gov_user
):
service = service_1(active_user_with_permissions)
email_address = 'test@example.gov.uk'
service = create_sample_service(active_user_with_permissions)
sample_invite['email_address'] = 'test@example.gov.uk'
data = [InvitedUser(**sample_invite)]
with app_.test_request_context():
with app_.test_client() as client:
client.login(active_user_with_permissions, mocker, service)
assert is_gov_user(email_address) == gov_user
mocker.patch('app.invite_api_client.get_invites_for_service', return_value=data)
mocker.patch('app.user_api_client.get_users_for_service', return_value=[active_user_with_permissions])
mocker.patch('app.invite_api_client.create_invite', return_value=InvitedUser(**sample_invite))
@@ -178,7 +186,7 @@ def test_cancel_invited_user_cancels_user_invitations(app_,
mocker.patch('app.invite_api_client.cancel_invited_user')
import uuid
invited_user_id = uuid.uuid4()
service = service_1(active_user_with_permissions)
service = create_sample_service(active_user_with_permissions)
client.login(active_user_with_permissions, mocker, service)
response = client.get(url_for('main.cancel_invited_user', service_id=service['id'],
invited_user_id=invited_user_id))
@@ -191,7 +199,7 @@ def test_manage_users_shows_invited_user(app_,
mocker,
active_user_with_permissions,
sample_invite):
service = service_1(active_user_with_permissions)
service = create_sample_service(active_user_with_permissions)
data = [InvitedUser(**sample_invite)]
with app_.test_request_context():
with app_.test_client() as client:
@@ -219,7 +227,7 @@ def test_manage_users_does_not_show_accepted_invite(app_,
sample_invite['id'] = invited_user_id
sample_invite['status'] = 'accepted'
data = [InvitedUser(**sample_invite)]
service = service_1(active_user_with_permissions)
service = create_sample_service(active_user_with_permissions)
with app_.test_request_context():
with app_.test_client() as client:
client.login(active_user_with_permissions, mocker, service)
@@ -242,7 +250,7 @@ def test_user_cant_invite_themselves(
active_user_with_permissions,
mock_create_invite
):
service = service_1(active_user_with_permissions)
service = create_sample_service(active_user_with_permissions)
with app_.test_request_context():
with app_.test_client() as client:
client.login(active_user_with_permissions, mocker, service)

20
tests/app/main/views/test_user_profile.py
View File

@@ -266,3 +266,23 @@ def test_should_redirect_after_password_change(app_,
assert response.status_code == 302
assert response.location == url_for(
'main.user_profile', _external=True)
def test_non_gov_user_cannot_see_change_email_link(client,
api_nongov_user_active,
mock_login,
mock_get_non_govuser):
client.login(api_nongov_user_active)
response = client.get(url_for('main.user_profile'))
assert '<a href="/user-profile/email">' not in response.get_data(as_text=True)
assert 'Your profile' in response.get_data(as_text=True)
assert response.status_code == 200
def test_non_gov_user_cannot_access_change_email_page(client,
api_nongov_user_active,
mock_login,
mock_get_non_govuser):
client.login(api_nongov_user_active)
response = client.get(url_for('main.user_profile_email'))
assert response.status_code == 403