Bump version

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## v1.6.2 (04/04/2021)
+- [**enhancement**] Expose `date_added` in UI [#85](https://github.com/sissbruecker/linkding/issues/85)
+- [**closed**] Archived bookmarks - no result when searching for a word which is used only as tag [#83](https://github.com/sissbruecker/linkding/issues/83)
+- [**closed**] Add archive/unarchive button to edit bookmark page [#82](https://github.com/sissbruecker/linkding/issues/82)
+- [**enhancement**] Make scraped title and description editable [#80](https://github.com/sissbruecker/linkding/issues/80)
+
+---
+
 ## v1.6.1 (31/03/2021)
 - Expose date_added in UI [#85](https://github.com/sissbruecker/linkding/issues/85)
 

bookmarks/tests/test_utils.py

@@ -1,3 +1,5 @@
+from unittest.mock import patch
+
 from django.test import TestCase
 from django.utils import timezone
 
@@ -23,6 +25,14 @@ class UtilsTestCase(TestCase):
             result = humanize_absolute_date(test_case[0], test_case[1])
             self.assertEqual(test_case[2], result)
 
+    def test_humanize_absolute_date_should_use_current_date_as_default(self):
+        with patch.object(timezone, 'now', return_value=timezone.datetime(2021, 1, 1)):
+            self.assertEqual(humanize_absolute_date(timezone.datetime(2021, 1, 1)), 'Today')
+
+        # Regression: Test that subsequent calls use current date instead of cached date (#107)
+        with patch.object(timezone, 'now', return_value=timezone.datetime(2021, 1, 13)):
+            self.assertEqual(humanize_absolute_date(timezone.datetime(2021, 1, 13)), 'Today')
+
     def test_humanize_relative_date(self):
         test_cases = [
             (timezone.datetime(2021, 1, 1), timezone.datetime(2022, 1, 1), '1 year ago'),
@@ -45,3 +55,11 @@ class UtilsTestCase(TestCase):
         for test_case in test_cases:
             result = humanize_relative_date(test_case[0], test_case[1])
             self.assertEqual(test_case[2], result)
+
+    def test_humanize_relative_date_should_use_current_date_as_default(self):
+        with patch.object(timezone, 'now', return_value=timezone.datetime(2021, 1, 1)):
+            self.assertEqual(humanize_relative_date(timezone.datetime(2021, 1, 1)), 'Today')
+
+        # Regression: Test that subsequent calls use current date instead of cached date (#107)
+        with patch.object(timezone, 'now', return_value=timezone.datetime(2021, 1, 13)):
+            self.assertEqual(humanize_relative_date(timezone.datetime(2021, 1, 13)), 'Today')

bookmarks/utils.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+from typing import Optional
 
 from dateutil.relativedelta import relativedelta
 from django.template.defaultfilters import pluralize
@@ -20,7 +21,9 @@ weekday_names = {
 }
 
 
-def humanize_absolute_date(value: datetime, now=timezone.now()):
+def humanize_absolute_date(value: datetime, now: Optional[datetime] = None):
+    if not now:
+        now = timezone.now()
     delta = relativedelta(now, value)
     yesterday = now - relativedelta(days=1)
 
@@ -36,7 +39,9 @@ def humanize_absolute_date(value: datetime, now=timezone.now()):
         return weekday_names[value.isoweekday()]
 
 
-def humanize_relative_date(value: datetime, now: datetime = timezone.now()):
+def humanize_relative_date(value: datetime, now: Optional[datetime] = None):
+    if not now:
+        now = timezone.now()
     delta = relativedelta(now, value)
 
     if delta.years > 0:

version.txt

@@ -1 +1 @@
-1.6.2
+1.6.3