From b41139a14321ccc529e2ad9bd0f2bdd873eb7b7e Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Mon, 17 Jun 2019 10:08:42 +0200 Subject: [PATCH] Fix tests after rebase --- src/tests/api/test_orders.py | 54 ++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/src/tests/api/test_orders.py b/src/tests/api/test_orders.py index 1865be74a..c81834cda 100644 --- a/src/tests/api/test_orders.py +++ b/src/tests/api/test_orders.py @@ -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