CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-04 15:04:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/flaviabastos/187_unify_canceled_spelling'

Browse Source
This commit is contained in:
Raphael Michel
2016-09-21 18:57:35 +02:00
parent 1faf33d61f 8ef6439c44
commit 84fd7cb166
26 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/tests/plugins/banktransfer/test_actions.py
View File

@@ -27,7 +27,7 @@ def env():
)
o2 = Order.objects.create(
code='6789Z', event=event,
status=Order.STATUS_CANCELLED,
status=Order.STATUS_CANCELED,
datetime=now(), expires=now() + timedelta(days=10),
total=23, payment_provider='banktransfer'
)
@@ -151,7 +151,7 @@ def test_retry_canceled(env, client):
trans.refresh_from_db()
assert trans.state == BankTransaction.STATE_ERROR
env[3].refresh_from_db()
assert env[3].status == Order.STATUS_CANCELLED
assert env[3].status == Order.STATUS_CANCELED
@pytest.mark.django_db

8
src/tests/plugins/banktransfer/test_import.py
View File

@@ -30,13 +30,13 @@ def env():
)
o2 = Order.objects.create(
code='6789Z', event=event,
status=Order.STATUS_CANCELLED,
status=Order.STATUS_CANCELED,
datetime=now(), expires=now() + timedelta(days=10),
total=23, payment_provider='banktransfer'
)
Order.objects.create(
code='GS89Z', event=event,
status=Order.STATUS_CANCELLED,
status=Order.STATUS_CANCELED,
datetime=now(), expires=now() + timedelta(days=10),
total=23, payment_provider='banktransfer'
)
@@ -113,7 +113,7 @@ def test_check_amount(env, job):
@pytest.mark.django_db
def test_ignore_cancelled(env, job):
def test_ignore_canceled(env, job):
process_banktransfers(env[0].pk, job, [{
'payer': 'Karla Kundin',
'reference': 'Bestellung DUMMY6789Z',
@@ -121,7 +121,7 @@ def test_ignore_cancelled(env, job):
'amount': '23.00'
}])
env[3].refresh_from_db()
assert env[3].status == Order.STATUS_CANCELLED
assert env[3].status == Order.STATUS_CANCELED
@pytest.mark.django_db