darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-21 07:51:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2253 from alphagov/folder-warning-msgs

Browse Source 
template folder error messages
This commit is contained in:
Leo Hemsted
2018-12-10 15:51:44 +00:00
committed by GitHub
parent ad3b0cabf7 474acc5bba
commit 2d9609b1be
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/template_folder/rest.py
View File

@@ -141,11 +141,8 @@ def move_to_template_folder(service_id, target_template_folder_id=None):
def _validate_folder_move(target_template_folder, target_template_folder_id, template_folder, template_folder_id): def _validate_folder_move(target_template_folder, target_template_folder_id, template_folder, template_folder_id):
if str(target_template_folder_id) == str(template_folder_id): if str(target_template_folder_id) == str(template_folder_id):
msg = 'Could not move folder to itself' msg = 'You cannot move a folder to itself'
raise InvalidRequest(msg, status_code=400) raise InvalidRequest(msg, status_code=400)
if target_template_folder and template_folder.is_parent_of(target_template_folder): if target_template_folder and template_folder.is_parent_of(target_template_folder):
msg = 'Could not move to folder: {} is an ancestor of target folder {}'.format( msg = 'You cannot move a folder to one of its subfolders'
template_folder_id,
target_template_folder_id
)
raise InvalidRequest(msg, status_code=400) raise InvalidRequest(msg, status_code=400)

6
tests/app/template_folder/test_template_folder_rest.py
View File

@@ -325,9 +325,7 @@ def test_move_to_folder_rejects_if_it_would_cause_folder_loop(admin_request, sam
}, },
_expected_status=400 _expected_status=400
) )
assert response['message'] == 'Could not move to folder: {} is an ancestor of target folder {}'.format( assert response['message'] == 'You cannot move a folder to one of its subfolders'
f1.id, target_folder.id
)
def test_move_to_folder_itself_is_rejected(admin_request, sample_service): def test_move_to_folder_itself_is_rejected(admin_request, sample_service):
@@ -343,7 +341,7 @@ def test_move_to_folder_itself_is_rejected(admin_request, sample_service):
}, },
_expected_status=400 _expected_status=400
) )
assert response['message'] == 'Could not move folder to itself' assert response['message'] == 'You cannot move a folder to itself'
def test_move_to_folder_skips_archived_templates(admin_request, sample_service): def test_move_to_folder_skips_archived_templates(admin_request, sample_service):