Merge pull request #2856 from alphagov/edit-members-who-see-folder

Edit members who see folder
This commit is contained in:
Pea (Malgorzata Tyczynska)
2019-03-19 14:11:59 +00:00
committed by GitHub
7 changed files with 125 additions and 32 deletions

View File

@@ -417,14 +417,18 @@ def test_can_create_email_template_with_parent_folder(
def test_get_manage_folder_page(
client_request,
active_user_with_permissions,
service_one,
mock_get_template_folders,
mocker
):
folder_id = str(uuid.uuid4())
mock_get_template_folders.return_value = [
{'id': folder_id, 'name': 'folder_two', 'parent_id': None},
{'id': folder_id, 'name': 'folder_two', 'parent_id': None, 'users_with_permission': [
active_user_with_permissions.id
]},
]
mocker.patch('app.models.service.Service.active_users', [active_user_with_permissions])
page = client_request.get(
'main.manage_template_folder',
service_id=service_one['id'],
@@ -437,10 +441,50 @@ def test_get_manage_folder_page(
assert page.select_one('input[name=name]')['value'] == 'folder_two'
delete_link = page.find('a', string="Delete this folder")
expected_delete_url = "/services/{}/templates/folders/{}/delete".format(service_one['id'], folder_id)
assert expected_delete_url in delete_link["href"]
def test_get_manage_folder_viewing_permissions_for_users(
client_request,
active_user_with_permissions,
service_one,
mock_get_template_folders,
mocker
):
folder_id = str(uuid.uuid4())
team_member = active_user_view_permissions(str(uuid.uuid4()))
team_member_2 = active_user_view_permissions(str(uuid.uuid4()))
service_one["permissions"] += ["edit_folder_permissions"]
mock_get_template_folders.return_value = [
{'id': folder_id, 'name': 'folder_two', 'parent_id': None, 'users_with_permission': [
active_user_with_permissions.id, team_member_2.id
]},
]
mocker.patch('app.models.service.Service.active_users', [active_user_with_permissions, team_member, team_member_2])
page = client_request.get(
'main.manage_template_folder',
service_id=service_one['id'],
template_folder_id=folder_id,
_test_page_title=False,
)
assert normalize_spaces(page.select_one('title').text) == (
'folder_two Templates service one GOV.UK Notify'
)
form_labels = page.select('legend[class=form-label]')
assert "Users who can see this folder:" in form_labels[0].text
checkboxes = page.select('input[name=users_with_permission]')
assert len(checkboxes) == 2
assert checkboxes[0]['value'] == team_member.id
assert "checked" not in checkboxes[0].attrs
assert checkboxes[1]['value'] == team_member_2.id
assert "checked" in checkboxes[1].attrs
assert "Test User" in page.findAll('label', {'for': 'users_with_permission-0'})[0].text
def test_manage_folder_page_404s(client_request, service_one, mock_get_template_folders):
client_request.get(
'main.manage_template_folder',
@@ -463,18 +507,21 @@ def test_get_manage_folder_page_no_permissions(
)
def test_rename_folder(client_request, service_one, mock_get_template_folders, mocker):
def test_rename_folder(client_request, active_user_with_permissions, service_one, mock_get_template_folders, mocker):
mock_update = mocker.patch('app.template_folder_api_client.update_template_folder')
folder_id = str(uuid.uuid4())
mock_get_template_folders.return_value = [
{'id': folder_id, 'name': 'folder_two', 'parent_id': None},
{'id': folder_id, 'name': 'folder_two', 'parent_id': None, 'users_with_permission': [
active_user_with_permissions.id
]}
]
mocker.patch('app.models.service.Service.active_users', [active_user_with_permissions])
client_request.post(
'main.manage_template_folder',
service_id=service_one['id'],
template_folder_id=folder_id,
_data={"name": "new beautiful name"},
_data={"name": "new beautiful name", "users_with_permission": []},
_expected_redirect=url_for("main.choose_template",
service_id=service_one['id'],
template_folder_id=folder_id,
@@ -484,7 +531,40 @@ def test_rename_folder(client_request, service_one, mock_get_template_folders, m
mock_update.assert_called_once_with(
service_one['id'],
folder_id,
name="new beautiful name"
name="new beautiful name",
users_with_permission=[active_user_with_permissions.id]
)
def test_manage_folder_users(
client_request, active_user_with_permissions, service_one, mock_get_template_folders, mocker
):
team_member = active_user_view_permissions(str(uuid.uuid4()))
mock_update = mocker.patch('app.template_folder_api_client.update_template_folder')
folder_id = str(uuid.uuid4())
mock_get_template_folders.return_value = [
{'id': folder_id, 'name': 'folder_two', 'parent_id': None, 'users_with_permission': [
active_user_with_permissions.id, team_member.id
]}
]
mocker.patch('app.models.service.Service.active_users', [active_user_with_permissions, team_member])
client_request.post(
'main.manage_template_folder',
service_id=service_one['id'],
template_folder_id=folder_id,
_data={"name": "new beautiful name", "users_with_permission": []},
_expected_redirect=url_for("main.choose_template",
service_id=service_one['id'],
template_folder_id=folder_id,
_external=True)
)
mock_update.assert_called_once_with(
service_one['id'],
folder_id,
name="new beautiful name",
users_with_permission=[active_user_with_permissions.id]
)