diff --git a/training/templates/level_list.html b/training/templates/level_list.html index e316aed9..a6d7c6f9 100644 --- a/training/templates/level_list.html +++ b/training/templates/level_list.html @@ -1,7 +1,6 @@ {% extends 'base_training.html' %} {% load markdown_tags %} -{% load get_supervisor from tags %} {% block content %} {% if request.user.is_staff %} diff --git a/training/templatetags/tags.py b/training/templatetags/tags.py index 88447be8..0a5cce5a 100644 --- a/training/templatetags/tags.py +++ b/training/templatetags/tags.py @@ -33,11 +33,6 @@ def colour_from_depth(depth): return models.TrainingItemQualification.get_colour_from_depth(depth) -@register.filter -def get_supervisor(tech): - return models.TrainingLevel.objects.get(department=tech.department, level=models.TrainingLevel.SUPERVISOR) - - @register.filter def get_levels_of_depth(trainee, level): return trainee.level_qualifications.all().exclude(confirmed_on=None).exclude(level__department=models.TrainingLevel.HAULAGE).select_related('level').filter(level__level=level) diff --git a/training/tests/conftest.py b/training/tests/conftest.py index 1baf08c0..fd13cfad 100644 --- a/training/tests/conftest.py +++ b/training/tests/conftest.py @@ -2,10 +2,18 @@ import pytest from training import models from RIGS.models import Profile + @pytest.fixture def trainee(db): trainee = Profile.objects.create(username="trainee", first_name="Train", last_name="EE", - initials="TRN", - email="trainee@example.com", is_active=True, is_approved=True) + initials="TRN", + email="trainee@example.com", is_active=True, is_approved=True) yield trainee trainee.delete() + + +@pytest.fixture +def level(db): + level = models.TrainingLevel.objects.create(description="There is no description.", level=models.TrainingLevel.TECHNICIAN) + yield level + level.delete() diff --git a/training/tests/test_unit.py b/training/tests/test_unit.py index 25d02e19..06b8b531 100644 --- a/training/tests/test_unit.py +++ b/training/tests/test_unit.py @@ -12,8 +12,14 @@ from training import models def test_add_qualification(admin_client, trainee, admin_user): 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}) 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}) assertFormError(response, 'form', 'supervisor', 'Selected supervisor must actually *be* a supervisor...') + + +def test_add_requirement(admin_client, level): + url = reverse('add_requirement', kwargs={'pk': level.pk}) + response = admin_client.post(url) + assertContains(response, level.pk)