gryf/tuir
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add full test coverage for Content.humanize_timestamp

Browse Source
This commit is contained in:
John Helmert
2019-06-12 21:00:02 -05:00
parent c30e2559f7
commit 4f37dd1710
2 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
tests/test_content.py
View File

@@ -106,13 +106,40 @@ def test_content_humanize_timestamp():
assert Content.humanize_timestamp(timestamp) == '0min' assert Content.humanize_timestamp(timestamp) == '0min'
assert Content.humanize_timestamp(timestamp, True) == 'moments ago' assert Content.humanize_timestamp(timestamp, True) == 'moments ago'
timestamp = time.time() - 60 * 60 * 24 * 30.4 * 12 timestamp = time.time() - 60
assert Content.humanize_timestamp(timestamp) == '11month' assert Content.humanize_timestamp(timestamp) == '1min'
assert Content.humanize_timestamp(timestamp, True) == '11 months ago' assert Content.humanize_timestamp(timestamp, True) == '1 minute ago'
timestamp = time.time() - 60 * 60 * 24 * 30.4 * 12 * 5 timestamp = time.time() - 60 * 2
assert Content.humanize_timestamp(timestamp) == '5yr' assert Content.humanize_timestamp(timestamp, True) == '2 minutes ago'
assert Content.humanize_timestamp(timestamp, True) == '5 years ago'
timestamp = time.time() - 60 * 60
assert Content.humanize_timestamp(timestamp) == '1hr'
assert Content.humanize_timestamp(timestamp, True) == '1 hour ago'
timestamp = time.time() - 60 * 60 * 2
assert Content.humanize_timestamp(timestamp, True) == '2 hours ago'
timestamp = time.time() - 60 * 60 * 24
assert Content.humanize_timestamp(timestamp) == '1day'
assert Content.humanize_timestamp(timestamp, True) == '1 day ago'
timestamp = time.time() - 60 * 60 * 24 * 2
assert Content.humanize_timestamp(timestamp, True) == '2 days ago'
timestamp = time.time() - 60 * 60 * 24 * 31
assert Content.humanize_timestamp(timestamp) == '1month'
assert Content.humanize_timestamp(timestamp, True) == '1 month ago'
timestamp = time.time() - 60 * 60 * 24 * 31 * 2
assert Content.humanize_timestamp(timestamp, True) == '2 months ago'
timestamp = time.time() - 60 * 60 * 24 * 31 * 12
assert Content.humanize_timestamp(timestamp) == '1yr'
assert Content.humanize_timestamp(timestamp, True) == '1 year ago'
timestamp = time.time() - 60 * 60 * 24 * 31 * 12 * 2
assert Content.humanize_timestamp(timestamp, True) == '2 years ago'
def test_content_wrap_text(): def test_content_wrap_text():

4
tuir/content.py
View File

@@ -356,7 +356,7 @@ class Content(object):
minutes = seconds // 60 minutes = seconds // 60
if minutes < 60: if minutes < 60:
if verbose and minutes == 1: if verbose and minutes == 1:
return '1 minutes ago' return '1 minute ago'
elif verbose: elif verbose:
return '%d minutes ago' % minutes return '%d minutes ago' % minutes
else: else:
@@ -380,7 +380,7 @@ class Content(object):
else: else:
return '%dday' % days return '%dday' % days
months = days // 30.4 months = days // 31
if months < 12: if months < 12:
if verbose and months == 1: if verbose and months == 1:
return '1 month ago' return '1 month ago'