Mercurial > kallithea
changeset 2317:c4d8ed624728 beta
Fixed tests for new i18n changes
- added new test for age function
- added new Contributor to RhodeCode
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Sun, 20 May 2012 14:34:45 +0200 |
| parents | 14281c7d5c2f |
| children | 058e2743e7b7 |
| files | CONTRIBUTORS rhodecode/tests/functional/test_changeset_comments.py rhodecode/tests/test_libs.py |
| diffstat | 3 files changed, 25 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/CONTRIBUTORS Sun May 20 11:47:38 2012 +0200 +++ b/CONTRIBUTORS Sun May 20 14:34:45 2012 +0200 @@ -18,4 +18,5 @@ 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
--- a/rhodecode/tests/functional/test_changeset_comments.py Sun May 20 11:47:38 2012 +0200 +++ b/rhodecode/tests/functional/test_changeset_comments.py Sun May 20 14:34:45 2012 +0200 @@ -40,8 +40,8 @@ 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) @@ -76,7 +76,7 @@ #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( @@ -115,8 +115,8 @@ 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()] @@ -148,5 +148,5 @@ 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>''')
--- a/rhodecode/tests/test_libs.py Sun May 20 11:47:38 2012 +0200 +++ b/rhodecode/tests/test_libs.py Sun May 20 14:34:45 2012 +0200 @@ -23,10 +23,10 @@ # 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 = [ @@ -116,3 +116,16 @@ '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')