Prevent some race conditions

src/tests/base/test_orders.py

@@ -19,7 +19,7 @@ from pretix.base.reldate import RelativeDate, RelativeDateWrapper
 from pretix.base.services.invoices import generate_invoice
 from pretix.base.services.orders import (
     OrderChangeManager, OrderError, _create_order, approve_order, deny_order,
-    expire_orders, send_download_reminders,
+    expire_orders, send_download_reminders, send_expiry_warnings,
 )
 
 
@@ -289,6 +289,54 @@ def test_deny(event):
     assert 'denied' in djmail.outbox[0].subject
 
 
+class PaymentReminderTests(TestCase):
+    def setUp(self):
+        super().setUp()
+        o = Organizer.objects.create(name='Dummy', slug='dummy')
+        self.event = Event.objects.create(
+            organizer=o, name='Dummy', slug='dummy',
+            date_from=now() + timedelta(days=2),
+            plugins='pretix.plugins.banktransfer'
+        )
+        self.order = Order.objects.create(
+            code='FOO', event=self.event, email='dummy@dummy.test',
+            status=Order.STATUS_PENDING, locale='en',
+            datetime=now(),
+            expires=now() + timedelta(days=10),
+            total=Decimal('46.00'),
+        )
+        self.ticket = Item.objects.create(event=self.event, name='Early-bird ticket',
+                                          default_price=Decimal('23.00'), admission=True)
+        self.op1 = OrderPosition.objects.create(
+            order=self.order, item=self.ticket, variation=None,
+            price=Decimal("23.00"), attendee_name="Peter", positionid=1
+        )
+        djmail.outbox = []
+
+    def test_disabled(self):
+        send_expiry_warnings(sender=self.event)
+        assert len(djmail.outbox) == 0
+
+    def test_sent_once(self):
+        self.event.settings.mail_days_order_expire_warning = 12
+        send_expiry_warnings(sender=self.event)
+        assert len(djmail.outbox) == 1
+
+    def test_paid(self):
+        self.order.status = Order.STATUS_PAID
+        self.order.save()
+        send_expiry_warnings(sender=self.event)
+        assert len(djmail.outbox) == 0
+
+    def test_sent_days(self):
+        self.event.settings.mail_days_order_expire_warning = 9
+        send_expiry_warnings(sender=self.event)
+        assert len(djmail.outbox) == 0
+        self.event.settings.mail_days_order_expire_warning = 10
+        send_expiry_warnings(sender=self.event)
+        assert len(djmail.outbox) == 1
+
+
 class DownloadReminderTests(TestCase):
     def setUp(self):
         super().setUp()

src/tests/plugins/banktransfer/test_import.py

@@ -248,6 +248,20 @@ def test_mark_paid_organizer(env, orga_job):
     assert env[2].status == Order.STATUS_PAID
 
 
+@pytest.mark.django_db
+def test_mark_paid_organizer_dash_in_slug(env, orga_job):
+    env[0].slug = "foo-bar"
+    env[0].save()
+    process_banktransfers(orga_job, [{
+        'payer': 'Karla Kundin',
+        'reference': 'Bestellung FOO-BAR-1234S',
+        'date': '2016-01-26',
+        'amount': '23.00'
+    }])
+    env[2].refresh_from_db()
+    assert env[2].status == Order.STATUS_PAID
+
+
 @pytest.mark.django_db
 def test_mark_paid_organizer_weird_slug(env, orga_job):
     env[0].slug = 'du.m-y'