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

Merge pull request #2559 from alphagov/template-js

Browse Source 
Template folder form smart JS
This commit is contained in:
Chris Hill-Scott
2018-12-05 16:36:12 +00:00
committed by GitHub
parent 31956999e2 827b58e7ac
commit d81af78977
10 changed files with 172 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tests/app/main/views/test_template_folders.py
View File

@@ -797,10 +797,10 @@ def test_should_show_radios_and_buttons_for_move_destination_if_correct_permissi
]
assert set(x['value'] for x in page.find_all('button', {'name': 'operation'})) == {
'unknown',
'move_to_existing_folder',
'move_to_new_folder',
'add_new_folder',
'add_template',
'move-to-existing-folder',
'move-to-new-folder',
'add-new-folder',
'add-new-template',
}
@@ -821,7 +821,7 @@ def test_should_be_able_to_move_to_existing_folder(
'main.choose_template',
service_id=SERVICE_ONE_ID,
_data={
'operation': 'move_to_existing_folder',
'operation': 'move-to-existing-folder',
'move_to': PARENT_FOLDER_ID,
'templates_and_folders': [
FOLDER_TWO_ID,
@@ -868,7 +868,7 @@ def test_should_not_be_able_to_move_to_existing_folder_if_dont_have_permission(
'main.choose_template',
service_id=SERVICE_ONE_ID,
_data={
'operation': 'move_to_existing_folder',
'operation': 'move-to-existing-folder',
'move_to': PARENT_FOLDER_ID,
'templates_and_folders': [
FOLDER_TWO_ID,
@@ -900,7 +900,7 @@ def test_should_be_able_to_move_a_sub_item(
service_id=SERVICE_ONE_ID,
template_folder_id=PARENT_FOLDER_ID,
_data={
'operation': 'move_to_existing_folder',
'operation': 'move-to-existing-folder',
'move_to': '__NONE__',
'templates_and_folders': [GRANDCHILD_FOLDER_ID],
},
@@ -917,35 +917,35 @@ def test_should_be_able_to_move_a_sub_item(
@pytest.mark.parametrize('data', [
# move to existing, but add new folder name given
{
'operation': 'move_to_existing_folder',
'operation': 'move-to-existing-folder',
'templates_and_folders': [],
'add_new_folder_name': 'foo',
'move_to': PARENT_FOLDER_ID
},
# move to existing, but move to new folder name given
{
'operation': 'move_to_existing_folder',
'operation': 'move-to-existing-folder',
'templates_and_folders': [TEMPLATE_ONE_ID],
'move_to_new_folder_name': 'foo',
'move_to': PARENT_FOLDER_ID
},
# move to existing, but no templates to move
{
'operation': 'move_to_existing_folder',
'operation': 'move-to-existing-folder',
'templates_and_folders': [],
'move_to_new_folder_name': '',
'move_to': PARENT_FOLDER_ID
},
# move to new, but nothing selected to move
{
'operation': 'move_to_new_folder',
'operation': 'move-to-new-folder',
'templates_and_folders': [],
'move_to_new_folder_name': 'foo',
'move_to': None
},
# add a new template, but also select move destination
{
'operation': 'add_template',
'operation': 'add-new-template',
'templates_and_folders': [],
'move_to_new_folder_name': '',
'move_to': PARENT_FOLDER_ID,
@@ -953,7 +953,7 @@ def test_should_be_able_to_move_a_sub_item(
},
# add a new template, but also move to root folder
{
'operation': 'add_template',
'operation': 'add-new-template',
'templates_and_folders': [],
'move_to_new_folder_name': '',
'move_to': '__NONE__',
@@ -1019,7 +1019,7 @@ def test_new_folder_is_created_if_only_new_folder_is_filled_out(
data = {
'move_to_new_folder_name': '',
'add_new_folder_name': 'new folder',
'operation': 'add_new_folder'
'operation': 'add-new-folder'
}
service_one['permissions'] += ['edit_folders']
@@ -1066,7 +1066,7 @@ def test_should_be_able_to_move_to_new_folder(
service_id=SERVICE_ONE_ID,
template_folder_id=None,
_data={
'operation': 'move_to_new_folder',
'operation': 'move-to-new-folder',
'move_to_new_folder_name': 'new folder',
'templates_and_folders': [
FOLDER_TWO_ID,

6
tests/app/main/views/test_templates.py
View File

@@ -616,7 +616,7 @@ def test_dont_show_preview_letter_templates_for_bad_filetype(
'template_type': 'copy-existing'
}),
('main.choose_template', {
'operation': 'add_template',
'operation': 'add-new-template',
'add_template_by_template_type': 'copy-existing'
}),
))
@@ -791,7 +791,7 @@ def test_cant_copy_template_from_non_member_service(
(
'main.choose_template',
{
'operation': 'add_template',
'operation': 'add-new-template',
'add_template_by_template_type': 'email',
},
"Sending emails has been disabled for your service."
@@ -799,7 +799,7 @@ def test_cant_copy_template_from_non_member_service(
(
'main.choose_template',
{
'operation': 'add_template',
'operation': 'add-new-template',
'add_template_by_template_type': 'sms',
},
"Sending text messages has been disabled for your service."