Fixed tests for new i18n changes

- added new test for age function
- added new Contributor to RhodeCode

CONTRIBUTORS

@@ -1,21 +1,22 b''
 List of contributors to RhodeCode project:
     Marcin Kuźmiński <[e-mail]>
     Lukasz Balcerzak <[e-mail]>
     Jason Harris <[e-mail]>
     Thayne Harbaugh  <[e-mail]>
     cejones <>
     Thomas Waldmann <[e-mail]>
     Lorenzo M. Catucci <[e-mail]>
     Dmitri Kuznetsov <>
     Jared Bunting <[e-mail]>
     Steve Romanow <[e-mail]>
     Augosto Hermann <[e-mail]>    
     Ankit Solanki <[e-mail]>    
     Liad Shani <[e-mail]>
     Les Peabody <[e-mail]>
     Jonas Oberschweiber <[e-mail]>
     Matt Zuba <[e-mail]>
     Aras Pranckevicius <[e-mail]>
     Tony Bussieres <[e-mail]>
     Erwin Kroon <[e-mail]>
-    nansenat16 <[e-mail]>
  No newline at end of file
+    nansenat16 <[e-mail]>
+    Vincent Duvert <[e-mail]>
  No newline at end of file

rhodecode/tests/functional/test_changeset_comments.py

@@ -1,152 +1,152 b''
 from rhodecode.tests import *
 from rhodecode.model.db import ChangesetComment, Notification, User, \
     UserNotification
 
 
 class TestChangeSetCommentsController(TestController):
 
     def setUp(self):
         for x in ChangesetComment.query().all():
             self.Session.delete(x)
         self.Session.commit()
 
         for x in Notification.query().all():
             self.Session.delete(x)
         self.Session.commit()
 
     def tearDown(self):
         for x in ChangesetComment.query().all():
             self.Session.delete(x)
         self.Session.commit()
 
         for x in Notification.query().all():
             self.Session.delete(x)
         self.Session.commit()
 
     def test_create(self):
         self.log_user()
         rev = '27cd5cce30c96924232dffcd24178a07ffeb5dfc'
         text = u'CommentOnRevision'
 
         params = {'text': text}
         response = self.app.post(url(controller='changeset', action='comment',
                                      repo_name=HG_REPO, revision=rev),
                                      params=params)
         # Test response...
         self.assertEqual(response.status, '302 Found')
         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]
 
         ID = ChangesetComment.query().first().comment_id
         self.assertEqual(notification.type_,
                          Notification.TYPE_CHANGESET_COMMENT)
         sbj = (u'/vcs_test_hg/changeset/'
                '27cd5cce30c96924232dffcd24178a07ffeb5dfc#comment-%s' % ID)
         print "%s vs %s" % (sbj, notification.subject)
         self.assertTrue(sbj in notification.subject)
 
     def test_create_inline(self):
         self.log_user()
         rev = '27cd5cce30c96924232dffcd24178a07ffeb5dfc'
         text = u'CommentOnRevision'
         f_path = 'vcs/web/simplevcs/views/repository.py'
         line = 'n1'
 
         params = {'text': text, 'f_path': f_path, 'line': line}
         response = self.app.post(url(controller='changeset', action='comment',
                                      repo_name=HG_REPO, revision=rev),
                                      params=params)
         # Test response...
         self.assertEqual(response.status, '302 Found')
         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)
         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">'''
         )
 
         self.assertEqual(Notification.query().count(), 1)
         self.assertEqual(ChangesetComment.query().count(), 1)
 
         notification = Notification.query().all()[0]
         ID = ChangesetComment.query().first().comment_id
         self.assertEqual(notification.type_,
                          Notification.TYPE_CHANGESET_COMMENT)
         sbj = (u'/vcs_test_hg/changeset/'
                '27cd5cce30c96924232dffcd24178a07ffeb5dfc#comment-%s' % ID)
         print "%s vs %s" % (sbj, notification.subject)
         self.assertTrue(sbj in notification.subject)
 
     def test_create_with_mention(self):
         self.log_user()
 
         rev = '27cd5cce30c96924232dffcd24178a07ffeb5dfc'
         text = u'@test_regular check CommentOnRevision'
 
         params = {'text':text}
         response = self.app.post(url(controller='changeset', action='comment',
                                      repo_name=HG_REPO, revision=rev),
                                      params=params)
         # Test response...
         self.assertEqual(response.status, '302 Found')
         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'])
 
     def test_delete(self):
         self.log_user()
         rev = '27cd5cce30c96924232dffcd24178a07ffeb5dfc'
         text = u'CommentOnRevision'
 
         params = {'text': text}
         response = self.app.post(url(controller='changeset', action='comment',
                                      repo_name=HG_REPO, revision=rev),
                                      params=params)
 
         comments = ChangesetComment.query().all()
         self.assertEqual(len(comments), 1)
         comment_id = comments[0].comment_id
 
         self.app.delete(url(controller='changeset',
                                     action='delete_comment',
                                     repo_name=HG_REPO,
                                     comment_id=comment_id))
 
         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

@@ -1,118 +1,131 b''
 # -*- coding: utf-8 -*-
 """
     rhodecode.tests.test_libs
     ~~~~~~~~~~~~~~~~~~~~~~~~~
 
 
     Package for testing various lib/helper functions in rhodecode
 
     :created_on: Jun 9, 2011
     :copyright: (C) 2011-2012 Marcin Kuzminski <[e-mail]>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # 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'],
      '%s://127.0.0.1' % proto),
     ('%s://marcink:pass@127.0.0.1' % proto, ['%s://' % proto, '127.0.0.1'],
      '%s://127.0.0.1' % proto),
     ('%s://127.0.0.1:8080' % proto, ['%s://' % proto, '127.0.0.1', '8080'],
      '%s://127.0.0.1:8080' % proto),
     ('%s://domain.org' % proto, ['%s://' % proto, 'domain.org'],
      '%s://domain.org' % proto),
     ('%s://user:[e-mail]:8080' % proto, ['%s://' % proto, 'domain.org',
                                                 '8080'],
      '%s://domain.org:8080' % proto),
 ]
 
 proto = 'https'
 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'],
      '%s://127.0.0.1' % proto),
     ('%s://marcink:pass@127.0.0.1' % proto, ['%s://' % proto, '127.0.0.1'],
      '%s://127.0.0.1' % proto),
     ('%s://127.0.0.1:8080' % proto, ['%s://' % proto, '127.0.0.1', '8080'],
      '%s://127.0.0.1:8080' % proto),
     ('%s://domain.org' % proto, ['%s://' % proto, 'domain.org'],
      '%s://domain.org' % proto),
     ('%s://user:[e-mail]:8080' % proto, ['%s://' % proto, 'domain.org',
                                                 '8080'],
      '%s://domain.org:8080' % proto),
 ]
 
 
 class TestLibs(unittest.TestCase):
 
     def test_uri_filter(self):
         from rhodecode.lib.utils2 import uri_filter
 
         for url in TEST_URLS:
             self.assertEqual(uri_filter(url[0]), url[1])
 
     def test_credentials_filter(self):
         from rhodecode.lib.utils2 import credentials_filter
 
         for url in TEST_URLS:
             self.assertEqual(credentials_filter(url[0]), url[2])
 
     def test_str2bool(self):
         from rhodecode.lib.utils2 import str2bool
         test_cases = [
             ('t', True),
             ('true', True),
             ('y', True),
             ('yes', True),
             ('on', True),
             ('1', True),
             ('Y', True),
             ('yeS', True),
             ('Y', True),
             ('TRUE', True),
             ('T', True),
             ('False', False),
             ('F', False),
             ('FALSE', False),
             ('0', False),
             ('-1', False),
             ('', False), ]
 
         for case in test_cases:
             self.assertEqual(str2bool(case[0]), case[1])
 
     def test_mention_extractor(self):
         from rhodecode.lib.utils2 import extract_mentioned_users
         sample = (
             "@first hi there @marcink here's my email [e-mail] "
             "@lukaszb check @one_more22 it pls @ ttwelve @D[] @one@two@three "
             "@MARCIN    @maRCiN @2one_more22 @john please see this http://org.pl "
             "@marian.user just do it @marco-polo and next extract @marco_polo "
             "user.dot  hej ! not-needed [e-mail]"
         )
 
         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')