diff --git a/training/forms.py b/training/forms.py index 9f4dbbf6..88db22ef 100644 --- a/training/forms.py +++ b/training/forms.py @@ -3,6 +3,7 @@ from django import forms from training import models from RIGS.models import Profile + class QualificationForm(forms.ModelForm): class Meta: model = models.TrainingItemQualification diff --git a/training/tests/conftest.py b/training/tests/conftest.py index fde8e601..32036967 100644 --- a/training/tests/conftest.py +++ b/training/tests/conftest.py @@ -15,8 +15,8 @@ def trainee(db): @pytest.fixture def supervisor(db): supervisor = Profile.objects.create(username="supervisor", first_name="Super", last_name="Visor", - initials="SV", - email="supervisor@example.com", is_supervisor=True, is_active=True, is_approved=True) + initials="SV", + email="supervisor@example.com", is_supervisor=True, is_active=True, is_approved=True) yield supervisor supervisor.delete() @@ -29,6 +29,7 @@ def training_item(db): training_category.delete() training_item.delete() + @pytest.fixture def level(db): level = models.TrainingLevel.objects.create(description="There is no description.", level=models.TrainingLevel.TECHNICIAN) diff --git a/training/tests/test_interaction.py b/training/tests/test_interaction.py index c734785d..8343122d 100644 --- a/training/tests/test_interaction.py +++ b/training/tests/test_interaction.py @@ -12,7 +12,6 @@ from training import models from training.tests import pages - def test_add_qualification(logged_in_browser, live_server, trainee, supervisor, training_item): page = pages.AddQualification(logged_in_browser.driver, live_server.url, pk=trainee.pk).open() # assert page.name in str(trainee) @@ -21,12 +20,12 @@ def test_add_qualification(logged_in_browser, live_server, trainee, supervisor, page.date = date = datetime.date(1984, 1, 1) page.notes = "A note" - time.sleep(2) # Slow down for javascript + time.sleep(2) # Slow down for javascript page.item_selector.toggle() assert page.item_selector.is_open page.item_selector.search(training_item.name) - time.sleep(2) # Slow down for javascript + time.sleep(2) # Slow down for javascript page.item_selector.set_option(training_item.name, True) assert page.item_selector.options[0].selected page.item_selector.toggle() @@ -34,7 +33,7 @@ def test_add_qualification(logged_in_browser, live_server, trainee, supervisor, page.supervisor_selector.toggle() assert page.supervisor_selector.is_open page.supervisor_selector.search(supervisor.name[:-6]) - time.sleep(2) # Slow down for javascript + time.sleep(2) # Slow down for javascript assert page.supervisor_selector.options[0].selected page.supervisor_selector.toggle()