Merge pull request #231 from alphagov/add_manage_service_permission

Add manage service permission
This commit is contained in:
Rebecca Law
2016-03-04 11:07:34 +00:00
9 changed files with 167 additions and 74 deletions

View File

@@ -9,7 +9,8 @@ def test_should_show_overview_page(
mock_login,
mock_get_service,
mock_get_users_by_service,
mock_get_invites_for_service
mock_get_invites_for_service,
mock_has_permissions
):
with app_.test_request_context():
with app_.test_client() as client:
@@ -25,7 +26,8 @@ def test_should_show_page_for_one_user(
app_,
api_user_active,
mock_login,
mock_get_service
mock_get_service,
mock_has_permissions
):
with app_.test_request_context():
with app_.test_client() as client:
@@ -35,32 +37,84 @@ def test_should_show_page_for_one_user(
assert response.status_code == 200
def test_redirect_after_saving_user(
def test_edit_user_permissions(
app_,
api_user_active,
mock_login,
mock_get_service,
mock_get_users_by_service,
mock_get_invites_for_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)
response = client.post(url_for(
'main.edit_user_permissions', service_id=55555, user_id=0
))
'main.edit_user_permissions', service_id=service_id, user_id=api_user_active.id
), data={'email_address': api_user_active.email_address,
'send_messages': 'yes',
'manage_service': 'yes',
'manage_api_keys': 'yes'})
assert response.status_code == 302
assert response.location == url_for(
'main.manage_users', service_id=55555, _external=True
'main.manage_users', service_id=service_id, _external=True
)
mock_set_user_permissions.assert_called_with(
str(api_user_active.id),
service_id,
['send_texts',
'send_emails',
'send_letters',
'manage_users',
'manage_templates',
'manage_settings',
'manage_api_keys',
'access_developer_docs'])
def test_edit_some_user_permissions(
app_,
api_user_active,
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)
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,
'send_messages': 'yes',
'manage_service': 'no',
'manage_api_keys': 'no'})
assert response.status_code == 302
assert response.location == url_for(
'main.manage_users', service_id=service_id, _external=True
)
mock_set_user_permissions.assert_called_with(
str(api_user_active.id),
service_id,
['send_texts',
'send_emails',
'send_letters'])
def test_should_show_page_for_inviting_user(
app_,
api_user_active,
mock_login,
mock_get_service
mock_get_user,
mock_get_service,
mock_has_permissions
):
with app_.test_request_context():
with app_.test_client() as client:
@@ -76,9 +130,12 @@ def test_invite_user(
service_one,
api_user_active,
mock_login,
mock_get_user,
mock_get_service,
mock_get_users_by_service,
mock_create_invite,
mock_get_invites_for_service
mock_get_invites_for_service,
mock_has_permissions
):
from_user = api_user_active.id
service_id = service_one['id']
@@ -106,7 +163,11 @@ def test_invite_user(
assert flash_banner == 'Invite sent to test@example.gov.uk'
def test_cancel_invited_user_cancels_user_invitations(app_, api_user_active, mock_login, mocker):
def test_cancel_invited_user_cancels_user_invitations(app_,
api_user_active,
mock_login,
mocker,
mock_has_permissions):
with app_.test_request_context():
with app_.test_client() as client:
mocker.patch('app.invite_api_client.cancel_invited_user')

View File

@@ -640,3 +640,8 @@ def mock_add_user_to_service(mocker, service_one, api_user_active):
def _add_user(service_id, user_id, invited_user):
return api_user_active
return mocker.patch('app.user_api_client.add_user_to_service', side_effect=_add_user)
@pytest.fixture(scope='function')
def mock_set_user_permissions(mocker):
return mocker.patch('app.user_api_client.set_user_permissions', return_value=None)