kallithea Changeset - 2da1689d7384

Changeset - 2da1689d7384

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Thomas De Schampheleire - 7 years ago 2018-11-17 21:54:21
thomas.de_schampheleire@nokia.com

tests: small improvements to test_changeset_comments

- response checking is incorrectly placed under 'Test DB' comment
- no response check on the comment text was done
- related: use different text for the comments in different tests
- commit_id should be comment_id
- remove duplicate checking of comment count in DB

1 file changed with 17 insertions and 15 deletions:

kallithea/tests/functional/test_changeset_comments.py

0 comments (0 inline, 0 general)

kallithea/tests/functional/test_changeset_comments.py

➞

Show inline comments

@@ @@ -13,80 +13,80 @@ class TestChangeSetCommentsController(Te @@
         self.remove_all_notifications()
     def test_create(self):
         self.log_user()
         rev = '27cd5cce30c96924232dffcd24178a07ffeb5dfc'
-        text = u'CommentOnRevision'
+        text = u'general comment on changeset'
         params = {'text': text, '_authentication_token': self.authentication_token()}
         response = self.app.post(url(controller='changeset', action='comment',
                                      repo_name=HG_REPO, revision=rev),
                                      params=params, extra_environ={'HTTP_X_PARTIAL_XHR': '1'})
         # Test response...
         assert response.status == '200 OK'
         response = self.app.get(url(controller='changeset', action='index',
                                 repo_name=HG_REPO, revision=rev))
         # test DB
         assert ChangesetComment.query().count() == 1
         response.mustcontain(
             '''<div class="comments-number">'''
             ''' 1 comment (0 inline, 1 general)'''
+        )
         response.mustcontain(text)
         # test DB
         assert ChangesetComment.query().count() == 1
         assert Notification.query().count() == 1
         assert ChangesetComment.query().count() == 1
         notification = Notification.query().all()[0]
-        commit_id = ChangesetComment.query().first().comment_id
+        comment_id = ChangesetComment.query().first().comment_id
         assert notification.type_ == Notification.TYPE_CHANGESET_COMMENT
         sbj = (u'/%s/changeset/'
                '27cd5cce30c96924232dffcd24178a07ffeb5dfc#comment-%s'
-               % (HG_REPO, commit_id))
+               % (HG_REPO, comment_id))
         print "%s vs %s" % (sbj, notification.subject)
         assert sbj in notification.subject
     def test_create_inline(self):
         self.log_user()
         rev = '27cd5cce30c96924232dffcd24178a07ffeb5dfc'
-        text = u'CommentOnRevision'
+        text = u'inline comment on changeset'
         f_path = 'vcs/web/simplevcs/views/repository.py'
         line = 'n1'
         params = {'text': text, 'f_path': f_path, 'line': line, '_authentication_token': self.authentication_token()}
         response = self.app.post(url(controller='changeset', action='comment',
                                      repo_name=HG_REPO, revision=rev),
                                      params=params, extra_environ={'HTTP_X_PARTIAL_XHR': '1'})
         # Test response...
         assert response.status == '200 OK'
         response = self.app.get(url(controller='changeset', action='index',
                                 repo_name=HG_REPO, revision=rev))
         # test DB
         assert ChangesetComment.query().count() == 1
         response.mustcontain(
             '''<div class="comments-number">'''
             ''' 1 comment (1 inline, 0 general)'''
+        )
         response.mustcontain(
             '''<div class="comments-list-chunk" '''
             '''data-f_path="vcs/web/simplevcs/views/repository.py" '''
             '''data-line_no="n1" data-target-id="vcswebsimplevcsviewsrepositorypy_n1">'''
+        )
         response.mustcontain(text)
         # test DB
         assert ChangesetComment.query().count() == 1
         assert Notification.query().count() == 1
         assert ChangesetComment.query().count() == 1
         notification = Notification.query().all()[0]
-        commit_id = ChangesetComment.query().first().comment_id
+        comment_id = ChangesetComment.query().first().comment_id
         assert notification.type_ == Notification.TYPE_CHANGESET_COMMENT
         sbj = (u'/%s/changeset/'
                '27cd5cce30c96924232dffcd24178a07ffeb5dfc#comment-%s'
-               % (HG_REPO, commit_id))
+               % (HG_REPO, comment_id))
         print "%s vs %s" % (sbj, notification.subject)
         assert sbj in notification.subject
     def test_create_with_mention(self):
         self.log_user()
@@ @@ -99,29 +99,30 @@ class TestChangeSetCommentsController(Te @@
                                      params=params, extra_environ={'HTTP_X_PARTIAL_XHR': '1'})
         # Test response...
         assert response.status == '200 OK'
         response = self.app.get(url(controller='changeset', action='index',
                                 repo_name=HG_REPO, revision=rev))
         # test DB
         assert ChangesetComment.query().count() == 1
         response.mustcontain(
             '''<div class="comments-number">'''
             ''' 1 comment (0 inline, 1 general)'''
+        )
         response.mustcontain('<b>@%s</b> check CommentOnRevision' % TEST_USER_REGULAR_LOGIN)
         # test DB
         assert ChangesetComment.query().count() == 1
         assert Notification.query().count() == 2
         users = [x.user.username for x in UserNotification.query().all()]
         # test_regular gets notification by @mention
         assert sorted(users) == [TEST_USER_ADMIN_LOGIN, TEST_USER_REGULAR_LOGIN]
     def test_delete(self):
         self.log_user()
         rev = '27cd5cce30c96924232dffcd24178a07ffeb5dfc'
-        text = u'CommentOnRevision'
+        text = u'general comment on changeset to be deleted'
         params = {'text': text, '_authentication_token': self.authentication_token()}
         response = self.app.post(url(controller='changeset', action='comment',
                                      repo_name=HG_REPO, revision=rev),
                                      params=params, extra_environ={'HTTP_X_PARTIAL_XHR': '1'})
@@ @@ -140,6 +141,7 @@ class TestChangeSetCommentsController(Te @@
         response = self.app.get(url(controller='changeset', action='index',
                                 repo_name=HG_REPO, revision=rev))
         response.mustcontain(
             '''<div class="comments-number">'''
             ''' 0 comments (0 inline, 0 general)'''
+        )
         response.mustcontain(no=text)

0 comments (0 inline, 0 general)