Merge ~ilasc/launchpad:bug-530505 into launchpad:master

[Ioana Lasc]

Made Subject not required in apidoc parameters for branch_merge_proposal.createComment.

[Colin Watson (cjwatson)]

review: Needs Fixing

[Ioana Lasc (ilasc)]

Test was moved to appropriate file. Branch is now ready for a second review.

[Colin Watson (cjwatson)]

Looks good to me now, thanks!

review: Approve

diff --git a/lib/lp/code/interfaces/branchmergeproposal.py b/lib/lp/code/interfaces/branchmergeproposal.py
index 54bef77..fa37faf 100644
--- a/lib/lp/code/interfaces/branchmergeproposal.py
+++ b/lib/lp/code/interfaces/branchmergeproposal.py
@@ -692,7 +692,7 @@ class IBranchMergeProposalAnyAllowedPerson(IBugLinkTarget):
     @call_with(owner=REQUEST_USER)
     # ICodeReviewComment supplied as Interface to avoid circular imports.
     @export_factory_operation(Interface, [])
-    def createComment(owner, subject, content=None, vote=None,
+    def createComment(owner, subject=None, content=None, vote=None,
                       review_type=None, parent=None,
                       previewdiff_id=None, inline_comments=None):
         """Create an ICodeReviewComment associated with this merge proposal.
diff --git a/lib/lp/code/model/branchmergeproposal.py b/lib/lp/code/model/branchmergeproposal.py
index 0241e7c..5ebcf04 100644
--- a/lib/lp/code/model/branchmergeproposal.py
+++ b/lib/lp/code/model/branchmergeproposal.py
@@ -998,7 +998,7 @@ class BranchMergeProposal(SQLBase, BugLinkTargetMixin):
                 stop=self.target_git_commit_sha1,
                 union_repository=self.target_git_repository)
 
-    def createComment(self, owner, subject, content=None, vote=None,
+    def createComment(self, owner, subject=None, content=None, vote=None,
                       review_type=None, parent=None, _date_created=DEFAULT,
                       previewdiff_id=None, inline_comments=None,
                       _notify_listeners=True):
diff --git a/lib/lp/code/model/tests/test_branchmergeproposal.py b/lib/lp/code/model/tests/test_branchmergeproposal.py
index c899c10..a533d4b 100644
--- a/lib/lp/code/model/tests/test_branchmergeproposal.py
+++ b/lib/lp/code/model/tests/test_branchmergeproposal.py
@@ -2543,6 +2543,24 @@ class TestBranchMergeProposalInlineComments(TestCaseWithFactory):
         self.assertEqual(1, len(self.getInlineComments()))
         self.assertEqual(1, self.bmp.all_comments.count())
 
+    def test_publish_no_subject_on_comment(self):
+        # Not passing in a Subject when creating a comment
+        # does not fail and the MP comment is created
+        # with the default subject.
+        self.bmp.createComment(
+            owner=self.bmp.registrant,
+            previewdiff_id=self.previewdiff.id,
+            inline_comments=None,
+            content='Test comment'
+        )
+        self.assertEqual(1, self.bmp.all_comments.count())
+        comment = self.bmp.all_comments[0]
+        self.assertEqual('Test comment', comment.message.chunks[0].content)
+        self.assertEqual(
+            'Re: [Merge] %s into %s' % (
+                self.bmp.source_branch.bzr_identity,
+                self.bmp.target_branch.bzr_identity), comment.message.subject)
+
     def test_publish_no_inlines(self):
         # Suppressing 'inline_comments' does not result in any inline
         # comments, but the MP comment itself is created.