Fix tests after rebase

This commit is contained in:
Raphael Michel
2019-06-17 10:08:42 +02:00
parent a68b225529
commit b41139a143
+30 -24
View File
@@ -2641,12 +2641,13 @@ def test_order_delete_test_mode(token_client, organizer, event, order):
def test_order_delete_test_mode_voucher(token_client, organizer, event, order, item):
order.testmode = True
order.save()
q = event.quotas.create(name="Quota")
q.items.add(item)
voucher = event.vouchers.create(price_mode="set", value=15, quota=q, redeemed=1)
op = order.positions.first()
op.voucher = voucher
op.save()
with scopes_disabled():
q = event.quotas.create(name="Quota")
q.items.add(item)
voucher = event.vouchers.create(price_mode="set", value=15, quota=q, redeemed=1)
op = order.positions.first()
op.voucher = voucher
op.save()
assert voucher.redeemed == 1
@@ -2656,7 +2657,8 @@ def test_order_delete_test_mode_voucher(token_client, organizer, event, order, i
)
)
assert resp.status_code == 204
assert not Order.objects.filter(code=order.code).exists()
with scopes_disabled():
assert not Order.objects.filter(code=order.code).exists()
voucher.refresh_from_db()
assert voucher.redeemed == 0
@@ -2665,12 +2667,13 @@ def test_order_delete_test_mode_voucher(token_client, organizer, event, order, i
def test_order_delete_test_mode_voucher_cancelled_position(token_client, organizer, event, order, item):
order.testmode = True
order.save()
q = event.quotas.create(name="Quota")
q.items.add(item)
voucher = event.vouchers.create(price_mode="set", value=15, quota=q, redeemed=42)
op = order.all_positions.last()
op.voucher = voucher
op.save()
with scopes_disabled():
q = event.quotas.create(name="Quota")
q.items.add(item)
voucher = event.vouchers.create(price_mode="set", value=15, quota=q, redeemed=42)
op = order.all_positions.last()
op.voucher = voucher
op.save()
resp = token_client.delete(
'/api/v1/organizers/{}/events/{}/orders/{}/'.format(
@@ -2678,22 +2681,24 @@ def test_order_delete_test_mode_voucher_cancelled_position(token_client, organiz
)
)
assert resp.status_code == 204
assert not Order.objects.filter(code=order.code).exists()
with scopes_disabled():
assert not Order.objects.filter(code=order.code).exists()
voucher.refresh_from_db()
assert voucher.redeemed == 42
@pytest.mark.django_db
def test_order_delete_test_mode_voucher_cancelled_order(token_client, organizer, event, order, item):
order.testmode = True
order.status = Order.STATUS_CANCELED
order.save()
q = event.quotas.create(name="Quota")
q.items.add(item)
voucher = event.vouchers.create(price_mode="set", value=15, quota=q, redeemed=42)
op = order.positions.first()
op.voucher = voucher
op.save()
with scopes_disabled():
order.testmode = True
order.status = Order.STATUS_CANCELED
order.save()
q = event.quotas.create(name="Quota")
q.items.add(item)
voucher = event.vouchers.create(price_mode="set", value=15, quota=q, redeemed=42)
op = order.positions.first()
op.voucher = voucher
op.save()
resp = token_client.delete(
'/api/v1/organizers/{}/events/{}/orders/{}/'.format(
@@ -2701,7 +2706,8 @@ def test_order_delete_test_mode_voucher_cancelled_order(token_client, organizer,
)
)
assert resp.status_code == 204
assert not Order.objects.filter(code=order.code).exists()
with scopes_disabled():
assert not Order.objects.filter(code=order.code).exists()
voucher.refresh_from_db()
assert voucher.redeemed == 42