Refactor and fix tests

stable
Álex Hermida 2019-01-02 12:51:14 +01:00 committed by Alex Hermida
parent a4256c3f09
commit abf2b11220
2 changed files with 6 additions and 4 deletions

View File

@ -91,3 +91,7 @@ class Task(OCCModelMixin, WatchedModelMixin, BlockedMixin, TaggedMixin, DueDateM
def __str__(self): def __str__(self):
return "({1}) {0}".format(self.ref, self.subject) return "({1}) {0}".format(self.ref, self.subject)
@property
def is_closed(self):
return self.status is not None and self.status.is_closed

View File

@ -195,7 +195,7 @@ def test_api_update_milestone_in_bulk_userstories(client):
assert project.milestones.get(id=milestone1.id).user_stories.count() == 2 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 = { data = {
"project_id": project.id, "project_id": project.id,
"milestone_id": milestone2.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) closed_status = f.UserStoryStatusFactory.create(is_closed=True)
us1 = f.create_userstory(project=project, milestone=milestone1, us1 = f.create_userstory(project=project, milestone=milestone1,
sprint_order=1, status=closed_status) sprint_order=1, status=closed_status)
us2 = f.create_userstory(project=project, milestone=milestone1, us2 = f.create_userstory(project=project, milestone=milestone1, sprint_order=2)
sprint_order=2)
assert milestone1.user_stories.count() == 2 assert milestone1.user_stories.count() == 2
assert not milestone1.closed 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) milestone = project.milestones.get(id=milestone1.id)
manager_tasks = milestone.tasks manager_tasks = milestone.tasks
# all_tasks = list(manager_tasks.all())
count_result = manager_tasks.count() count_result = manager_tasks.count()
assert count_result == 2 assert count_result == 2