From cc2cb5c4d11a8be8d945a7f59d5f6089f50a0966 Mon Sep 17 00:00:00 2001 From: FreneticScribbler Date: Wed, 26 Jan 2022 19:49:18 +0000 Subject: [PATCH] Fix tests --- conftest.py | 3 ++- training/tests/test_unit.py | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/conftest.py b/conftest.py index ac203464..d887561e 100644 --- a/conftest.py +++ b/conftest.py @@ -27,8 +27,9 @@ def admin_user(admin_user): admin_user.first_name = "Event" admin_user.last_name = "Test" admin_user.initials = "ETU" + admin_user.is_approved = True admin_user.save() - return admin_user + yield admin_user @pytest.fixture diff --git a/training/tests/test_unit.py b/training/tests/test_unit.py index 02666330..29e2c1fc 100644 --- a/training/tests/test_unit.py +++ b/training/tests/test_unit.py @@ -10,13 +10,13 @@ from training import models from reversion.models import Version, Revision -def test_add_qualification(admin_client, trainee, admin_user): +def test_add_qualification(admin_client, trainee, admin_user, training_item): url = reverse('add_qualification', kwargs={'pk': trainee.pk}) date = (timezone.now() + datetime.timedelta(days=3)).strftime("%Y-%m-%d") - response = admin_client.post(url, {'date': date, 'trainee': trainee.pk, 'supervisor': trainee.pk}) + response = admin_client.post(url, {'date': date, 'trainee': trainee.pk, 'supervisor': trainee.pk, 'item': training_item.pk}) assertFormError(response, 'form', 'date', 'Qualification date may not be in the future') assertFormError(response, 'form', 'supervisor', 'One may not supervise oneself...') - response = admin_client.post(url, {'date': date, 'trainee': trainee.pk, 'supervisor': admin_user.pk}) + response = admin_client.post(url, {'date': date, 'trainee': trainee.pk, 'supervisor': admin_user.pk, 'item': training_item.pk}) assertFormError(response, 'form', 'supervisor', 'Selected supervisor must actually *be* a supervisor...') @@ -45,6 +45,7 @@ def test_add_requirement(admin_client, level): def test_trainee_detail(admin_client, trainee, admin_user): url = reverse('trainee_detail', kwargs={'pk': admin_user.pk}) response = admin_client.get(url) + assert response.status_code == 200 assertContains(response, "Your Training Record") assertContains(response, "No qualifications in any levels")