summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorVilliers Strauss <villiers.strauss@logimeter.com>2015-05-22 15:54:31 +0200
committerTim Graham <timograham@gmail.com>2015-05-25 12:07:25 -0400
commit4311fd2c0a5611c3103ffbae41973fd1552657a2 (patch)
tree1ed0635112bc8147f18e81194cf1416a5cdafe50 /tests
parent1f33bf78fd198f4d67fe13743337d0f2b245af99 (diff)
[1.8.x] Fixed #24841 -- Made BaseRangeField.prepare_value() call base_field's prepare_value()
Backport of 614bec41b5306b32b8de20d66f047ff8d6f35256 from master
Diffstat (limited to 'tests')
-rw-r--r--tests/postgres_tests/test_ranges.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/tests/postgres_tests/test_ranges.py b/tests/postgres_tests/test_ranges.py
index 32994c6952..8f7e775d21 100644
--- a/tests/postgres_tests/test_ranges.py
+++ b/tests/postgres_tests/test_ranges.py
@@ -11,7 +11,7 @@ from django.contrib.postgres.validators import (
)
from django.core import exceptions, serializers
from django.db import connection
-from django.test import TestCase
+from django.test import TestCase, override_settings
from django.utils import timezone
from .models import RangesModel
@@ -467,6 +467,14 @@ class TestFormField(TestCase):
value = field.clean(['2013-04-09 11:45', ''])
self.assertEqual(value, DateTimeTZRange(datetime.datetime(2013, 4, 9, 11, 45), None))
+ @override_settings(USE_TZ=True, TIME_ZONE='Africa/Johannesburg')
+ def test_datetime_prepare_value(self):
+ field = pg_forms.DateTimeRangeField()
+ value = field.prepare_value(
+ DateTimeTZRange(datetime.datetime(2015, 5, 22, 16, 6, 33, tzinfo=timezone.utc), None)
+ )
+ self.assertEqual(value, [datetime.datetime(2015, 5, 22, 18, 6, 33), None])
+
def test_model_field_formfield_integer(self):
model_field = pg_fields.IntegerRangeField()
form_field = model_field.formfield()