diff --git a/tests/test_date.py b/tests/test_date.py index 98958ee91..cbc5ede32 100644 --- a/tests/test_date.py +++ b/tests/test_date.py @@ -354,6 +354,8 @@ def test_time_without_date_should_use_today(self, date_string): param(' Yesterday \n', days_ago=1), param('Ontem', days_ago=1), param('Ieri', days_ago=1), + param(u'вчера', days_ago=1), + param(u'снощи', days_ago=1), # Day before yesterday param('the day before yesterday', days_ago=2), param('The DAY before Yesterday', days_ago=2), @@ -523,11 +525,12 @@ def test_get_date_tuple(self, date_string, expected_result): self.then_returned_tuple_is(expected_result) def given_now(self, year, month, day, **time): + now = datetime(year, month, day, **time) datetime_mock = Mock(wraps=datetime) - datetime_mock.utcnow = Mock(return_value=datetime(year, month, day, **time)) - self.add_patch( - patch('dateparser.date_parser.datetime', new=datetime_mock) - ) + datetime_mock.utcnow = Mock(return_value=now) + datetime_mock.now = Mock(return_value=now) + datetime_mock.today = Mock(return_value=now) + self.add_patch(patch('dateparser.date.datetime', new=datetime_mock)) def given_parser(self, restrict_to_languages=None, **params): self.parser = date.DateDataParser(languages=restrict_to_languages, **params) diff --git a/tests/test_search.py b/tests/test_search.py index d3d1e8769..05ab054b5 100644 --- a/tests/test_search.py +++ b/tests/test_search.py @@ -8,6 +8,8 @@ import datetime import pytz +today = datetime.datetime.today() + class TestTranslateSearch(BaseTestCase): def setUp(self): @@ -460,10 +462,8 @@ def test_search_and_parse(self, shortname, string, expected, settings=None): ('February 1st', datetime.datetime(2017, 2, 1, 0, 0))]), param('en', '2014 was good! October was excellent!' ' Friday, 21 was especially good!', - [('2014', datetime.datetime( - 2014, datetime.datetime.utcnow().month, datetime.datetime.utcnow().day, 0, 0) - ), - ('October', datetime.datetime(2014, 10, datetime.datetime.utcnow().day, 0, 0)), + [('2014', datetime.datetime(2014, today.month, today.day, 0, 0)), + ('October', datetime.datetime(2014, 10, today.day, 0, 0)), ('Friday, 21', datetime.datetime(2014, 10, 21, 0, 0))]), param('en', """May 2020 July 2020 @@ -529,9 +529,7 @@ def test_relative_base_setting(self, shortname, string, expected, settings=None) ('July 13th', datetime.datetime(2014, 7, 13, 0, 0)), ('July 14th', datetime.datetime(2014, 7, 14, 0, 0))]), param('en', '2014. July 13th July 14th', - [('2014', datetime.datetime( - 2014, datetime.datetime.utcnow().month, datetime.datetime.utcnow().day, 0, 0) - ), + [('2014', datetime.datetime(2014, today.month, today.day, 0, 0)), ('July 13th', datetime.datetime(2014, 7, 13, 0, 0)), ('July 14th', datetime.datetime(2014, 7, 14, 0, 0))]), param('en', 'July 13th 2014 July 14th 2014', @@ -544,9 +542,7 @@ def test_relative_base_setting(self, shortname, string, expected, settings=None) [('July 13th, 2014', datetime.datetime(2014, 7, 13, 0, 0)), ('July 14th, 2014', datetime.datetime(2014, 7, 14, 0, 0))]), param('en', '2014. July 12th, July 13th, July 14th', - [('2014', datetime.datetime( - 2014, datetime.datetime.utcnow().month, datetime.datetime.utcnow().day, 0, 0) - ), + [('2014', datetime.datetime(2014, today.month, today.day, 0, 0)), ('July 12th', datetime.datetime(2014, 7, 12, 0, 0)), ('July 13th', datetime.datetime(2014, 7, 13, 0, 0)), ('July 14th', datetime.datetime(2014, 7, 14, 0, 0))]), @@ -554,13 +550,8 @@ def test_relative_base_setting(self, shortname, string, expected, settings=None) # Swedish param('sv', '1938–1939 marscherade tyska soldater i Österrike samtidigt som ' 'österrikiska soldater marscherade i Berlin.', - [('1938', datetime.datetime( - 1938, datetime.datetime.utcnow().month, datetime.datetime.utcnow().day, 0, 0) - ), - ('1939', datetime.datetime( - 1939, datetime.datetime.utcnow().month, datetime.datetime.utcnow().day, 0, 0) - )]), - + [('1938', datetime.datetime(1938, today.month, today.day, 0, 0)), + ('1939', datetime.datetime(1939, today.month, today.day, 0, 0))]), # German param('de', 'Verteidiger der Stadt kapitulierten am 2. Mai 1945. Am 8. Mai 1945 (VE-Day) trat ' 'bedingungslose Kapitulation der Wehrmacht in Kraft',