mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-10-05 12:05:38 +00:00
AJ
08171767a0
* Port to Django 5.2 * Pin pluggy to 1.2.0 Any newer and the mystery importlib metadata error appears. Weird! >_> * Update for premailer changed default * Update view logic for is_ajax being changed to a template context processor * Port a few more tests to pytest proper Having two distinct test flavours is giving me a headache * Version 1 dockerfile Makes a VERY big image, I suspect we can optimise this a lot... * Optimise dockerfile a little lot a bit * fix(users): change logout link to POST request * fix(tests): fix some syntax errors in test code still got lots of failed tests :( * fix: replace deprecated Django APIs * ci: update Dockerfile * ci: update Dockerfile * fix(dependencies+tests): update EoL/vulnerable dependencies and improve test stability * Upgrade Python from 3.10 to 3.12 * Update frontend dependencies, replace node-sass with sass * chore(logging): ignore dangling obj reference warning from pypdf * ci: update compose.yml for prod deployment - Add Nginx as a reverse proxy - Add cert-selfsign.sh for generating self-signed certificates - Add certbot-issue.sh for Let's Encrypt certificate issuance and renewal - Add cron-install.sh and cron-uninstall.sh for system cron management - Add .env.example as an environment variable template * style: reformat code * ci: add more sleep trying to pass tests * ci: ignore browser-based tests during ci testing * fix: create home for the new user during Dockerfile building * chore: remove heroku conf file * fix: RIGS not franken anymore * fix: restore is_ajax as a boolean and split out the context processor * test: remove Selenium interaction tests and their CI workarounds * fix: harden production settings (CSRF origins, env casts, ADMINS) and drop dead debug toolbar code * deploy: serve static files from nginx, pin PGDATA, and make cert scripts loud on failure * build: switch .dockerignore to an allowlist * build: drop unused dependencies, soft-pin the rest and target Python 3.14 * build: move image to Python 3.14 / Node 24 and force DEBUG off * ci: add dependabot config for uv, npm, docker and actions * build: narrow Sass deprecation silencing to @import and require Node 24 * build: provide placeholder env for collectstatic now that DEBUG is off in the image * deploy: add plain-HTTP nginx config for local development and use it in compose * deploy: remove self-signed cert script * build: make the image multi-arch with official node and python base images * ci: lint and test on PRs, build the image on PRs and push it to GHCR on master * docs: add local running and sample data instructions * fix: report a form error instead of crashing when big power has no Power MIC * fix: upgrade pypdf and urllib3 to patched releases * fix: apply non-breaking npm audit fixes * fix: strip whitespace in ALLOWED_HOSTS and drop misleading HSTS preload * deploy: add a pyrigs healthcheck and make nginx wait for it * build: pin the uv image version * fix: correct the check-in person picker condition and use BeautifulSoup's string argument * refactor: replace unique_together with UniqueConstraint * build: replace pycodestyle with ruff and fix what it found Removes unused imports and variables, and fixes a few real problems it surfaced: - EventCheckIn.active() referenced an undefined name and raised NameError; it now returns whether the check-in has no end time - RIGS.admin defined EventChecklistAdmin twice; the second is now PowerTestRecordAdmin - RIGS/tests/conftest.py used date/timedelta without importing them - the signal-registering imports in apps.py are kept with noqa pycodestyle config in setup.cfg is dropped. * style: format the codebase with ruff * style: normalise line endings, trailing whitespace and end-of-file newlines * ci: run ruff and file hygiene through prek, and document it --------- Co-authored-by: Hang <me@hangxu.me> Co-authored-by: Joe Banks <joe@jb3.dev>
98 lines
3.8 KiB
Python
98 lines
3.8 KiB
Python
import datetime
|
|
|
|
from django.utils import timezone
|
|
from django.urls import reverse
|
|
|
|
from pytest_django.asserts import assertFormError, assertContains, assertNotContains
|
|
|
|
from training import models
|
|
from reversion.models import Version, Revision
|
|
|
|
|
|
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, "item": training_item.pk}
|
|
)
|
|
assertFormError(response.context["form"], "date", "Qualification date may not be in the future")
|
|
assertFormError(response.context["form"], "supervisor", "One may not supervise oneself...")
|
|
response = admin_client.post(
|
|
url, {"date": date, "trainee": admin_user.pk, "supervisor": trainee.pk, "item": training_item.pk}
|
|
)
|
|
print(response.content)
|
|
assertFormError(response.context["form"], "supervisor", "Selected supervisor must actually *be* a supervisor...")
|
|
|
|
|
|
def test_add_qualification_reversion(admin_client, trainee, training_item, supervisor):
|
|
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,
|
|
"supervisor": supervisor.pk,
|
|
"trainee": trainee.pk,
|
|
"item": training_item.pk,
|
|
"depth": 0,
|
|
"notes": "",
|
|
},
|
|
)
|
|
print(response.content)
|
|
assert response.status_code == 302
|
|
qual = models.TrainingItemQualification.objects.last()
|
|
assert qual is not None
|
|
assert training_item.pk == qual.item_id
|
|
# Ensure only one revision has been created
|
|
assert Revision.objects.count() == 1
|
|
response = admin_client.post(
|
|
url, {"date": date, "supervisor": supervisor.pk, "trainee": trainee.pk, "item": training_item.pk, "depth": 1}
|
|
)
|
|
assert Revision.objects.count() == 2
|
|
assert Version.objects.count() == 4 # Two item qualifications and the trainee twice
|
|
|
|
|
|
def test_add_requirement(admin_client, level):
|
|
url = reverse("add_requirement", kwargs={"pk": level.pk})
|
|
response = admin_client.post(url)
|
|
assertContains(response, level.pk)
|
|
|
|
|
|
def get_response(admin_client, url, kwargs={}):
|
|
url = reverse(url, kwargs=kwargs)
|
|
response = admin_client.get(url)
|
|
assert response.status_code == 200
|
|
return response
|
|
|
|
|
|
def test_trainee_detail(admin_client, trainee, admin_user):
|
|
response = get_response(admin_client, "trainee_detail", {"pk": admin_user.pk})
|
|
assertContains(response, "Your Training Record")
|
|
assertContains(response, "No qualifications in any levels")
|
|
|
|
response = get_response(admin_client, "trainee_detail", {"pk": trainee.pk})
|
|
assertNotContains(response, "Your")
|
|
assertContains(response, f"{trainee.get_full_name()}'s Training Record")
|
|
|
|
|
|
def test_trainee_item_detail(admin_client, trainee):
|
|
response = get_response(admin_client, "trainee_item_detail", {"pk": trainee.pk})
|
|
assertContains(response, "Nothing found")
|
|
|
|
|
|
def test_item_list(admin_client, training_item):
|
|
response = get_response(admin_client, "item_list")
|
|
assertContains(response, str(training_item.category))
|
|
|
|
|
|
def test_trainee_list_search(admin_client, admin_user, trainee, supervisor):
|
|
response = get_response(admin_client, "trainee_list")
|
|
assertContains(response, admin_user.get_full_name())
|
|
assertContains(response, trainee.get_full_name())
|
|
assertContains(response, supervisor.get_full_name())
|
|
|
|
url = reverse("trainee_list")
|
|
response = admin_client.get(url, {"q": trainee.get_full_name()})
|
|
assertContains(response, trainee.get_full_name())
|
|
assertNotContains(response, supervisor.get_full_name())
|