Merge pull request #2765 from alphagov/folder-after-delete-template

Return to a template’s folder after deleting it

app/main/views/templates.py

@@ -635,6 +635,7 @@ def delete_service_template(service_id, template_id):
         return redirect(url_for(
             '.choose_template',
             service_id=service_id,
+            template_folder_id=template['folder'],
         ))
 
     try:

tests/app/main/views/test_templates.py

@@ -1746,44 +1746,41 @@ def test_should_show_delete_template_page_with_never_used_block(
     mock_get_service_template.assert_called_with(SERVICE_ONE_ID, fake_uuid)
 
 
+@pytest.mark.parametrize('parent', (
+    PARENT_FOLDER_ID, None
+))
 def test_should_redirect_when_deleting_a_template(
-    logged_in_client,
+    mocker,
-    api_user_active,
+    client_request,
-    mock_login,
-    mock_get_service,
-    mock_get_service_template,
     mock_delete_service_template,
-    mock_get_user,
+    parent,
-    mock_get_user_by_email,
-    mock_has_permissions,
-    fake_uuid,
 ):
-    service_id = fake_uuid
+    mock_get_service_template = mocker.patch(
-    template_id = fake_uuid
+        'app.service_api_client.get_service_template',
-    name = "new name"
+        return_value={'data': _template(
-    type_ = "sms"
+            'sms', 'Hello', parent=parent,
-    content = "template content"
+        )},
-    data = {
+    )
-        'id': str(template_id),
+
-        'name': name,
+    client_request.post(
-        'template_type': type_,
+        '.delete_service_template',
-        'content': content,
+        service_id=SERVICE_ONE_ID,
-        'service': service_id
+        template_id=TEMPLATE_ONE_ID,
-    }
+        _expected_status=302,
-    response = logged_in_client.post(url_for(
+        _expected_redirect=url_for(
-        '.delete_service_template',
+            '.choose_template',
-        service_id=service_id,
+            service_id=SERVICE_ONE_ID,
-        template_id=template_id
+            template_folder_id=parent,
-    ), data=data)
+            _external=True,
+        )
+    )
 
-    assert response.status_code == 302
-    assert response.location == url_for(
-        '.choose_template',
-        service_id=service_id, _external=True)
     mock_get_service_template.assert_called_with(
-        service_id, template_id)
+        SERVICE_ONE_ID, TEMPLATE_ONE_ID
+    )
     mock_delete_service_template.assert_called_with(
-        service_id, template_id)
+        SERVICE_ONE_ID, TEMPLATE_ONE_ID
+    )
 
 
 @freeze_time('2016-01-01T15:00')