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

Remove the extra "to" in the message.

app/template_folder/rest.py

@@ -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):
     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)
     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(

requirements-app.txt

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

requirements.txt

@@ -16,11 +16,11 @@ eventlet==0.23.0
 gunicorn==19.7.1
 iso8601==0.1.12
 jsonschema==3.0.0a3
-marshmallow-sqlalchemy==0.14.1
-marshmallow==2.16.0
+marshmallow-sqlalchemy==0.15.0
+marshmallow==2.16.3
 psycopg2-binary==2.7.5
 PyJWT==1.6.4
-SQLAlchemy==1.2.12
+SQLAlchemy==1.2.14
 
 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
 amqp==1.4.9
 anyjson==0.3.3
-awscli==1.16.49
+attrs==18.2.0
+awscli==1.16.53
 bcrypt==3.1.4
 billiard==3.3.0.23
 bleach==2.1.3
 boto3==1.6.16
-botocore==1.12.39
+botocore==1.12.43
 certifi==2018.10.15
 chardet==3.0.4
 Click==7.0
@@ -67,13 +68,14 @@ phonenumbers==8.9.4
 pyasn1==0.4.4
 pycparser==2.19
 PyPDF2==1.26.0
+pyrsistent==0.14.5
 python-dateutil==2.7.5
 python-editor==1.0.3
 python-json-logger==0.1.8
 pytz==2018.7
 PyYAML==3.12
 redis==2.10.6
-requests==2.20.0
+requests==2.20.1
 rsa==3.4.2
 s3transfer==0.1.13
 six==1.11.0

tests/app/template_folder/test_template_folder_rest.py

@@ -343,7 +343,7 @@ def test_move_to_folder_itself_is_rejected(admin_request, sample_service):
         },
         _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):