From abf2b11220ef2df002fa8a30d3da261eb159373c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex=20Hermida?= Date: Wed, 2 Jan 2019 12:51:14 +0100 Subject: [PATCH] Refactor and fix tests --- taiga/projects/tasks/models.py | 4 ++++ tests/integration/test_milestones.py | 6 ++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/taiga/projects/tasks/models.py b/taiga/projects/tasks/models.py index 9f823d0c..2f21d882 100644 --- a/taiga/projects/tasks/models.py +++ b/taiga/projects/tasks/models.py @@ -91,3 +91,7 @@ class Task(OCCModelMixin, WatchedModelMixin, BlockedMixin, TaggedMixin, DueDateM def __str__(self): return "({1}) {0}".format(self.ref, self.subject) + + @property + def is_closed(self): + return self.status is not None and self.status.is_closed diff --git a/tests/integration/test_milestones.py b/tests/integration/test_milestones.py index 1edf9d0a..873d4090 100644 --- a/tests/integration/test_milestones.py +++ b/tests/integration/test_milestones.py @@ -195,7 +195,7 @@ def test_api_update_milestone_in_bulk_userstories(client): assert project.milestones.get(id=milestone1.id).user_stories.count() == 2 - url = reverse("milestones-bulk-update-userstories", kwargs={"pk": milestone1.pk}) + url = reverse("milestones-move-userstories-to-sprint", kwargs={"pk": milestone1.pk}) data = { "project_id": project.id, "milestone_id": milestone2.id, @@ -249,8 +249,7 @@ def test_api_move_userstories_to_another_sprint_close_previous(client): closed_status = f.UserStoryStatusFactory.create(is_closed=True) us1 = f.create_userstory(project=project, milestone=milestone1, sprint_order=1, status=closed_status) - us2 = f.create_userstory(project=project, milestone=milestone1, - sprint_order=2) + us2 = f.create_userstory(project=project, milestone=milestone1, sprint_order=2) assert milestone1.user_stories.count() == 2 assert not milestone1.closed @@ -313,7 +312,6 @@ def test_api_move_tasks_to_another_sprint_close_previous(client): milestone = project.milestones.get(id=milestone1.id) manager_tasks = milestone.tasks - # all_tasks = list(manager_tasks.all()) count_result = manager_tasks.count() assert count_result == 2