darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-03 09:51:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2227 from alphagov/fix-error-msg

Browse Source 
Remove the extra "to" in the message.
This commit is contained in:
Rebecca Law
2018-11-13 14:35:20 +00:00
committed by GitHub
parent 89516f95a9 0163a6d9b7
commit 870b42919a
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/template_folder/rest.py
View File

@@ -141,7 +141,7 @@ 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 to folder to itself' msg = 'Could not move 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 = 'Could not move to folder: {} is an ancestor of target folder {}'.format(

6
requirements-app.txt
View File

@@ -14,11 +14,11 @@ eventlet==0.23.0
gunicorn==19.7.1 gunicorn==19.7.1
iso8601==0.1.12 iso8601==0.1.12
jsonschema==3.0.0a3 jsonschema==3.0.0a3
marshmallow-sqlalchemy==0.14.1 marshmallow-sqlalchemy==0.15.0
marshmallow==2.16.0 marshmallow==2.16.3
psycopg2-binary==2.7.5 psycopg2-binary==2.7.5
PyJWT==1.6.4 PyJWT==1.6.4
SQLAlchemy==1.2.12 SQLAlchemy==1.2.14
notifications-python-client==5.2.0 notifications-python-client==5.2.0

14
requirements.txt
View File

@@ -16,11 +16,11 @@ eventlet==0.23.0
gunicorn==19.7.1 gunicorn==19.7.1
iso8601==0.1.12 iso8601==0.1.12
jsonschema==3.0.0a3 jsonschema==3.0.0a3
marshmallow-sqlalchemy==0.14.1 marshmallow-sqlalchemy==0.15.0
marshmallow==2.16.0 marshmallow==2.16.3
psycopg2-binary==2.7.5 psycopg2-binary==2.7.5
PyJWT==1.6.4 PyJWT==1.6.4
SQLAlchemy==1.2.12 SQLAlchemy==1.2.14
notifications-python-client==5.2.0 notifications-python-client==5.2.0
@@ -39,12 +39,13 @@ git+https://github.com/alphagov/boto.git@2.43.0-patch3#egg=boto==2.43.0-patch3
alembic==1.0.2 alembic==1.0.2
amqp==1.4.9 amqp==1.4.9
anyjson==0.3.3 anyjson==0.3.3
awscli==1.16.49 attrs==18.2.0
awscli==1.16.53
bcrypt==3.1.4 bcrypt==3.1.4
billiard==3.3.0.23 billiard==3.3.0.23
bleach==2.1.3 bleach==2.1.3
boto3==1.6.16 boto3==1.6.16
botocore==1.12.39 botocore==1.12.43
certifi==2018.10.15 certifi==2018.10.15
chardet==3.0.4 chardet==3.0.4
Click==7.0 Click==7.0
@@ -67,13 +68,14 @@ phonenumbers==8.9.4
pyasn1==0.4.4 pyasn1==0.4.4
pycparser==2.19 pycparser==2.19
PyPDF2==1.26.0 PyPDF2==1.26.0
pyrsistent==0.14.5
python-dateutil==2.7.5 python-dateutil==2.7.5
python-editor==1.0.3 python-editor==1.0.3
python-json-logger==0.1.8 python-json-logger==0.1.8
pytz==2018.7 pytz==2018.7
PyYAML==3.12 PyYAML==3.12
redis==2.10.6 redis==2.10.6
requests==2.20.0 requests==2.20.1
rsa==3.4.2 rsa==3.4.2
s3transfer==0.1.13 s3transfer==0.1.13
six==1.11.0 six==1.11.0

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

@@ -343,7 +343,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 to folder to itself' assert response['message'] == 'Could not move 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):