kallithea Changeset - 552800808386

Changeset - 552800808386

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Mads Kiilerich - 9 years ago 2016-07-28 16:31:40
madski@unity3d.com

tests: add test coverage of PR comment @mention

4 files changed with 183 insertions and 4 deletions:

kallithea/model/comment.py

kallithea/model/pull_request.py

kallithea/tests/models/test_dump_html_mails.ref.html

180

kallithea/tests/models/test_notifications.py

0 comments (0 inline, 0 general)

kallithea/model/comment.py

➞

Show inline comments

@@ @@ -204,24 +204,25 @@ class ChangesetCommentsModel(BaseModel): @@
             email_kwargs['is_mention'] = False
             # create notification objects, and emails
             NotificationModel().create(
                 created_by=user, subject=subj, body=body,
                 recipients=recipients, type_=notification_type,
                 email_kwargs=email_kwargs,
+            )
             mention_recipients = extract_mentioned_users(body).difference(recipients)
             if mention_recipients:
                 email_kwargs['is_mention'] = True
                 subj = _('[Mention]') + ' ' + subj
                 # FIXME: this subject is wrong and unused!
                 NotificationModel().create(
                     created_by=user, subject=subj, body=body,
                     recipients=mention_recipients,
                     type_=notification_type,
                     email_kwargs=email_kwargs
+                )
         return comment
     def delete(self, comment):
         comment = self.__get_changeset_comment(comment)
         Session().delete(comment)

kallithea/model/pull_request.py

➞

Show inline comments

@@ @@ -176,24 +176,25 @@ class PullRequestModel(BaseModel): @@
+            }
         if reviewers:
             NotificationModel().create(created_by=user, subject=subject, body=body,
                                        recipients=reviewers,
                                        type_=Notification.TYPE_PULL_REQUEST,
                                        email_kwargs=email_kwargs)
         if mention_recipients:
             mention_recipients.difference_update(reviewers)
         if mention_recipients:
             email_kwargs['is_mention'] = True
             subject = _('[Mention]') + ' ' + subject
             # FIXME: this subject is wrong and unused!
             NotificationModel().create(created_by=user, subject=subject, body=body,
                                        recipients=mention_recipients,
                                        type_=Notification.TYPE_PULL_REQUEST,
                                        email_kwargs=email_kwargs)
     def mention_from_description(self, user, pr, old_description=''):
         mention_recipients = (extract_mentioned_users(pr.description) -
                               extract_mentioned_users(old_description))
         log.debug("Mentioning %s", mention_recipients)
         self.__add_reviewers(user, pr, set(), mention_recipients)

kallithea/tests/models/test_dump_html_mails.ref.html

➞

Show inline comments

@@ @@ -402,25 +402,25 @@ Make one plus two equal tree @@
 </p>
 <br/>
 <br/>
 -- <br/>
 This is an automatic notification. Don&#39;t reply to this mail.
 <pre>--------------------</pre>
 <h1>pull_request_comment, status_change=None, closing_pr=False</h1>
+<h1>pull_request_comment, is_mention=False, status_change=None, closing_pr=False</h1>
 <pre>
 From: u1
 To: u2@example.com
 Subject: [Comment] repo/name pull request #7 from devbranch
 --------------------
 Comment from Opinionated User (jsmith) on repo/name pull request "The Title":
 Me too!
@@ @@ -445,25 +445,68 @@ This is an automatic notification. Don't @@
 <p>URL: <a href="http://pr.org/comment">http://pr.org/comment</a></p>
 <br/>
 <br/>
 -- <br/>
 This is an automatic notification. Don&#39;t reply to this mail.
 <pre>--------------------</pre>
 <h1>pull_request_comment, status_change='Under Review', closing_pr=False</h1>
 <h1>pull_request_comment, is_mention=True, status_change=None, closing_pr=False</h1>
 <pre>
 From: u1
 To: u2@example.com
 Subject: [Comment] repo/name pull request #7 from devbranch
 --------------------
 Comment from Opinionated User (jsmith) on repo/name pull request "The Title":
 Me too!
  - and indented on second line
 URL: http://pr.org/comment
 --
 This is an automatic notification. Don't reply to this mail.
 --------------------</pre>
 <p>Comment from Opinionated User (jsmith) on repo/name pull request &#34;The Title&#34;:</p>
 <p><div class="formatted-fixed">Me too!
  - and indented on second line</div></p>
 <p>URL: <a href="http://pr.org/comment">http://pr.org/comment</a></p>
 <br/>
 <br/>
 -- <br/>
 This is an automatic notification. Don&#39;t reply to this mail.
 <pre>--------------------</pre>
 <h1>pull_request_comment, is_mention=False, status_change='Under Review', closing_pr=False</h1>
 <pre>
 From: u1
 To: u2@example.com
 Subject: [Under Review: Comment] repo/name pull request #7 from devbranch
 --------------------
 Comment from Opinionated User (jsmith) on repo/name pull request "The Title":
 Me too!
@@ @@ -490,25 +533,70 @@ This is an automatic notification. Don't @@
 <p>URL: <a href="http://pr.org/comment">http://pr.org/comment</a></p>
 <br/>
 <br/>
 -- <br/>
 This is an automatic notification. Don&#39;t reply to this mail.
 <pre>--------------------</pre>
 <h1>pull_request_comment, status_change=None, closing_pr=True</h1>
 <h1>pull_request_comment, is_mention=True, status_change='Under Review', closing_pr=False</h1>
 <pre>
 From: u1
 To: u2@example.com
 Subject: [Under Review: Comment] repo/name pull request #7 from devbranch
 --------------------
 Comment from Opinionated User (jsmith) on repo/name pull request "The Title":
 Me too!
  - and indented on second line
 The comment was made with status: Under Review
 URL: http://pr.org/comment
 --
 This is an automatic notification. Don't reply to this mail.
 --------------------</pre>
 <p>Comment from Opinionated User (jsmith) on repo/name pull request &#34;The Title&#34;:</p>
 <p><div class="formatted-fixed">Me too!
  - and indented on second line</div></p>
        <p>The comment was made with status: <b>Under Review</b></p>
 <p>URL: <a href="http://pr.org/comment">http://pr.org/comment</a></p>
 <br/>
 <br/>
 -- <br/>
 This is an automatic notification. Don&#39;t reply to this mail.
 <pre>--------------------</pre>
 <h1>pull_request_comment, is_mention=False, status_change=None, closing_pr=True</h1>
 <pre>
 From: u1
 To: u2@example.com
 Subject: [Closing: Comment] repo/name pull request #7 from devbranch
 --------------------
 Comment from Opinionated User (jsmith) on repo/name pull request "The Title":
 Me too!
@@ @@ -533,25 +621,113 @@ This is an automatic notification. Don't @@
 <p>URL: <a href="http://pr.org/comment">http://pr.org/comment</a></p>
 <br/>
 <br/>
 -- <br/>
 This is an automatic notification. Don&#39;t reply to this mail.
 <pre>--------------------</pre>
 <h1>pull_request_comment, status_change='Under Review', closing_pr=True</h1>
 <h1>pull_request_comment, is_mention=True, status_change=None, closing_pr=True</h1>
 <pre>
 From: u1
 To: u2@example.com
 Subject: [Closing: Comment] repo/name pull request #7 from devbranch
 --------------------
 Comment from Opinionated User (jsmith) on repo/name pull request "The Title":
 Me too!
  - and indented on second line
 URL: http://pr.org/comment
 --
 This is an automatic notification. Don't reply to this mail.
 --------------------</pre>
 <p>Comment from Opinionated User (jsmith) on repo/name pull request &#34;The Title&#34;:</p>
 <p><div class="formatted-fixed">Me too!
  - and indented on second line</div></p>
 <p>URL: <a href="http://pr.org/comment">http://pr.org/comment</a></p>
 <br/>
 <br/>
 -- <br/>
 This is an automatic notification. Don&#39;t reply to this mail.
 <pre>--------------------</pre>
 <h1>pull_request_comment, is_mention=False, status_change='Under Review', closing_pr=True</h1>
 <pre>
 From: u1
 To: u2@example.com
 Subject: [Under Review, Closing: Comment] repo/name pull request #7 from devbranch
 --------------------
 Comment from Opinionated User (jsmith) on repo/name pull request "The Title":
 Me too!
  - and indented on second line
 The comment closed the pull request with status: Under Review
 URL: http://pr.org/comment
 --
 This is an automatic notification. Don't reply to this mail.
 --------------------</pre>
 <p>Comment from Opinionated User (jsmith) on repo/name pull request &#34;The Title&#34;:</p>
 <p><div class="formatted-fixed">Me too!
  - and indented on second line</div></p>
        <p>The comment closed the pull request with status: <b>Under Review</b></p>
 <p>URL: <a href="http://pr.org/comment">http://pr.org/comment</a></p>
 <br/>
 <br/>
 -- <br/>
 This is an automatic notification. Don&#39;t reply to this mail.
 <pre>--------------------</pre>
 <h1>pull_request_comment, is_mention=True, status_change='Under Review', closing_pr=True</h1>
 <pre>
 From: u1
 To: u2@example.com
 Subject: [Under Review, Closing: Comment] repo/name pull request #7 from devbranch
 --------------------
 Comment from Opinionated User (jsmith) on repo/name pull request "The Title":
 Me too!

kallithea/tests/models/test_notifications.py

➞

Show inline comments

@@ @@ -222,24 +222,25 @@ class TestNotifications(TestController): @@
                 (Notification.TYPE_PULL_REQUEST,
                  u'This PR is awesome because it does stuff\n - please approve indented!',
                  dict(
                     pr_user_created='Requesting User (root)', # pr_owner should perhaps be used for @mention in description ...
                     is_mention=[False, True],
                     pr_revisions=[('123abc'*7, "Introduce one and two\n\nand that's it"), ('567fed'*7, 'Make one plus two equal tree')],
                     org_repo_name='repo_org',
                     **pr_kwargs)),
                 (Notification.TYPE_PULL_REQUEST_COMMENT,
                  u'Me too!\n\n - and indented on second line',
                  dict(
                     closing_pr=[False, True],
                     is_mention=[False, True],
                     pr_comment_user='Opinionated User (jsmith)',
                     pr_comment_url='http://pr.org/comment',
                     status_change=[None, 'Under Review'],
                     **pr_kwargs)),
                 ]:
                 kwargs['repo_name'] = u'repo/name'
                 params = [(type_, type_, body, kwargs)]
                 for param_name in ['is_mention', 'status_change', 'closing_pr']: # TODO: inline/general
                     if not isinstance(kwargs.get(param_name), list):
                         continue
                     new_params = []
                     for v in kwargs[param_name]:

0 comments (0 inline, 0 general)