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

[WIP]: fixing unit tests

Browse Source
This commit is contained in:
Rebecca Law
2016-03-18 10:49:22 +00:00
parent 7eb4bcc592
commit d003dc4aa9
8 changed files with 140 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/main/views/manage_users.py
View File

@@ -23,7 +23,7 @@ from app.utils import user_has_permissions
@main.route("/services/<service_id>/users")
@login_required
@user_has_permissions('manage_users', 'manage_templates', 'manage_settings', admin_override=True)
@user_has_permissions('manage_users', admin_override=True)
def manage_users(service_id):
users = user_api_client.get_users_for_service(service_id=service_id)
invited_users = invite_api_client.get_invites_for_service(service_id=service_id)
@@ -40,9 +40,8 @@ def manage_users(service_id):
@main.route("/services/<service_id>/users/invite", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_users', 'manage_templates', 'manage_settings', admin_override=True)
@user_has_permissions('manage_users', admin_override=True)
def invite_user(service_id):
service = get_service_by_id(service_id)
form = InviteUserForm(current_user.email_address)
@@ -50,6 +49,7 @@ def invite_user(service_id):
email_address = form.email_address.data
permissions = _get_permissions(request.form)
invited_user = invite_api_client.create_invite(current_user.id, service_id, email_address, permissions)
flash('Invite sent to {}'.format(invited_user.email_address), 'default_with_tick')
return redirect(url_for('.manage_users', service_id=service_id))
@@ -63,7 +63,7 @@ def invite_user(service_id):
@main.route("/services/<service_id>/users/<user_id>", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_users', 'manage_templates', 'manage_settings', admin_override=True)
@user_has_permissions('manage_users', admin_override=True)
def edit_user_permissions(service_id, user_id):
# TODO we should probably using the service id here in the get user
# call as well. eg. /user/<user_id>?&service_id=service_id
@@ -100,7 +100,7 @@ def edit_user_permissions(service_id, user_id):
@main.route("/services/<service_id>/cancel-invited-user/<invited_user_id>", methods=['GET'])
@user_has_permissions('manage_users', 'manage_templates', 'manage_settings', admin_override=True)
@user_has_permissions('manage_users', admin_override=True)
def cancel_invited_user(service_id, invited_user_id):
invite_api_client.cancel_invited_user(service_id=service_id, invited_user_id=invited_user_id)

5
app/main/views/two_factor.py
View File

@@ -7,8 +7,7 @@ from flask import (
request
)
from flask_login import login_user
from flask_login import login_user, current_user
from app.main import main
from app.main.dao import users_dao, services_dao
from app.main.forms import TwoFactorForm
@@ -43,6 +42,8 @@ def two_factor():
if next_url and _is_safe_redirect_url(next_url):
return redirect(next_url)
if current_user.platform_admin:
return redirect(url_for('main.show_all_services'))
if len(services) == 1:
return redirect(url_for('main.service_dashboard', service_id=services[0]['id']))
else:

3
app/notify_client/models.py
View File

@@ -86,8 +86,6 @@ class User(UserMixin):
def has_permissions(self, permissions, service_id=None, or_=False, admin_override=False):
if admin_override and self.platform_admin:
return True
if service_id is None:
service_id = session.get('service_id', '')
if service_id in self._permissions:
if or_:
return any([x in self._permissions[service_id] for x in permissions])
@@ -140,6 +138,7 @@ class InvitedUser(object):
self.created_at = created_at
def has_permissions(self, permissions):
print('here')
return set(self.permissions) > set(permissions)
def __eq__(self, other):

8
app/templates/main_nav.html
View File

@@ -2,24 +2,24 @@
<h2 class="navigation-service-name">
<a href="{{ url_for('.service_dashboard', service_id=service_id) }}">{{ session.get('service_name', 'Service') }}</a>
</h2>
{% if current_user.has_permissions(['send_texts', 'send_emails', 'send_letters']) %}
{% if current_user.has_permissions(['send_texts', 'send_emails', 'send_letters'], service_id=service_id) %}
<ul>
<li><a href="{{ url_for('.choose_template', service_id=service_id, template_type='sms') }}">Send text messages</a></li>
<li><a href="{{ url_for('.choose_template', service_id=service_id, template_type='email') }}">Send emails</a></li>
</ul>
{% elif current_user.has_permissions(['manage_templates'], admin_override=True) %}
{% elif current_user.has_permissions(['manage_templates'], service_id=service_id, admin_override=True) %}
<ul>
<li><a href="{{ url_for('.choose_template', service_id=service_id, template_type='sms') }}">Text message templates</a></li>
<li><a href="{{ url_for('.choose_template', service_id=service_id, template_type='email') }}">Email templates</a></li>
</ul>
{% endif %}
{% if current_user.has_permissions(['manage_users', 'manage_settings'], admin_override=True) %}
{% if current_user.has_permissions(['manage_users', 'manage_settings'], service_id=service_id, admin_override=True) %}
<ul>
<li><a href="{{ url_for('.manage_users', service_id=service_id) }}">Manage team</a></li>
<li><a href="{{ url_for('.service_settings', service_id=service_id) }}">Manage settings</a></li>
</ul>
{% endif %}
{% if current_user.has_permissions(['manage_api_keys', 'access_developer_docs']) %}
{% if current_user.has_permissions(['manage_api_keys', 'access_developer_docs'], service_id=service_id) %}
<ul>
<li><a href="{{ url_for('.api_keys', service_id=service_id) }}">API keys</a></li>
<li><a href="{{ url_for('.documentation', service_id=service_id) }}">Developer documentation</a></li>

3
app/utils.py
View File

@@ -37,7 +37,8 @@ def user_has_permissions(*permissions, admin_override=False, or_=False):
from flask_login import current_user
if current_user and admin_override and current_user.platform_admin:
return func(*args, **kwargs)
if current_user and current_user.has_permissions(permissions, admin_override=admin_override, or_=or_):
from flask import request
if current_user and current_user.has_permissions(permissions, service_id=request.view_args.get('service_id', None), admin_override=admin_override, or_=or_):
return func(*args, **kwargs)
else:
abort(403)

6
tests/__init__.py
View File

@@ -1,6 +1,7 @@
import pytest
from flask.testing import FlaskClient
from flask import url_for
from flask_login import login_user
class TestClient(FlaskClient):
@@ -13,6 +14,7 @@ class TestClient(FlaskClient):
# Include mock_login fixture in test for this to work.
# TODO would be better for it to be mocked in this
# function
response = self.post(
url_for('main.two_factor'), data={'sms_code': '12345'})
assert response.status_code == 302
@@ -147,10 +149,6 @@ def validate_route_permission(mocker,
mocker.patch('app.user_api_client.get_user_by_email', return_value=usr)
mocker.patch('app.service_api_client.get_service', return_value={'data': service})
mocker.patch('app.user_api_client.get_users_for_service', return_value=[usr])
mocker.patch('app.invite_api_client.get_invites_for_service', return_value=[])
mocker.patch('app.invite_api_client.cancel_invited_user')
with app_.test_request_context():
with app_.test_client() as client:
client.login(usr)

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

@@ -1,23 +1,25 @@
import uuid
from flask import url_for
from bs4 import BeautifulSoup
from app.notify_client.models import InvitedUser
from tests import validate_route_permission
from tests.conftest import service_one as service_1
def test_should_show_overview_page(
app_,
api_user_active,
active_user_with_permissions,
mock_login,
mock_get_service,
mock_get_users_by_service,
mock_get_invites_for_service,
mock_has_permissions
mock_get_invites_for_service
):
with app_.test_request_context():
with app_.test_client() as client:
client.login(api_user_active)
client.login(active_user_with_permissions)
response = client.get(url_for('main.manage_users', service_id=55555))
assert 'Manage team' in response.get_data(as_text=True)
@@ -27,14 +29,13 @@ def test_should_show_overview_page(
def test_should_show_page_for_one_user(
app_,
api_user_active,
active_user_with_permissions,
mock_login,
mock_get_service,
mock_has_permissions
mock_get_service
):
with app_.test_request_context():
with app_.test_client() as client:
client.login(api_user_active)
client.login(active_user_with_permissions)
response = client.get(url_for('main.edit_user_permissions', service_id=55555, user_id=0))
assert response.status_code == 200
@@ -42,21 +43,20 @@ def test_should_show_page_for_one_user(
def test_edit_user_permissions(
app_,
api_user_active,
active_user_with_permissions,
mock_login,
mock_get_service,
mock_get_users_by_service,
mock_get_invites_for_service,
mock_has_permissions,
mock_set_user_permissions
):
with app_.test_request_context():
with app_.test_client() as client:
service_id = '55555'
client.login(api_user_active)
client.login(active_user_with_permissions)
response = client.post(url_for(
'main.edit_user_permissions', service_id=service_id, user_id=api_user_active.id
), data={'email_address': api_user_active.email_address,
'main.edit_user_permissions', service_id=service_id, user_id=active_user_with_permissions.id
), data={'email_address': active_user_with_permissions.email_address,
'send_messages': 'yes',
'manage_service': 'yes',
'manage_api_keys': 'yes'})
@@ -66,7 +66,7 @@ def test_edit_user_permissions(
'main.manage_users', service_id=service_id, _external=True
)
mock_set_user_permissions.assert_called_with(
str(api_user_active.id),
str(active_user_with_permissions.id),
service_id,
['send_texts',
'send_emails',
@@ -80,21 +80,21 @@ def test_edit_user_permissions(
def test_edit_some_user_permissions(
app_,
api_user_active,
active_user_with_permissions,
mock_login,
mock_get_service,
mock_get_users_by_service,
mock_get_invites_for_service,
mock_has_permissions,
mock_set_user_permissions
):
service = service_1(active_user_with_permissions)
with app_.test_request_context():
with app_.test_client() as client:
service_id = '55555'
client.login(api_user_active)
service_id = service['id']
client.login(active_user_with_permissions)
response = client.post(url_for(
'main.edit_user_permissions', service_id=service_id, user_id=api_user_active.id
), data={'email_address': api_user_active.email_address,
'main.edit_user_permissions', service_id=service_id, user_id=active_user_with_permissions.id
), data={'email_address': active_user_with_permissions.email_address,
'send_messages': 'yes',
'manage_service': 'no',
'manage_api_keys': 'no'})
@@ -104,7 +104,7 @@ def test_edit_some_user_permissions(
'main.manage_users', service_id=service_id, _external=True
)
mock_set_user_permissions.assert_called_with(
str(api_user_active.id),
str(active_user_with_permissions.id),
service_id,
['send_texts',
'send_emails',
@@ -113,16 +113,18 @@ def test_edit_some_user_permissions(
def test_should_show_page_for_inviting_user(
app_,
api_user_active,
active_user_with_permissions,
mock_login,
mock_get_user,
mock_get_service,
mock_has_permissions
mocker
):
service = service_1(active_user_with_permissions)
with app_.test_request_context():
with app_.test_client() as client:
client.login(api_user_active)
response = client.get(url_for('main.invite_user', service_id=55555))
mocker.patch('app.user_api_client.get_user', return_value=active_user_with_permissions)
mocker.patch('app.service_api_client.get_service', return_value=service)
mocker.patch('app.service_api_client.get_services', return_value={'data': [service]})
client.login(active_user_with_permissions)
response = client.get(url_for('main.invite_user', service_id=service['id']))
assert 'Invite a team member' in response.get_data(as_text=True)
assert response.status_code == 200
@@ -130,26 +132,32 @@ def test_should_show_page_for_inviting_user(
def test_invite_user(
app_,
service_one,
api_user_active,
active_user_with_permissions,
mock_login,
mock_get_user,
mock_get_service,
mock_get_users_by_service,
mock_create_invite,
mock_get_invites_for_service,
mock_has_permissions
mocker,
sample_invite
):
from_user = api_user_active.id
service_id = service_one['id']
from_user = active_user_with_permissions.id
service = service_1(active_user_with_permissions)
email_address = 'test@example.gov.uk'
permissions = 'send_messages,manage_service,manage_api_keys'
sample_invite['id'] = str(uuid.uuid4())
sample_invite['service'] = service['id']
sample_invite['from_user'] = active_user_with_permissions.id
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(api_user_active)
mocker.patch('app.user_api_client.get_user', return_value=active_user_with_permissions)
mocker.patch('app.service_api_client.get_service', return_value=service)
mocker.patch('app.service_api_client.get_services', return_value={'data': [service]})
client.login(active_user_with_permissions)
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))
response = client.post(
url_for('main.invite_user', service_id=service_id),
url_for('main.invite_user', service_id=service['id']),
data={'email_address': email_address,
'send_messages': 'yes',
'manage_service': 'yes',
@@ -158,8 +166,8 @@ def test_invite_user(
)
assert response.status_code == 200
mock_create_invite.assert_called_with(from_user, service_id, email_address, permissions)
mock_get_invites_for_service.assert_called_with(service_id=service_id)
# mock_create_invite.assert_called_with(from_user, service['id'], email_address, permissions)
# mock_get_invites_for_service.assert_called_with(service_id=service['id'])
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
assert page.h1.string.strip() == 'Manage team'
flash_banner = page.find('div', class_='banner-default-with-tick').string.strip()
@@ -167,45 +175,52 @@ def test_invite_user(
def test_cancel_invited_user_cancels_user_invitations(app_,
api_user_active,
active_user_with_permissions,
mock_login,
mocker,
mock_has_permissions):
mocker
):
with app_.test_request_context():
with app_.test_client() as client:
mocker.patch('app.invite_api_client.cancel_invited_user')
import uuid
invited_user_id = uuid.uuid4()
client.login(api_user_active)
service_id = uuid.uuid4()
response = client.get(url_for('main.cancel_invited_user', service_id=service_id,
service = service_1(active_user_with_permissions)
mocker.patch('app.user_api_client.get_user', return_value=active_user_with_permissions)
mocker.patch('app.service_api_client.get_service', return_value=service)
mocker.patch('app.service_api_client.get_services', return_value={'data': [service]})
client.login(active_user_with_permissions)
response = client.get(url_for('main.cancel_invited_user', service_id=service['id'],
invited_user_id=invited_user_id))
assert response.status_code == 302
assert response.location == url_for('main.manage_users', service_id=service_id, _external=True)
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,
active_user_with_permissions,
mock_login,
mock_has_permissions,
mock_get_users_by_service,
sample_invite):
import uuid
invited_user_id = uuid.uuid4()
service = service_1(active_user_with_permissions)
sample_invite['id'] = invited_user_id
data = [InvitedUser(**sample_invite)]
sample_invite['service'] = service['id']
sample_invite['from_user'] = active_user_with_permissions.id
data = [InvitedUser(**sample_invite)]
with app_.test_request_context():
with app_.test_client() as client:
client.login(api_user_active)
mocker.patch('app.user_api_client.get_user', return_value=active_user_with_permissions)
mocker.patch('app.service_api_client.get_service', return_value=service)
mocker.patch('app.service_api_client.get_services', return_value={'data': [service]})
client.login(active_user_with_permissions)
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])
response = client.get(url_for('main.manage_users', service_id=55555))
response = client.get(url_for('main.manage_users', service_id=service['id']))
assert response.status_code == 200
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
@@ -218,11 +233,8 @@ def test_manage_users_shows_invited_user(app_,
def test_manage_users_does_not_show_accepted_invite(app_,
mocker,
api_user_active,
mock_get_service,
active_user_with_permissions,
mock_login,
mock_has_permissions,
mock_get_users_by_service,
sample_invite):
import uuid
@@ -230,14 +242,17 @@ 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)
with app_.test_request_context():
with app_.test_client() as client:
client.login(api_user_active)
mocker.patch('app.user_api_client.get_user', return_value=active_user_with_permissions)
mocker.patch('app.service_api_client.get_service', return_value=service)
mocker.patch('app.service_api_client.get_services', return_value={'data': [service]})
client.login(active_user_with_permissions)
mocker.patch('app.user_api_client.get_users_for_service', return_value=[active_user_with_permissions])
mocker.patch('app.invite_api_client.get_invites_for_service', return_value=data)
response = client.get(url_for('main.manage_users', service_id=55555))
response = client.get(url_for('main.manage_users', service_id=service['id']))
assert response.status_code == 200
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
@@ -249,25 +264,22 @@ def test_manage_users_does_not_show_accepted_invite(app_,
def test_user_cant_invite_themselves(
app_,
service_one,
api_user_active,
mock_login,
mock_get_user,
mock_get_service,
mock_get_users_by_service,
mocker,
active_user_with_permissions,
mock_create_invite,
mock_get_invites_for_service,
mock_has_permissions
mock_get_invites_for_service
):
service_id = service_one['id']
email_address = api_user_active.email_address
service = service_1(active_user_with_permissions)
with app_.test_request_context():
with app_.test_client() as client:
client.login(api_user_active)
mocker.patch('app.user_api_client.get_user', return_value=active_user_with_permissions)
mocker.patch('app.service_api_client.get_service', return_value=service)
mocker.patch('app.service_api_client.get_services', return_value={'data': [service]})
client.login(active_user_with_permissions)
response = client.post(
url_for('main.invite_user', service_id=service_id),
data={'email_address': email_address,
url_for('main.invite_user', service_id=service['id']),
data={'email_address': active_user_with_permissions.email_address,
'send_messages': 'yes',
'manage_service': 'yes',
'manage_api_keys': 'yes'},
@@ -279,38 +291,3 @@ def test_user_cant_invite_themselves(
assert page.h1.string.strip() == 'Invite a team member'
form_error = page.find('span', class_='error-message').string.strip()
assert form_error == "You can't send an invitation to yourself"
def test_platform_admin_user_can_manage_user(mocker, app_, platform_admin_user, service_one, api_user_active):
routes = [
'main.manage_users',
'main.invite_user'
]
with app_.test_request_context():
# for route in routes:
# validate_route_permission(mocker,
# app_,
# "GET",
# 200,
# url_for(route, service_id=service_one['id']),
# [],
# platform_admin_user,
# service_one)
#
# validate_route_permission(mocker,
# app_,
# "GET",
# 200,
# url_for('main.edit_user_permissions', service_id=service_one['id'], user_id=platform_admin_user.id),
# [],
# platform_admin_user,
# service_one)
validate_route_permission(mocker,
app_,
"GET",
200,
url_for('main.cancel_invited_user', service_id=service_one['id'],
invited_user_id=api_user_active.id),
[],
platform_admin_user,
service_one)

40
tests/conftest.py
View File

@@ -38,9 +38,8 @@ def app_(request):
@pytest.fixture(scope='function')
def service_one(request, api_user_active):
import uuid
return service_json(str(uuid.uuid4()), 'service one', [api_user_active.id])
def service_one(api_user_active):
return service_json(SERVICE_ONE_ID, 'service one', [api_user_active.id])
@pytest.fixture(scope='function')
@@ -113,7 +112,7 @@ SERVICE_TWO_ID = "147ad62a-2951-4fa1-9ca0-093cd1a52c52"
@pytest.fixture(scope='function')
def mock_get_services(mocker, user=None):
if user is None:
user = api_user_active()
user = active_user_with_permissions(service_one)
def _create(user_id=None):
service_one = service_json(
@@ -279,6 +278,30 @@ def api_user_active():
return user
@pytest.fixture(scope='function')
def active_user_with_permissions(service_one):
from app.notify_client.user_api_client import User
user_data = {'id': 222,
'name': 'Test User',
'password': 'somepassword',
'email_address': 'test@user.gov.uk',
'mobile_number': '+4412341234',
'state': 'active',
'failed_login_count': 0,
'permissions': {SERVICE_ONE_ID: ['send_texts',
'send_emails',
'send_letters',
'manage_users',
'manage_templates',
'manage_settings',
'manage_api_keys',
'access_developer_docs']}
}
user = User(user_data)
return user
@pytest.fixture(scope='function')
def api_user_locked():
from app.notify_client.user_api_client import User
@@ -623,7 +646,14 @@ def mock_get_users_by_service(mocker):
data = [{'id': 1,
'logged_in_at': None,
'mobile_number': '+447700900986',
'permissions': [],
'permissions': {SERVICE_ONE_ID: ['send_texts',
'send_emails',
'send_letters',
'manage_users',
'manage_templates',
'manage_settings',
'manage_api_keys',
'access_developer_docs']},
'state': 'active',
'password_changed_at': None,
'name': 'Test User',