From 3292db6bdf60333d4a2cfd6d83e39c03ff8a0073 Mon Sep 17 00:00:00 2001 From: Ankita Bansal Date: Sun, 10 Mar 2019 18:21:32 +0530 Subject: [PATCH] Project Group UI should permit removing project group even if it is not empty. Story: 2000164 Task: 2274 Change-Id: I8099d6fef1fe56d3330fbdf9391100add6afdeca Signed-off-by: Ankita Bansal --- storyboard/api/v1/project_groups.py | 2 -- storyboard/db/api/project_groups.py | 3 --- storyboard/tests/api/test_project_groups.py | 10 +++++----- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/storyboard/api/v1/project_groups.py b/storyboard/api/v1/project_groups.py index d0a220d7..6ca01e5a 100644 --- a/storyboard/api/v1/project_groups.py +++ b/storyboard/api/v1/project_groups.py @@ -282,8 +282,6 @@ class ProjectGroupsController(rest.RestController): project_groups.project_group_delete(project_group_id) except exc.NotFound as not_found_exc: abort(404, not_found_exc.message) - except exc.NotEmpty as not_empty_exc: - abort(400, not_empty_exc.message) projects = ProjectsSubcontroller() diff --git a/storyboard/db/api/project_groups.py b/storyboard/db/api/project_groups.py index 9b5d59aa..d08cd305 100644 --- a/storyboard/db/api/project_groups.py +++ b/storyboard/db/api/project_groups.py @@ -174,7 +174,4 @@ def project_group_delete(project_group_id): if not project_group: raise exc.NotFound(_('Project group not found.')) - if len(project_group.projects) > 0: - raise exc.NotEmpty(_('Project group must be empty.')) - api_base.entity_hard_delete(models.ProjectGroup, project_group_id) diff --git a/storyboard/tests/api/test_project_groups.py b/storyboard/tests/api/test_project_groups.py index 717d705c..de9e5304 100644 --- a/storyboard/tests/api/test_project_groups.py +++ b/storyboard/tests/api/test_project_groups.py @@ -103,13 +103,13 @@ class TestProjectGroups(base.FunctionalTest): # check for a too short name self.assertRaises(AppError, self.put_json, url, delta) - def test_delete_invalid(self): - # try to delete project group with projects - # she can't be deleted, because - # only empty project groups can be deleted + def test_delete_nonempty_valid(self): + # check if a non-empty project_group + # is deleted successfully with response + # code 204 response = self.delete(self.resource + '/2', expect_errors=True) - self.assertEqual(400, response.status_code) + self.assertEqual(204, response.status_code) def test_delete(self): # create new empty project group with name 'testProjectGroup'