Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Midnight #1111

Merged
merged 4 commits into from Dec 21, 2022
Merged

Midnight #1111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a421daf
Stabilize tests at midnight
orivej Jul 21, 2019
b3c6172
Merge branch 'master' into midnight
serhii73 Nov 17, 2022
57cdb18
Remove unicode_literals
serhii73 Dec 21, 2022
4fae86e
Remove line
serhii73 Dec 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 7 additions & 4 deletions tests/test_date.py
View file
Open in desktop
Expand Up @@ -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),
Expand Down Expand Up @@ -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)
Expand Down
25 changes: 8 additions & 17 deletions tests/test_search.py
View file
Open in desktop
Expand Up @@ -8,6 +8,8 @@
import datetime
import pytz

today = datetime.datetime.today()


class TestTranslateSearch(BaseTestCase):
def setUp(self):
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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',
Expand All @@ -544,23 +542,16 @@ 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))]),

# 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',
Expand Down