diff --git a/capone/tests/settings.py b/capone/tests/settings.py index 6e0af13..d1a5936 100644 --- a/capone/tests/settings.py +++ b/capone/tests/settings.py @@ -44,3 +44,5 @@ 'django.contrib.messages.middleware.MessageMiddleware', ) SESSION_ENGINE = 'django.contrib.sessions.backends.db' + +USE_TZ = True diff --git a/capone/tests/test_assert_transaction_in_ledgers_for_amounts_with_evidence.py b/capone/tests/test_assert_transaction_in_ledgers_for_amounts_with_evidence.py index 5f9ac35..33dfd7d 100644 --- a/capone/tests/test_assert_transaction_in_ledgers_for_amounts_with_evidence.py +++ b/capone/tests/test_assert_transaction_in_ledgers_for_amounts_with_evidence.py @@ -1,8 +1,8 @@ -from datetime import datetime from datetime import timedelta from decimal import Decimal from django.test import TestCase +from django.utils import timezone from capone.api.actions import credit from capone.api.actions import debit @@ -22,8 +22,8 @@ def test_transaction_fields(self): """ Test filtering by `posted_timestamp`, `notes`, `type`, and `user`. """ - time = datetime.now() - wrong_time = datetime.now() - timedelta(days=1) + time = timezone.now() + wrong_time = timezone.now() - timedelta(days=1) user1 = UserFactory() user2 = UserFactory() credit_card_transaction = CreditCardTransactionFactory() diff --git a/capone/tests/test_create_transaction.py b/capone/tests/test_create_transaction.py index 538f177..e0983e9 100644 --- a/capone/tests/test_create_transaction.py +++ b/capone/tests/test_create_transaction.py @@ -1,8 +1,8 @@ -from datetime import datetime from decimal import Decimal as D from unittest import mock from django.test import TestCase +from django.utils import timezone from capone.exceptions import ExistingLedgerEntriesException from capone.exceptions import NoLedgerEntriesException @@ -153,7 +153,7 @@ def test_using_ledgers_for_reconciliation(self): ) def test_setting_posted_timestamp(self): - POSTED_DATETIME = datetime(2016, 2, 7, 11, 59) + POSTED_DATETIME = timezone.now() order = OrderFactory(amount=self.AMOUNT) txn_recognize = create_transaction( diff --git a/capone/tests/test_factories.py b/capone/tests/test_factories.py index 47e7362..a73bcd3 100644 --- a/capone/tests/test_factories.py +++ b/capone/tests/test_factories.py @@ -1,7 +1,7 @@ -from datetime import datetime from decimal import Decimal from django.test import TestCase +from django.utils import timezone from capone.api.actions import credit from capone.api.actions import debit @@ -74,7 +74,7 @@ def test_custom_fields(self): """ Test setting fields `posted_timestamp`, `notes`, `type`, and `user`. """ - time = datetime.now() + time = timezone.now() FIELDS_TO_VALUES = [ ('posted_timestamp', time), ('notes', 'booga'), diff --git a/capone/tests/test_transaction_model.py b/capone/tests/test_transaction_model.py index 3d41ba7..e3df56b 100644 --- a/capone/tests/test_transaction_model.py +++ b/capone/tests/test_transaction_model.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -from datetime import datetime from decimal import Decimal from django.test import TestCase +from django.utils import timezone from capone.api.actions import create_transaction from capone.api.actions import credit @@ -27,7 +27,7 @@ class TransactionBase(TestCase): def setUp(self): self.user1 = UserFactory() self.user2 = UserFactory() - self.posted_timestamp = datetime.now() + self.posted_timestamp = timezone.now() class TestStrMethods(TestCase): @@ -102,7 +102,7 @@ class TestSettingExplicitTimestampField(TransactionBase): def test_setting_explicit_timestamp_field(self): transaction = TransactionFactory() old_posted_timestamp = transaction.posted_timestamp - transaction.posted_timestamp = datetime.now() + transaction.posted_timestamp = timezone.now() transaction.save() self.assertNotEqual( old_posted_timestamp, diff --git a/capone/tests/test_void.py b/capone/tests/test_void.py index 60d3802..e27e194 100644 --- a/capone/tests/test_void.py +++ b/capone/tests/test_void.py @@ -1,7 +1,7 @@ -from datetime import datetime from decimal import Decimal as D from django.test import TestCase +from django.utils import timezone from capone.api.actions import create_transaction from capone.api.actions import credit @@ -182,7 +182,7 @@ def test_given_timestamp(self): LedgerEntry(amount=credit(amount), ledger=self.rev_ledger), ]) - now = datetime.now() + now = timezone.now() void_txn = void_transaction( charge_txn, self.creation_user, posted_timestamp=now)