Refs #82 -- Make order expiry more clear (#116)

src/tests/base/test_orders.py

@@ -3,9 +3,9 @@ from datetime import timedelta
 import pytest
 from django.utils.timezone import now
 
-from pretix.base.models import Event, Organizer
+from pretix.base.models import Event, Order, Organizer
 from pretix.base.payment import FreeOrderProvider
-from pretix.base.services.orders import _create_order
+from pretix.base.services.orders import _create_order, expire_orders
 
 
 @pytest.fixture
@@ -42,3 +42,46 @@ def test_expiry_last(event):
                           dt=today, payment_provider=FreeOrderProvider(event),
                           locale='de')
     assert (order.expires - today).days == 5
+
+
+@pytest.mark.django_db
+def test_expiring(event):
+    o1 = Order.objects.create(
+        code='FOO', event=event, email='dummy@dummy.test',
+        status=Order.STATUS_PENDING,
+        datetime=now(), expires=now() + timedelta(days=10),
+        total=0, payment_provider='banktransfer'
+    )
+    o2 = Order.objects.create(
+        code='FO2', event=event, email='dummy@dummy.test',
+        status=Order.STATUS_PENDING,
+        datetime=now(), expires=now() - timedelta(days=10),
+        total=0, payment_provider='banktransfer'
+    )
+    expire_orders(None)
+    o1 = Order.objects.get(id=o1.id)
+    assert o1.status == Order.STATUS_PENDING
+    o2 = Order.objects.get(id=o2.id)
+    assert o2.status == Order.STATUS_EXPIRED
+
+
+@pytest.mark.django_db
+def test_expiring_auto_disabled(event):
+    event.settings.set('payment_term_expire_automatically', False)
+    o1 = Order.objects.create(
+        code='FOO', event=event, email='dummy@dummy.test',
+        status=Order.STATUS_PENDING,
+        datetime=now(), expires=now() + timedelta(days=10),
+        total=0, payment_provider='banktransfer'
+    )
+    o2 = Order.objects.create(
+        code='FO2', event=event, email='dummy@dummy.test',
+        status=Order.STATUS_PENDING,
+        datetime=now(), expires=now() - timedelta(days=10),
+        total=0, payment_provider='banktransfer'
+    )
+    expire_orders(None)
+    o1 = Order.objects.get(id=o1.id)
+    assert o1.status == Order.STATUS_PENDING
+    o2 = Order.objects.get(id=o2.id)
+    assert o2.status == Order.STATUS_PENDING