Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions employees/tests/test_views.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import datetime

from dateutil.relativedelta import relativedelta
from django.conf import settings
from django.shortcuts import reverse
from django.template.defaultfilters import date
from django.test import TestCase
from django.utils import timezone
from freezegun import freeze_time
Expand Down Expand Up @@ -605,12 +607,8 @@ def _assert_response_contain_report(self, response, reports):
other_fields = ["description", "author", "task_activities"]
work_hours = report.work_hours_str
fields_to_check = [work_hours]
for date in dates:
fields_to_check.append(
datetime.datetime.strftime(
datetime.datetime.fromtimestamp(int(getattr(report, date).timestamp())), "%B %-d, %Y, %-I:%M"
)
)
for date_ in dates:
fields_to_check.append(date(getattr(report, date_), settings.DATE_FORMAT))
for field in other_fields:
if field == "author":
fields_to_check.append(getattr(report, field).email)
Expand Down
2 changes: 2 additions & 0 deletions sheetstorm/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,8 @@
ACCOUNT_USER_EMAIL_FIELD = 'email'
ACCOUNT_LOGOUT_ON_GET = True

DATE_FORMAT = 'N j, Y'

EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'

SITE_ID = 1
Expand Down