mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-10-10 06:25:41 +00:00
Port to Django 5.2 (#635)
* 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>
This commit is contained in:
GitHub
@@ -9,27 +9,28 @@ from versioning import versioning
|
||||
|
||||
class RIGSVersionTestCase(TestCase):
|
||||
def setUp(self):
|
||||
models.VatRate.objects.create(rate=0.20, comment="TP V1", start_at='2013-01-01')
|
||||
models.VatRate.objects.create(rate=0.20, comment="TP V1", start_at="2013-01-01")
|
||||
|
||||
self.profile = models.Profile.objects.get_or_create(
|
||||
first_name='Test',
|
||||
last_name='TEC User',
|
||||
username='eventauthtest',
|
||||
email='teccie@functional.test',
|
||||
is_superuser=True # lazily grant all permissions
|
||||
first_name="Test",
|
||||
last_name="TEC User",
|
||||
username="eventauthtest",
|
||||
email="teccie@functional.test",
|
||||
is_superuser=True, # lazily grant all permissions
|
||||
)[0]
|
||||
with reversion.create_revision():
|
||||
reversion.set_user(self.profile)
|
||||
self.person = models.Person.objects.create(name='Authorisation Test Person')
|
||||
self.person = models.Person.objects.create(name="Authorisation Test Person")
|
||||
|
||||
with reversion.create_revision():
|
||||
reversion.set_user(self.profile)
|
||||
self.organisation = models.Organisation.objects.create(name='Authorisation Test Organisation')
|
||||
self.organisation = models.Organisation.objects.create(name="Authorisation Test Organisation")
|
||||
|
||||
with reversion.create_revision():
|
||||
reversion.set_user(self.profile)
|
||||
self.event = models.Event.objects.create(name="AuthorisationTestCase", person=self.person,
|
||||
start_date=date.today())
|
||||
self.event = models.Event.objects.create(
|
||||
name="AuthorisationTestCase", person=self.person, start_date=date.today()
|
||||
)
|
||||
|
||||
with reversion.create_revision():
|
||||
reversion.set_user(self.profile)
|
||||
@@ -38,26 +39,27 @@ class RIGSVersionTestCase(TestCase):
|
||||
|
||||
def test_find_parent_version(self):
|
||||
# Find the most recent version
|
||||
current_version = versioning.RIGSVersion.objects.get_for_object(self.event).latest('revision__date_created')
|
||||
current_version = versioning.RIGSVersion.objects.get_for_object(self.event).latest("revision_id")
|
||||
self.assertEqual(current_version._object_version.object.notes, "A new note on the event")
|
||||
|
||||
# Check the prev version is loaded correctly
|
||||
previousVersion = current_version.parent
|
||||
assert previousVersion._object_version.object.notes == ''
|
||||
assert previousVersion._object_version.object.notes == ""
|
||||
|
||||
# Check that finding the parent of the first version fails gracefully
|
||||
self.assertFalse(previousVersion.parent)
|
||||
|
||||
def test_changes_since(self):
|
||||
# Find the most recent version
|
||||
currentVersion = versioning.RIGSVersion.objects.get_for_object(self.event).latest('revision__date_created')
|
||||
currentVersion = versioning.RIGSVersion.objects.get_for_object(self.event).latest("revision_id")
|
||||
|
||||
changes = currentVersion.changes
|
||||
self.assertEqual(len(changes.field_changes), 1)
|
||||
|
||||
def test_manager(self):
|
||||
objs = versioning.RIGSVersion.objects.get_for_multiple_models(
|
||||
[models.Event, models.Person, models.Organisation])
|
||||
[models.Event, models.Person, models.Organisation]
|
||||
)
|
||||
self.assertEqual(len(objs), 4)
|
||||
|
||||
def test_text_field_types(self):
|
||||
@@ -68,7 +70,7 @@ class RIGSVersionTestCase(TestCase):
|
||||
self.event.save()
|
||||
|
||||
# Find the most recent version
|
||||
currentVersion = versioning.RIGSVersion.objects.get_for_object(self.event).latest('revision__date_created')
|
||||
currentVersion = versioning.RIGSVersion.objects.get_for_object(self.event).latest("revision_id")
|
||||
diff = currentVersion.changes
|
||||
|
||||
# There are two changes
|
||||
@@ -90,7 +92,7 @@ class RIGSVersionTestCase(TestCase):
|
||||
self.person.save()
|
||||
|
||||
# Find the most recent version
|
||||
currentVersion = versioning.RIGSVersion.objects.get_for_object(self.person).latest('revision__date_created')
|
||||
currentVersion = versioning.RIGSVersion.objects.get_for_object(self.person).latest("revision_id")
|
||||
diff = currentVersion.changes
|
||||
|
||||
# Should be declared as long
|
||||
@@ -103,15 +105,18 @@ class RIGSVersionTestCase(TestCase):
|
||||
self.event.save()
|
||||
|
||||
# Find the most recent version
|
||||
currentVersion = versioning.RIGSVersion.objects.get_for_object(self.event).latest('revision__date_created')
|
||||
currentVersion = versioning.RIGSVersion.objects.get_for_object(self.event).latest("revision_id")
|
||||
|
||||
# Check the diff is correct
|
||||
self.assertEqual(currentVersion.changes.field_changes[0].diff,
|
||||
[{'type': 'equal', 'text': "A"},
|
||||
{'type': 'delete', 'text': " new"},
|
||||
{'type': 'insert', 'text': "n old"},
|
||||
{'type': 'equal', 'text': " note on the event"}
|
||||
])
|
||||
self.assertEqual(
|
||||
currentVersion.changes.field_changes[0].diff,
|
||||
[
|
||||
{"type": "equal", "text": "A"},
|
||||
{"type": "delete", "text": " new"},
|
||||
{"type": "insert", "text": "n old"},
|
||||
{"type": "equal", "text": " note on the event"},
|
||||
],
|
||||
)
|
||||
|
||||
def test_choice_field(self):
|
||||
with reversion.create_revision():
|
||||
@@ -119,12 +124,12 @@ class RIGSVersionTestCase(TestCase):
|
||||
self.event.status = models.Event.CONFIRMED
|
||||
self.event.save()
|
||||
|
||||
currentVersion = versioning.RIGSVersion.objects.get_for_object(self.event).latest('revision__date_created')
|
||||
self.assertEqual(currentVersion.changes.field_changes[0].old, 'Provisional')
|
||||
self.assertEqual(currentVersion.changes.field_changes[0].new, 'Confirmed')
|
||||
currentVersion = versioning.RIGSVersion.objects.get_for_object(self.event).latest("revision_id")
|
||||
self.assertEqual(currentVersion.changes.field_changes[0].old, "Provisional")
|
||||
self.assertEqual(currentVersion.changes.field_changes[0].new, "Confirmed")
|
||||
|
||||
def test_creation_behaviour(self):
|
||||
firstVersion = versioning.RIGSVersion.objects.get_for_object(self.event).latest('revision__date_created').parent
|
||||
firstVersion = versioning.RIGSVersion.objects.get_for_object(self.event).latest("revision__date_created").parent
|
||||
diff = firstVersion.changes
|
||||
|
||||
# Mainly to check for exceptions:
|
||||
@@ -137,7 +142,7 @@ class RIGSVersionTestCase(TestCase):
|
||||
self.event.save()
|
||||
|
||||
# Find the most recent version
|
||||
current_version = versioning.RIGSVersion.objects.get_for_object(self.event).latest('revision__date_created')
|
||||
current_version = versioning.RIGSVersion.objects.get_for_object(self.event).latest("revision_id")
|
||||
|
||||
diffs = current_version.changes.item_changes
|
||||
|
||||
@@ -156,7 +161,7 @@ class RIGSVersionTestCase(TestCase):
|
||||
item1.save()
|
||||
self.event.save()
|
||||
|
||||
current_version = versioning.RIGSVersion.objects.get_for_object(self.event).latest('revision__date_created')
|
||||
current_version = versioning.RIGSVersion.objects.get_for_object(self.event).latest("revision_id")
|
||||
|
||||
diffs = current_version.changes.item_changes
|
||||
|
||||
@@ -166,10 +171,13 @@ class RIGSVersionTestCase(TestCase):
|
||||
self.assertEqual(diffs[0].new.name, "New Name")
|
||||
|
||||
# Check the diff
|
||||
self.assertEqual(current_version.changes.item_changes[0].field_changes[0].diff,
|
||||
[{'type': 'delete', 'text': "TI I1"},
|
||||
{'type': 'insert', 'text': "New Name"},
|
||||
])
|
||||
self.assertEqual(
|
||||
current_version.changes.item_changes[0].field_changes[0].diff,
|
||||
[
|
||||
{"type": "delete", "text": "TI I1"},
|
||||
{"type": "insert", "text": "New Name"},
|
||||
],
|
||||
)
|
||||
|
||||
# Delete the item
|
||||
|
||||
@@ -178,7 +186,7 @@ class RIGSVersionTestCase(TestCase):
|
||||
self.event.save()
|
||||
|
||||
# Find the most recent version
|
||||
current_version = versioning.RIGSVersion.objects.get_for_object(self.event).latest('revision__date_created')
|
||||
current_version = versioning.RIGSVersion.objects.get_for_object(self.event).latest("revision_id")
|
||||
|
||||
diffs = current_version.changes.item_changes
|
||||
|
||||
|
||||
Reference in New Issue
Block a user