misc: simplify lingo manager tests

tests/test_lingo_manager.py

@@ -27,6 +27,11 @@ def payment_backend():
     return PaymentBackend.objects.create(label='test1', slug='test1', service='dummy', service_options={})
 
 
+@pytest.fixture
+def regie(payment_backend):
+    return Regie.objects.create(label='Test', slug='test', payment_backend=payment_backend)
+
+
 def login(app, username='admin', password='admin'):
     login_page = app.get('/login/')
     login_form = login_page.forms[0]
@@ -44,7 +49,6 @@ def test_access(app, admin_user):
 
 
 def test_add_regie(app, admin_user, payment_backend):
-    Regie.objects.all().delete()
     app = login(app)
     resp = app.get('/manage/lingo/regies/', status=200)
     resp = resp.click('New')
@@ -61,8 +65,7 @@ def test_add_regie(app, admin_user, payment_backend):
     assert regie.is_default is True
 
 
-def test_edit_regie(app, admin_user, payment_backend):
-    test_add_regie(app, admin_user, payment_backend)
+def test_edit_regie(app, admin_user, regie):
     app = login(app)
     resp = app.get('/manage/lingo/regies/', status=200)
     resp = resp.click('Test')
@@ -71,10 +74,9 @@ def test_edit_regie(app, admin_user, payment_backend):
     # callback URL is shown
     assert (
         '<p><label>Callback URL:</label> http://testserver/lingo/callback-payment-backend/%s/</p>'
-        % payment_backend.slug
+        % regie.payment_backend.slug
         in resp
     )
-    regie = Regie.objects.all()[0]
     assert '<p><label>Return URL:</label> http://testserver/lingo/return/%s/</p>' % regie.pk in resp
 
     resp.forms[0]['description'] = 'other description'
@@ -142,8 +144,7 @@ def test_edit_regie_dynamic_backend_fields(app, admin_user):
     assert regie.transaction_options == {}
 
 
-def test_delete_regie(app, admin_user, payment_backend):
-    test_add_regie(app, admin_user, payment_backend)
+def test_delete_regie(app, admin_user, regie):
     app = login(app)
     resp = app.get('/manage/lingo/regies/', status=200)
     resp = resp.click('remove')
@@ -152,10 +153,7 @@ def test_delete_regie(app, admin_user, payment_backend):
     assert Regie.objects.count() == 0
 
 
-def test_add_second_regie(app, admin_user, payment_backend):
-    test_add_regie(app, admin_user, payment_backend)
-    regie = Regie.objects.all()[0]
-
+def test_add_second_regie(app, admin_user, payment_backend, regie):
     app = login(app)
     resp = app.get('/manage/lingo/regies/', status=200)
     resp = resp.click('New')
@@ -171,9 +169,7 @@ def test_add_second_regie(app, admin_user, payment_backend):
     assert Regie.objects.exclude(id=regie.id)[0].is_default is False
 
 
-def test_download_transaction(app, admin_user, payment_backend):
-    test_add_regie(app, admin_user, payment_backend)
-    regie = Regie.objects.filter(slug='test')[0]
+def test_download_transaction(app, admin_user, regie):
     user = User.objects.create_user('dimebag', 'dime@bag.pan', 'pwd')
     user.last_name = 'Darëll'
     user.first_name = 'Dimebag'
@@ -562,7 +558,7 @@ def test_configure_invoices_cell(app, admin_user, payment_backend):
 
     resp = app.get('/manage/pages/%s/' % page.id, status=200)
     assert 'lingorecenttransactionscell' in resp.text  # because there's a regie
-    assert not 'lingo_activeitems' in resp.text  # because there's no webservice
+    assert 'lingo_activeitems' not in resp.text  # because there's no webservice
 
     regie.webservice_url = 'http://example.net/'
     regie.save()
@@ -651,8 +647,8 @@ def test_edit_payment_backend(app, admin_user):
     assert 'disabled' in resp.form['service'].attrs
 
     # deprecated parameters are not shown
-    assert not 'next_url' in resp.form.fields
-    assert not 'direct_notification_url' in resp.form.fields
+    assert 'next_url' not in resp.form.fields
+    assert 'direct_notification_url' not in resp.form.fields
 
     resp.form['label'] = 'label1-modified'
     resp.form['consider_all_response_signed'] = True