kallithea Changeset - c4d8ed624728

Changeset - c4d8ed624728

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 13 years ago 2012-05-20 14:34:45
marcin@python-works.com

Fixed tests for new i18n changes
- added new test for age function
- added new Contributor to RhodeCode

3 files changed with 25 insertions and 11 deletions:

CONTRIBUTORS

rhodecode/tests/functional/test_changeset_comments.py

rhodecode/tests/test_libs.py

0 comments (0 inline, 0 general)

CONTRIBUTORS

➞

Show inline comments

@@ @@ -15,7 +15,8 @@ List of contributors to RhodeCode projec @@
     Les Peabody <lpeabody@gmail.com>
     Jonas Oberschweiber <jonas.oberschweiber@d-velop.de>
     Matt Zuba <matt.zuba@goodwillaz.org>
     Aras Pranckevicius <aras@unity3d.com>
     Tony Bussieres <t.bussieres@gmail.com>
     Erwin Kroon <e.kroon@smartmetersolutions.nl>
     nansenat16 <nansenat16@null.tw>
@@ \ No newline at end of file @@
     nansenat16 <nansenat16@null.tw>
     Vincent Duvert <vincent@duvert.net>
@@ \ No newline at end of file @@

rhodecode/tests/functional/test_changeset_comments.py

➞

Show inline comments

@@ @@ -37,14 +37,14 @@ class TestChangeSetCommentsController(Te @@
         response.follow()
         response = self.app.get(url(controller='changeset', action='index',
                                 repo_name=HG_REPO, revision=rev))
         # test DB
         self.assertEqual(ChangesetComment.query().count(), 1)
         self.assertTrue('''<div class="comments-number">%s '''
                         '''comment(s) (0 inline)</div>''' % 1 in response.body)
         response.mustcontain('''<div class="comments-number">%s comment '''
                              '''(0 inline)</div>''' % 1)
         self.assertEqual(Notification.query().count(), 1)
         self.assertEqual(ChangesetComment.query().count(), 1)
         notification = Notification.query().all()[0]
@@ @@ -73,13 +73,13 @@ class TestChangeSetCommentsController(Te @@
         response = self.app.get(url(controller='changeset', action='index',
                                 repo_name=HG_REPO, revision=rev))
         #test DB
         self.assertEqual(ChangesetComment.query().count(), 1)
         response.mustcontain(
-            '''<div class="comments-number">0 comment(s)'''
+            '''<div class="comments-number">0 comments'''
             ''' (%s inline)</div>''' % 1
+        )
         response.mustcontain(
             '''<div style="display:none" class="inline-comment-placeholder" '''
             '''path="vcs/web/simplevcs/views/repository.py" '''
             '''target_id="vcswebsimplevcsviewsrepositorypy">'''
@@ @@ -112,14 +112,14 @@ class TestChangeSetCommentsController(Te @@
         response.follow()
         response = self.app.get(url(controller='changeset', action='index',
                                 repo_name=HG_REPO, revision=rev))
         # test DB
         self.assertEqual(ChangesetComment.query().count(), 1)
         self.assertTrue('''<div class="comments-number">%s '''
                         '''comment(s) (0 inline)</div>''' % 1 in response.body)
         response.mustcontain('''<div class="comments-number">%s '''
                              '''comment (0 inline)</div>''' % 1)
         self.assertEqual(Notification.query().count(), 2)
         users = [x.user.username for x in UserNotification.query().all()]
         # test_regular get's notification by @mention
         self.assertEqual(sorted(users), [u'test_admin', u'test_regular'])
@@ @@ -145,8 +145,8 @@ class TestChangeSetCommentsController(Te @@
         comments = ChangesetComment.query().all()
         self.assertEqual(len(comments), 0)
         response = self.app.get(url(controller='changeset', action='index',
                                 repo_name=HG_REPO, revision=rev))
         self.assertTrue('''<div class="comments-number">0 comment(s)'''
                         ''' (0 inline)</div>''' in response.body)
         response.mustcontain('''<div class="comments-number">0 comments'''
                              ''' (0 inline)</div>''')

rhodecode/tests/test_libs.py

➞

Show inline comments

@@ @@ -20,16 +20,16 @@ @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import unittest
 import datetime
 from rhodecode.tests import *
 import unittest
 from rhodecode.tests import *
 proto = 'http'
 TEST_URLS = [
     ('%s://127.0.0.1' % proto, ['%s://' % proto, '127.0.0.1'],
      '%s://127.0.0.1' % proto),
     ('%s://marcink@127.0.0.1' % proto, ['%s://' % proto, '127.0.0.1'],
@@ @@ -113,6 +113,19 @@ class TestLibs(unittest.TestCase): @@
         s = sorted([
         'first', 'marcink', 'lukaszb', 'one_more22', 'MARCIN', 'maRCiN', 'john',
         'marian.user', 'marco-polo', 'marco_polo'
         ], key=lambda k: k.lower())
         self.assertEqual(s, extract_mentioned_users(sample))
     def test_age(self):
         from rhodecode.lib.utils2 import age
         n = datetime.datetime.now()
         delt = lambda *args, **kwargs: datetime.timedelta(*args, **kwargs)
         self.assertEqual(age(n), u'just now')
         self.assertEqual(age(n - delt(seconds=1)), u'1 second ago')
         self.assertEqual(age(n - delt(seconds=60 * 2)), u'2 minutes ago')
         self.assertEqual(age(n - delt(hours=1)), u'1 hour ago')
         self.assertEqual(age(n - delt(hours=24)), u'1 day ago')
         self.assertEqual(age(n - delt(hours=24 * 5)), u'5 days ago')
         self.assertEqual(age(n - delt(hours=24 * 32)), u'1 month and 2 days ago')
         self.assertEqual(age(n - delt(hours=24 * 400)), u'1 year and 1 month ago')

0 comments (0 inline, 0 general)