From 09646fa4a18e96e20863ddef4110573c7bf7a762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Tue, 25 Mar 2014 19:54:44 +0100 Subject: [PATCH] US #80: Generate US from issues: Generate issue comment automaticaly --- taiga/projects/userstories/api.py | 6 +++--- taiga/projects/userstories/tests/tests_api.py | 17 ++++++----------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/taiga/projects/userstories/api.py b/taiga/projects/userstories/api.py index d0d09abe..f84d7bb3 100644 --- a/taiga/projects/userstories/api.py +++ b/taiga/projects/userstories/api.py @@ -125,9 +125,9 @@ class UserStoryViewSet(NeighborsApiMixin, NotificationSenderMixin, ModelCrudView # Added comment to the origin (issue) if response.status_code == status.HTTP_201_CREATED and self.object.generated_from_issue: with reversion.create_revision(): - if "issue_comment" in self.request.DATA: - reversion.set_comment(self.request.DATA['issue_comment']) - self.object.generated_from_issue.save() + reversion.set_comment(_("Generated the user story [US #{ref} - {subject}](:us:{ref} \"US #{ref} - {subject}\")").format( + ref=self.object.ref, subject=self.object.subject)) + self.object.generated_from_issue.save() return response diff --git a/taiga/projects/userstories/tests/tests_api.py b/taiga/projects/userstories/tests/tests_api.py index 2d5a6b24..dd933dc1 100644 --- a/taiga/projects/userstories/tests/tests_api.py +++ b/taiga/projects/userstories/tests/tests_api.py @@ -638,9 +638,7 @@ class UserStoriesTestCase(test.TestCase): "project": self.project1.id, "milestone": self.milestone1.id, "status": self.project1.us_statuses.all()[1].id, - "generated_from_issue": issue.id, - "issue_comment": "This is a test example" - + "generated_from_issue": issue.id } self.assertEqual(UserStory.objects.all().count(), 4) @@ -659,8 +657,7 @@ class UserStoriesTestCase(test.TestCase): "project": self.project1.id, "milestone": self.milestone1.id, "status": self.project1.us_statuses.all()[1].id, - "generated_from_issue": issue.id, - "issue_comment": "This is a test example" + "generated_from_issue": issue.id } self.assertEqual(UserStory.objects.all().count(), 4) @@ -678,7 +675,7 @@ class UserStoriesTestCase(test.TestCase): self.assertEqual(response.data["origin_issue"]["subject"], issue.subject) issue_historical = reversion.get_unique_for_object(issue) - self.assertEqual(issue_historical[0].revision.comment, data["issue_comment"]) + self.assertTrue(data["subject"] in issue_historical[0].revision.comment) self.client.logout() @@ -692,8 +689,7 @@ class UserStoriesTestCase(test.TestCase): "status": self.project1.us_statuses.all()[1].id, "generated_from_issue": issue.id, "issue_comment": "This is a test example", - "generated_from_issue": issue.id, - "issue_comment": "This is a test example" + "generated_from_issue": issue.id } self.assertEqual(UserStory.objects.all().count(), 4) @@ -711,7 +707,7 @@ class UserStoriesTestCase(test.TestCase): self.assertEqual(response.data["origin_issue"]["subject"], issue.subject) issue_historical = reversion.get_unique_for_object(issue) - self.assertEqual(issue_historical[0].revision.comment, data["issue_comment"]) + self.assertTrue(data["subject"] in issue_historical[0].revision.comment) self.client.logout() @@ -723,8 +719,7 @@ class UserStoriesTestCase(test.TestCase): "project": self.project1.id, "milestone": self.milestone1.id, "status": self.project1.us_statuses.all()[1].id, - "generated_from_issue": issue.id, - "issue_comment": "This is a test example" + "generated_from_issue": issue.id } self.assertEqual(UserStory.objects.all().count(), 4)