kallithea Changeset - d4061c6cc0e2

Changeset - d4061c6cc0e2

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

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

notifications: tweak PR mail subject lines

The subject line is used for mail threading in gmail and can thus not be
changed without impacting users ... but now we do it.

* The tag '[Review]' is more spot-on than '[Added]'.
* The subject should be short so it fits on one line, so abbreviate "pull
request" to PR.
* Add the PR owner - convenient for filtering comments on own PRs from comments
on other PRs.

5 files changed with 15 insertions and 12 deletions:

kallithea/model/comment.py

kallithea/model/notification.py

kallithea/model/pull_request.py

kallithea/tests/models/test_dump_html_mails.ref.html

kallithea/tests/models/test_notifications.py

0 comments (0 inline, 0 general)

kallithea/model/comment.py

➞

Show inline comments

@@ @@ -108,96 +108,97 @@ class ChangesetCommentsModel(BaseModel): @@
+            }
         #pull request
         elif pull_request:
             notification_type = Notification.TYPE_PULL_REQUEST_COMMENT
             desc = comment.pull_request.title
             _org_ref_type, org_ref_name, _org_rev = comment.pull_request.org_ref.split(':')
             _other_ref_type, other_ref_name, _other_rev = comment.pull_request.other_ref.split(':')
             threading = ['%s-pr-%s@%s' % (pull_request.other_repo.repo_name,
                                           pull_request.pull_request_id,
                                           h.canonical_hostname())]
             if line_no: # TODO: url to file _and_ line number
                 threading.append('%s-pr-%s-line-%s@%s' % (pull_request.other_repo.repo_name,
                                                           pull_request.pull_request_id, line_no,
                                                           h.canonical_hostname()))
             comment_url = pull_request.url(canonical=True,
                 anchor='comment-%s' % comment.comment_id)
             subj = safe_unicode(
                 h.link_to('Re pull request %(pr_nice_id)s: %(desc)s %(line)s' % \
                           {'desc': desc,
                            'pr_nice_id': comment.pull_request.nice_id(),
                            'line': line},
                           comment_url)
+            )
             # get the current participants of this pull request
             recipients = ChangesetComment.get_users(pull_request_id=
                                                 pull_request.pull_request_id)
             # add pull request author
             recipients += [pull_request.owner]
             # add the reviewers to notification
             recipients += pull_request.get_reviewer_users()
             #set some variables for email notification
             email_kwargs = {
                 'pr_title': pull_request.title,
                 'pr_title_short': h.shorter(pull_request.title, 50),
                 'pr_nice_id': pull_request.nice_id(),
                 'status_change': status_change,
                 'closing_pr': closing_pr,
                 'pr_comment_url': comment_url,
                 'pr_comment_user': user.full_name_and_username,
                 'pr_target_repo': h.canonical_url('summary_home',
                                    repo_name=pull_request.other_repo.repo_name),
                 'pr_target_branch': other_ref_name,
                 'pr_source_repo': h.canonical_url('summary_home',
                                    repo_name=pull_request.org_repo.repo_name),
                 'pr_source_branch': org_ref_name,
                 'pr_owner': pull_request.owner,
                 'pr_owner_username': pull_request.owner.username,
                 'repo_name': pull_request.other_repo.repo_name,
                 'comment_username': user.username,
                 'threading': threading,
+            }
         return subj, body, recipients, notification_type, email_kwargs
     def create(self, text, repo, user, revision=None, pull_request=None,
                f_path=None, line_no=None, status_change=None, closing_pr=False,
                send_email=True):
         """
         Creates a new comment for either a changeset or a pull request.
         status_change and closing_pr is only for the optional email.
         Returns the created comment.
         """
         if not status_change and not text:
             log.warning('Missing text for comment, skipping...')
             return None
         repo = self._get_repo(repo)
         user = self._get_user(user)
         comment = ChangesetComment()
         comment.repo = repo
         comment.author = user
         comment.text = text
         comment.f_path = f_path
         comment.line_no = line_no
         if revision is not None:
             comment.revision = revision
         elif pull_request is not None:
             pull_request = self.__get_pull_request(pull_request)
             comment.pull_request = pull_request
         else:
             raise Exception('Please specify revision or pull_request_id')
         Session().add(comment)
         Session().flush()
         if send_email:
             (subj, body, recipients, notification_type,
              email_kwargs) = self._get_notification_data(
                                 repo, comment, user,
                                 comment_text=text,
                                 line_no=line_no,
                                 revision=revision,
                                 pull_request=pull_request,

kallithea/model/notification.py

➞

Show inline comments

@@ @@ -259,84 +259,84 @@ class NotificationModel(BaseModel): @@
                     _n.TYPE_PULL_REQUEST_COMMENT: _('%(user)s commented on pull request %(age)s'),
                 }[notification.type_] % dict(
                     user=notification.created_by_user.username,
                     age=h.age(notification.created_on),
+                )
         else:
             return {
                     _n.TYPE_CHANGESET_COMMENT: _('%(user)s commented on changeset at %(when)s'),
                     _n.TYPE_MESSAGE: _('%(user)s sent message at %(when)s'),
                     _n.TYPE_MENTION: _('%(user)s mentioned you at %(when)s'),
                     _n.TYPE_REGISTRATION: _('%(user)s registered in Kallithea at %(when)s'),
                     _n.TYPE_PULL_REQUEST: _('%(user)s opened new pull request at %(when)s'),
                     _n.TYPE_PULL_REQUEST_COMMENT: _('%(user)s commented on pull request at %(when)s'),
                 }[notification.type_] % dict(
                     user=notification.created_by_user.username,
                     when=h.fmt_date(notification.created_on),
+                )
 class EmailNotificationModel(BaseModel):
     TYPE_CHANGESET_COMMENT = Notification.TYPE_CHANGESET_COMMENT
     TYPE_MESSAGE = Notification.TYPE_MESSAGE # only used for testing
     # Notification.TYPE_MENTION is not used
     TYPE_PASSWORD_RESET = 'password_link'
     TYPE_REGISTRATION = Notification.TYPE_REGISTRATION
     TYPE_PULL_REQUEST = Notification.TYPE_PULL_REQUEST
     TYPE_PULL_REQUEST_COMMENT = Notification.TYPE_PULL_REQUEST_COMMENT
     TYPE_DEFAULT = 'default'
     def __init__(self):
         super(EmailNotificationModel, self).__init__()
         self._template_root = kallithea.CONFIG['pylons.paths']['templates'][0]
         self._tmpl_lookup = kallithea.CONFIG['pylons.app_globals'].mako_lookup
         self.email_types = {
             self.TYPE_CHANGESET_COMMENT: 'changeset_comment',
             self.TYPE_PASSWORD_RESET: 'password_reset',
             self.TYPE_REGISTRATION: 'registration',
             self.TYPE_DEFAULT: 'default',
             self.TYPE_PULL_REQUEST: 'pull_request',
             self.TYPE_PULL_REQUEST_COMMENT: 'pull_request_comment',
+        }
         self._subj_map = {
             self.TYPE_CHANGESET_COMMENT: _('[Comment] %(repo_name)s changeset %(short_id)s "%(message_short)s" on %(branch)s'),
             self.TYPE_MESSAGE: 'Test Message',
             # self.TYPE_PASSWORD_RESET
             self.TYPE_REGISTRATION: _('New user %(new_username)s registered'),
             # self.TYPE_DEFAULT
             self.TYPE_PULL_REQUEST: _('[Added] %(repo_name)s pull request %(pr_nice_id)s "%(pr_title_short)s" from %(pr_source_branch)s'),
             self.TYPE_PULL_REQUEST_COMMENT: _('[Comment] %(repo_name)s pull request %(pr_nice_id)s "%(pr_title_short)s" from %(pr_source_branch)s'),
             self.TYPE_PULL_REQUEST: _('[Review] %(repo_name)s PR %(pr_nice_id)s "%(pr_title_short)s" from %(pr_source_branch)s by %(pr_owner_username)s'),
             self.TYPE_PULL_REQUEST_COMMENT: _('[Comment] %(repo_name)s PR %(pr_nice_id)s "%(pr_title_short)s" from %(pr_source_branch)s by %(pr_owner_username)s'),
+        }
     def get_email_description(self, type_, **kwargs):
         """
         return subject for email based on given type
         """
         tmpl = self._subj_map[type_]
         try:
             subj = tmpl % kwargs
         except KeyError as e:
             log.error('error generating email subject for %r from %s: %s', type_, ','.join(self._subj_map.keys()), e)
             raise
         l = [safe_unicode(x) for x in [kwargs.get('status_change'), kwargs.get('closing_pr') and _('Closing')] if x]
         if l:
             if subj.startswith('['):
                 subj = '[' + ', '.join(l) + ': ' + subj[1:]
             else:
                 subj = '[' + ', '.join(l) + '] ' + subj
         return subj
     def get_email_tmpl(self, type_, content_type, **kwargs):
         """
         return generated template for email based on given type
         """
         base = 'email_templates/' + self.email_types.get(type_, self.email_types[self.TYPE_DEFAULT]) + '.' + content_type
         email_template = self._tmpl_lookup.get_template(base)
         # translator and helpers inject
         _kwargs = {'_': _,
                    'h': h,
                    'c': c}
         _kwargs.update(kwargs)
         log.debug('rendering tmpl %s with kwargs %s', base, _kwargs)
         return email_template.render(**_kwargs)

kallithea/model/pull_request.py

➞

Show inline comments

@@ @@ -126,96 +126,97 @@ class PullRequestModel(BaseModel): @@
         mention_recipients = extract_mentioned_users(new.description)
         self.__add_reviewers(created_by_user, new, reviewers, mention_recipients)
         return new
     def __add_reviewers(self, user, pr, reviewers, mention_recipients):
         # reviewers and mention_recipients should be sets of User objects.
         #members
         for reviewer in reviewers:
             reviewer = PullRequestReviewers(reviewer, pr)
             Session().add(reviewer)
         revision_data = [(x.raw_id, x.message)
                          for x in map(pr.org_repo.get_changeset, pr.revisions)]
         #notification to reviewers
         pr_url = pr.url(canonical=True)
         threading = ['%s-pr-%s@%s' % (pr.other_repo.repo_name,
                                       pr.pull_request_id,
                                       h.canonical_hostname())]
         subject = safe_unicode(
             h.link_to(
               _('%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s') % \
                 {'user': user.username,
                  'pr_title': pr.title,
                  'pr_nice_id': pr.nice_id()},
                 pr_url)
+            )
         body = pr.description
         _org_ref_type, org_ref_name, _org_rev = pr.org_ref.split(':')
         _other_ref_type, other_ref_name, _other_rev = pr.other_ref.split(':')
         email_kwargs = {
             'pr_title': pr.title,
             'pr_title_short': h.shorter(pr.title, 50),
             'pr_user_created': user.full_name_and_username,
             'pr_repo_url': h.canonical_url('summary_home', repo_name=pr.other_repo.repo_name),
             'pr_url': pr_url,
             'pr_revisions': revision_data,
             'repo_name': pr.other_repo.repo_name,
             'org_repo_name': pr.org_repo.repo_name,
             'pr_nice_id': pr.nice_id(),
             'pr_target_repo': h.canonical_url('summary_home',
                                repo_name=pr.other_repo.repo_name),
             'pr_target_branch': other_ref_name,
             'pr_source_repo': h.canonical_url('summary_home',
                                repo_name=pr.org_repo.repo_name),
             'pr_source_branch': org_ref_name,
             'pr_owner': pr.owner,
             'pr_owner_username': pr.owner.username,
             'pr_username': user.username,
             'threading': threading,
             'is_mention': False,
+            }
         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)
     def update_reviewers(self, user, pull_request, reviewers_ids):
         reviewers_ids = set(reviewers_ids)
         pull_request = self.__get_pull_request(pull_request)
         current_reviewers = PullRequestReviewers.query() \
             .options(joinedload('user')) \
             .filter_by(pull_request=pull_request) \
             .all()
         current_reviewer_users = set(x.user for x in current_reviewers)
         new_reviewer_users = set(self._get_valid_reviewers(reviewers_ids))
         to_add = new_reviewer_users - current_reviewer_users
         to_remove = current_reviewer_users - new_reviewer_users
         if not to_add and not to_remove:
             return # all done
         log.debug("Adding %s reviewers", to_add)
         self.__add_reviewers(user, pull_request, to_add, set())
         log.debug("Removing %s reviewers", to_remove)

kallithea/tests/models/test_dump_html_mails.ref.html

➞

Show inline comments

@@ @@ -241,534 +241,534 @@ This is an automatic notification. Don't @@
 <br/>
 <br/>
 -- <br/>
 This is an automatic notification. Don&#39;t reply to this mail.
 <pre>--------------------</pre>
 <h1>registration</h1>
 <pre>
 From: u1
 To: u2@example.com
 Subject: New user newbie registered
 --------------------
 Registration body
 View this user here: http://newbie.org
 --
 This is an automatic notification. Don't reply to this mail.
 --------------------</pre>
 <div class="formatted-fixed">Registration body</div>
 View this user here: <a href="http://newbie.org">http://newbie.org</a>
 <br/>
 <br/>
 -- <br/>
 This is an automatic notification. Don&#39;t reply to this mail.
 <pre>--------------------</pre>
 <h1>pull_request, is_mention=False</h1>
 <pre>
 From: u1
 To: u2@example.com
-Subject: [Added] repo/name pull request #7 "The Title" from devbranch
+Subject: [Review] repo/name PR #7 "The Title" from devbranch by u2
 --------------------
 Requesting User (root) requested your review of repo/name pull request "The Title"
 URL: http://pr.org/7
 Description:
 This PR is awesome because it does stuff
  - please approve indented!
 Changesets:
 abc123abc: http://changeset_home/?repo_name=repo_org&amp;revision=123abc123abc123abc123abc123abc123abc123abc
 Introduce one and two
 and that's it
 fed567fed: http://changeset_home/?repo_name=repo_org&amp;revision=567fed567fed567fed567fed567fed567fed567fed
 Make one plus two equal tree
 --
 This is an automatic notification. Don't reply to this mail.
 --------------------</pre>
 <p>Requesting User (root) requested your review of repo/name pull request &#34;The Title&#34;</p>
 <p>URL: <a href="http://pr.org/7">http://pr.org/7</a></p>
 <p>Description:</p>
 <p style="white-space: pre-wrap; font-family: monospace"><div class="formatted-fixed">This PR is awesome because it does stuff
  - please approve indented!</div></p>
 <p>Changesets:</p>
 <p style="white-space: pre-wrap">
 <i><a href="http://changeset_home/?repo_name=repo_org&amp;revision=123abc123abc123abc123abc123abc123abc123abc">123abc123abc</a></i>:
 Introduce one and two
 and that&#39;s it
 <i><a href="http://changeset_home/?repo_name=repo_org&amp;revision=567fed567fed567fed567fed567fed567fed567fed">567fed567fed</a></i>:
 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, is_mention=True</h1>
 <pre>
 From: u1
 To: u2@example.com
-Subject: [Added] repo/name pull request #7 "The Title" from devbranch
+Subject: [Review] repo/name PR #7 "The Title" from devbranch by u2
 --------------------
 Requesting User (root) mentioned you on repo/name pull request "The Title"
 URL: http://pr.org/7
 Description:
 This PR is awesome because it does stuff
  - please approve indented!
 Changesets:
 abc123abc: http://changeset_home/?repo_name=repo_org&amp;revision=123abc123abc123abc123abc123abc123abc123abc
 Introduce one and two
 and that's it
 fed567fed: http://changeset_home/?repo_name=repo_org&amp;revision=567fed567fed567fed567fed567fed567fed567fed
 Make one plus two equal tree
 --
 This is an automatic notification. Don't reply to this mail.
 --------------------</pre>
 <p>Requesting User (root) mentioned you on repo/name pull request &#34;The Title&#34;</p>
 <p>URL: <a href="http://pr.org/7">http://pr.org/7</a></p>
 <p>Description:</p>
 <p style="white-space: pre-wrap; font-family: monospace"><div class="formatted-fixed">This PR is awesome because it does stuff
  - please approve indented!</div></p>
 <p>Changesets:</p>
 <p style="white-space: pre-wrap">
 <i><a href="http://changeset_home/?repo_name=repo_org&amp;revision=123abc123abc123abc123abc123abc123abc123abc">123abc123abc</a></i>:
 Introduce one and two
 and that&#39;s it
 <i><a href="http://changeset_home/?repo_name=repo_org&amp;revision=567fed567fed567fed567fed567fed567fed567fed">567fed567fed</a></i>:
 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, is_mention=False, status_change=None, closing_pr=False</h1>
 <pre>
 From: u1
 To: u2@example.com
-Subject: [Comment] repo/name pull request #7 "The Title" from devbranch
+Subject: [Comment] repo/name PR #7 "The Title" from devbranch by u2
 --------------------
 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=True, status_change=None, closing_pr=False</h1>
 <pre>
 From: u1
 To: u2@example.com
-Subject: [Comment] repo/name pull request #7 "The Title" from devbranch
+Subject: [Comment] repo/name PR #7 "The Title" from devbranch by u2
 --------------------
 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 "The Title" from devbranch
+Subject: [Under Review: Comment] repo/name PR #7 "The Title" from devbranch by u2
 --------------------
 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=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 "The Title" from devbranch
+Subject: [Under Review: Comment] repo/name PR #7 "The Title" from devbranch by u2
 --------------------
 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 "The Title" from devbranch
+Subject: [Closing: Comment] repo/name PR #7 "The Title" from devbranch by u2
 --------------------
 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=True, status_change=None, closing_pr=True</h1>
 <pre>
 From: u1
 To: u2@example.com
-Subject: [Closing: Comment] repo/name pull request #7 "The Title" from devbranch
+Subject: [Closing: Comment] repo/name PR #7 "The Title" from devbranch by u2
 --------------------
 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 "The Title" from devbranch
+Subject: [Under Review, Closing: Comment] repo/name PR #7 "The Title" from devbranch by u2
 --------------------
 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 "The Title" from devbranch
+Subject: [Under Review, Closing: Comment] repo/name PR #7 "The Title" from devbranch by u2
 --------------------
 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>TYPE_PASSWORD_RESET</h1>
 <pre>
 From: u1
 To: john@doe.com
 Subject: Password reset link
 --------------------

kallithea/tests/models/test_notifications.py

➞

Show inline comments

@@ @@ -147,96 +147,97 @@ class TestNotifications(TestController): @@
     def test_notification_counter(self):
         NotificationModel().create(created_by=self.u1,
                             subject=u'title', body=u'hi there_delete',
                             recipients=[self.u3, self.u1])
         Session().commit()
         assert NotificationModel().get_unread_cnt_for_user(self.u1) == 0
         assert NotificationModel().get_unread_cnt_for_user(self.u2) == 0
         assert NotificationModel().get_unread_cnt_for_user(self.u3) == 1
         notification = NotificationModel().create(created_by=self.u1,
                                            subject=u'title', body=u'hi there3',
                                     recipients=[self.u3, self.u1, self.u2])
         Session().commit()
         assert NotificationModel().get_unread_cnt_for_user(self.u1) == 0
         assert NotificationModel().get_unread_cnt_for_user(self.u2) == 1
         assert NotificationModel().get_unread_cnt_for_user(self.u3) == 2
     @mock.patch.object(h, 'canonical_url', (lambda arg, **kwargs: 'http://%s/?%s' % (arg, '&'.join('%s=%s' % (k, v) for (k, v) in sorted(kwargs.items())))))
     def test_dump_html_mails(self):
         # Exercise all notification types and dump them to one big html file
         l = []
         def send_email(recipients, subject, body='', html_body='', headers=None, author=None):
             l.append('\n\n<h1>%s</h1>\n' % desc) # desc is from outer scope
             l.append('<pre>\n\n')
             l.append('From: %s\n' % author.username)
             l.append('To: %s\n' % ' '.join(recipients))
             l.append('Subject: %s\n' % subject)
             l.append('\n--------------------\n%s\n--------------------' % body)
             l.append('</pre>\n')
             l.append('\n%s\n' % html_body)
             l.append('<pre>--------------------</pre>\n')
         l.append('<html><body>\n')
         with mock.patch.object(kallithea.lib.celerylib.tasks, 'send_email', send_email):
             pr_kwargs = dict(
                 pr_nice_id='#7',
                 pr_title='The Title',
                 pr_title_short='The Title',
                 pr_url='http://pr.org/7',
                 pr_target_repo='http://mainline.com/repo',
                 pr_target_branch='trunk',
                 pr_source_repo='https://dev.org/repo',
                 pr_source_branch='devbranch',
                 pr_owner=User.get(self.u2),
                 pr_owner_username='u2'
+                )
             for type_, body, kwargs in [
                 (Notification.TYPE_CHANGESET_COMMENT,
                  u'This is the new comment.\n\n - and here it ends indented.',
                  dict(
                     short_id='cafe1234',
                     raw_id='cafe1234c0ffeecafe',
                     branch='brunch',
                     cs_comment_user='Opinionated User (jsmith)',
                     cs_comment_url='http://comment.org',
                     is_mention=[False, True],
                     message='This changeset did something clever which is hard to explain',
                     message_short='This changeset did something cl...',
                     status_change=[None, 'Approved'],
                     cs_target_repo='repo_target',
                     cs_url='http://changeset.com',
                     cs_author=User.get(self.u2))),
                 (Notification.TYPE_MESSAGE,
                  u'This is the body of the test message\n - nothing interesting here except indentation.',
                  dict()),
                 #(Notification.TYPE_MENTION, '$body', None), # not used
                 (Notification.TYPE_REGISTRATION,
                  u'Registration body',
                  dict(
                     new_username='newbie',
                     registered_user_url='http://newbie.org',
                     new_email='new@email.com',
                     new_full_name='New Full Name')),
                 (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'

0 comments (0 inline, 0 general)