forked from CGM_Public/pretix_original
Bump Django to 4.1.* (#2989)
This commit is contained in:
@@ -20,13 +20,13 @@
|
||||
# <https://www.gnu.org/licenses/>.
|
||||
#
|
||||
from datetime import datetime
|
||||
from zoneinfo import ZoneInfo
|
||||
|
||||
import pytest
|
||||
import pytz
|
||||
from django_scopes import scopes_disabled
|
||||
from freezegun import freeze_time
|
||||
|
||||
tz = pytz.timezone("Asia/Tokyo")
|
||||
tz = ZoneInfo("Asia/Tokyo")
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
@@ -40,22 +40,22 @@ def test_choose_between_events(device_client, device):
|
||||
with scopes_disabled():
|
||||
e1 = device.organizer.events.create(
|
||||
name="Event", slug="e1", live=True,
|
||||
date_from=tz.localize(datetime(2020, 1, 10, 14, 0)),
|
||||
date_to=tz.localize(datetime(2020, 1, 10, 15, 0)),
|
||||
date_from=datetime(2020, 1, 10, 14, 0, tzinfo=tz),
|
||||
date_to=datetime(2020, 1, 10, 15, 0, tzinfo=tz),
|
||||
)
|
||||
cl1 = e1.checkin_lists.create(name="Same name")
|
||||
e2 = device.organizer.events.create(
|
||||
name="Event", slug="e2", live=True,
|
||||
date_from=tz.localize(datetime(2020, 1, 10, 16, 0)),
|
||||
date_to=tz.localize(datetime(2020, 1, 10, 17, 0)),
|
||||
date_from=datetime(2020, 1, 10, 16, 0, tzinfo=tz),
|
||||
date_to=datetime(2020, 1, 10, 17, 0, tzinfo=tz),
|
||||
)
|
||||
e2.checkin_lists.create(name="Other name")
|
||||
cl2 = e2.checkin_lists.create(name="Same name")
|
||||
e2.checkin_lists.create(name="Yet another name")
|
||||
tomorrow = device.organizer.events.create(
|
||||
name="Event", slug="tomorrow", live=True,
|
||||
date_from=tz.localize(datetime(2020, 1, 11, 15, 0)),
|
||||
date_to=tz.localize(datetime(2020, 1, 11, 16, 0)),
|
||||
date_from=datetime(2020, 1, 11, 15, 0, tzinfo=tz),
|
||||
date_to=datetime(2020, 1, 11, 16, 0, tzinfo=tz),
|
||||
)
|
||||
cl3 = tomorrow.checkin_lists.create(name="Just any name")
|
||||
for e in device.organizer.events.all():
|
||||
@@ -117,7 +117,7 @@ def test_choose_between_events(device_client, device):
|
||||
assert resp.data['event']['slug'] == 'e2'
|
||||
|
||||
# check for overlapping events
|
||||
e2.date_admission = tz.localize(datetime(2020, 1, 10, 14, 45))
|
||||
e2.date_admission = datetime(2020, 1, 10, 14, 45, tzinfo=tz)
|
||||
e2.save()
|
||||
with freeze_time("2020-01-10T14:45:00+09:00"):
|
||||
resp = device_client.get('/api/v1/device/eventselection?current_event=e1')
|
||||
@@ -131,28 +131,28 @@ def test_choose_between_subevents(device_client, device):
|
||||
with scopes_disabled():
|
||||
e = device.organizer.events.create(
|
||||
name="Event", slug="e1", live=True,
|
||||
date_from=tz.localize(datetime(2020, 1, 10, 14, 0)),
|
||||
date_from=datetime(2020, 1, 10, 14, 0, tzinfo=tz),
|
||||
has_subevents=True,
|
||||
)
|
||||
e.settings.timezone = "Asia/Tokyo"
|
||||
se1 = e.subevents.create(
|
||||
name="Event", active=True,
|
||||
date_from=tz.localize(datetime(2020, 1, 10, 14, 0)),
|
||||
date_to=tz.localize(datetime(2020, 1, 10, 15, 0)),
|
||||
date_from=datetime(2020, 1, 10, 14, 0, tzinfo=tz),
|
||||
date_to=datetime(2020, 1, 10, 15, 0, tzinfo=tz),
|
||||
)
|
||||
cl1 = e.checkin_lists.create(name="Same name", subevent=se1)
|
||||
se2 = e.subevents.create(
|
||||
name="Event", active=True,
|
||||
date_from=tz.localize(datetime(2020, 1, 10, 16, 0)),
|
||||
date_to=tz.localize(datetime(2020, 1, 10, 17, 0)),
|
||||
date_from=datetime(2020, 1, 10, 16, 0, tzinfo=tz),
|
||||
date_to=datetime(2020, 1, 10, 17, 0, tzinfo=tz),
|
||||
)
|
||||
cl2 = e.checkin_lists.create(name="Same name", subevent=se2)
|
||||
cl3 = e.checkin_lists.create(name="Other name")
|
||||
e.checkin_lists.create(name="Yet another name", subevent=se2)
|
||||
se_tomorrow = e.subevents.create(
|
||||
name="Event", active=True,
|
||||
date_from=tz.localize(datetime(2020, 1, 11, 15, 0)),
|
||||
date_to=tz.localize(datetime(2020, 1, 11, 16, 0)),
|
||||
date_from=datetime(2020, 1, 11, 15, 0, tzinfo=tz),
|
||||
date_to=datetime(2020, 1, 11, 16, 0, tzinfo=tz),
|
||||
)
|
||||
with freeze_time("2020-01-10T14:30:00+09:00"):
|
||||
resp = device_client.get(f'/api/v1/device/eventselection?current_event=e1¤t_subevent={se1.pk}')
|
||||
@@ -217,7 +217,7 @@ def test_choose_between_subevents(device_client, device):
|
||||
assert resp.data['subevent'] == se2.pk
|
||||
|
||||
# check for overlapping events
|
||||
se2.date_admission = tz.localize(datetime(2020, 1, 10, 14, 45))
|
||||
se2.date_admission = datetime(2020, 1, 10, 14, 45, tzinfo=tz)
|
||||
se2.save()
|
||||
with freeze_time("2020-01-10T14:45:00+09:00"):
|
||||
resp = device_client.get(f'/api/v1/device/eventselection?current_event=e1¤t_subevent={se1.pk}')
|
||||
@@ -234,25 +234,25 @@ def test_require_gate(device_client, device):
|
||||
device.save()
|
||||
e = device.organizer.events.create(
|
||||
name="Event", slug="e1", live=True,
|
||||
date_from=tz.localize(datetime(2020, 1, 10, 14, 0)),
|
||||
date_from=datetime(2020, 1, 10, 14, 0, tzinfo=tz),
|
||||
has_subevents=True,
|
||||
)
|
||||
e.settings.timezone = "Asia/Tokyo"
|
||||
se0 = e.subevents.create(
|
||||
name="Event", active=True,
|
||||
date_from=tz.localize(datetime(2020, 1, 10, 9, 0)),
|
||||
date_to=tz.localize(datetime(2020, 1, 10, 10, 0)),
|
||||
date_from=datetime(2020, 1, 10, 9, 0, tzinfo=tz),
|
||||
date_to=datetime(2020, 1, 10, 10, 0, tzinfo=tz),
|
||||
)
|
||||
e.subevents.create(
|
||||
name="Event", active=True,
|
||||
date_from=tz.localize(datetime(2020, 1, 10, 14, 0)),
|
||||
date_to=tz.localize(datetime(2020, 1, 10, 15, 0)),
|
||||
date_from=datetime(2020, 1, 10, 14, 0, tzinfo=tz),
|
||||
date_to=datetime(2020, 1, 10, 15, 0, tzinfo=tz),
|
||||
)
|
||||
cl1 = e.checkin_lists.create(name="Same name", subevent=se0)
|
||||
se2 = e.subevents.create(
|
||||
name="Event", active=True,
|
||||
date_from=tz.localize(datetime(2020, 1, 10, 16, 0)),
|
||||
date_to=tz.localize(datetime(2020, 1, 10, 17, 0)),
|
||||
date_from=datetime(2020, 1, 10, 16, 0, tzinfo=tz),
|
||||
date_to=datetime(2020, 1, 10, 17, 0, tzinfo=tz),
|
||||
)
|
||||
e.checkin_lists.create(name="Same name", subevent=se2)
|
||||
cl3 = e.checkin_lists.create(name="Other name", subevent=se2)
|
||||
|
||||
Reference in New Issue
Block a user