codeforlife-portal 8.7.3__tar.gz → 8.7.5__tar.gz

{codeforlife_portal-8.7.3/codeforlife_portal.egg-info → codeforlife_portal-8.7.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codeforlife-portal
-Version: 8.7.3
+Version: 8.7.5
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Framework :: Django
@@ -8,7 +8,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: asgiref==3.8.1; python_version >= "3.8"
 Requires-Dist: certifi==2025.4.26; python_version >= "3.6"
-Requires-Dist: cfl-common==8.7.3
+Requires-Dist: cfl-common==8.7.5
 Requires-Dist: chardet==5.2.0; python_version >= "3.7"
 Requires-Dist: charset-normalizer==3.4.2; python_version >= "3.7"
 Requires-Dist: diff-match-patch==20241021; python_version >= "3.7"
@@ -32,35 +32,35 @@ Requires-Dist: idna==3.10; python_version >= "3.6"
 Requires-Dist: importlib-metadata==4.13.0; python_version >= "3.7"
 Requires-Dist: libsass==0.23.0; python_version >= "3.8"
 Requires-Dist: more-itertools==8.7.0; python_version >= "3.5"
-Requires-Dist: numpy==2.2.6; python_version >= "3.10"
+Requires-Dist: numpy==2.3.0; python_version >= "3.11"
 Requires-Dist: pandas==2.3.0; python_version >= "3.9"
 Requires-Dist: pgeocode==0.4.0; python_version >= "3.8"
 Requires-Dist: phonenumbers==8.12.12
 Requires-Dist: pillow==11.2.1; python_version >= "3.9"
 Requires-Dist: pyjwt==2.6.0; python_version >= "3.7"
 Requires-Dist: pypng==0.20220715.0
-Requires-Dist: python-dateutil==2.9.0.post0; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3"
+Requires-Dist: python-dateutil==2.9.0.post0; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2"
 Requires-Dist: pytz==2025.2
 Requires-Dist: pyyaml==6.0.2; python_version >= "3.8"
 Requires-Dist: qrcode==7.4.2; python_version >= "3.7"
 Requires-Dist: reportlab==4.2.5; python_version >= "3.7" and python_version < "4"
-Requires-Dist: requests==2.32.3; python_version >= "3.8"
+Requires-Dist: requests==2.32.4; python_version >= "3.8"
 Requires-Dist: setuptools==80.9.0; python_version >= "3.9"
-Requires-Dist: six==1.17.0; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3"
+Requires-Dist: six==1.17.0; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2"
 Requires-Dist: sqlparse==0.5.3; python_version >= "3.8"
 Requires-Dist: tablib==3.7.0; python_version >= "3.9"
 Requires-Dist: typing-extensions==4.14.0; python_version >= "3.9"
 Requires-Dist: tzdata==2025.2; python_version >= "2"
 Requires-Dist: urllib3==2.4.0; python_version >= "3.9"
 Requires-Dist: wheel==0.45.1; python_version >= "3.8"
-Requires-Dist: zipp==3.22.0; python_version >= "3.9"
+Requires-Dist: zipp==3.23.0; python_version >= "3.9"
 Provides-Extra: dev
 Requires-Dist: asgiref==3.8.1; python_version >= "3.8" and extra == "dev"
 Requires-Dist: asttokens==3.0.0; python_version >= "3.8" and extra == "dev"
 Requires-Dist: attrs==25.3.0; python_version >= "3.8" and extra == "dev"
 Requires-Dist: black==25.1.0; python_version >= "3.9" and extra == "dev"
 Requires-Dist: certifi==2025.4.26; python_version >= "3.6" and extra == "dev"
-Requires-Dist: cfl-common==8.7.3; extra == "dev"
+Requires-Dist: cfl-common==8.7.5; extra == "dev"
 Requires-Dist: charset-normalizer==3.4.2; python_version >= "3.7" and extra == "dev"
 Requires-Dist: click==8.2.1; python_version >= "3.10" and extra == "dev"
 Requires-Dist: coverage[toml]==7.8.2; python_version >= "3.9" and extra == "dev"
@@ -85,7 +85,7 @@ Requires-Dist: fastdiff==0.3.0; extra == "dev"
 Requires-Dist: h11==0.16.0; python_version >= "3.8" and extra == "dev"
 Requires-Dist: idna==3.10; python_version >= "3.6" and extra == "dev"
 Requires-Dist: iniconfig==2.1.0; python_version >= "3.8" and extra == "dev"
-Requires-Dist: ipython==9.2.0; python_version >= "3.11" and extra == "dev"
+Requires-Dist: ipython==9.3.0; python_version >= "3.11" and extra == "dev"
 Requires-Dist: ipython-pygments-lexers==1.1.1; python_version >= "3.8" and extra == "dev"
 Requires-Dist: isort==6.0.1; python_full_version >= "3.9.0" and extra == "dev"
 Requires-Dist: jedi==0.19.2; python_version >= "3.6" and extra == "dev"
@@ -93,7 +93,7 @@ Requires-Dist: libsass==0.23.0; python_version >= "3.8" and extra == "dev"
 Requires-Dist: matplotlib-inline==0.1.7; python_version >= "3.8" and extra == "dev"
 Requires-Dist: more-itertools==8.7.0; python_version >= "3.5" and extra == "dev"
 Requires-Dist: mypy-extensions==1.1.0; python_version >= "3.8" and extra == "dev"
-Requires-Dist: numpy==2.2.6; python_version >= "3.10" and extra == "dev"
+Requires-Dist: numpy==2.3.0; python_version >= "3.11" and extra == "dev"
 Requires-Dist: outcome==1.3.0.post0; python_version >= "3.7" and extra == "dev"
 Requires-Dist: packaging==25.0; python_version >= "3.8" and extra == "dev"
 Requires-Dist: pandas==2.3.0; python_version >= "3.9" and extra == "dev"
@@ -118,16 +118,16 @@ Requires-Dist: pytest-django==4.8.0; python_version >= "3.8" and extra == "dev"
 Requires-Dist: pytest-mock==3.14.1; python_version >= "3.8" and extra == "dev"
 Requires-Dist: pytest-order==1.3.0; python_version >= "3.7" and extra == "dev"
 Requires-Dist: pytest-xdist==3.7.0; python_version >= "3.9" and extra == "dev"
-Requires-Dist: python-dateutil==2.9.0.post0; (python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3") and extra == "dev"
+Requires-Dist: python-dateutil==2.9.0.post0; (python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2") and extra == "dev"
 Requires-Dist: pytz==2025.2; extra == "dev"
 Requires-Dist: pyvirtualdisplay==3.0; extra == "dev"
 Requires-Dist: qrcode==7.4.2; python_version >= "3.7" and extra == "dev"
-Requires-Dist: rapid-router==7.5.10; extra == "dev"
-Requires-Dist: requests==2.32.3; python_version >= "3.8" and extra == "dev"
+Requires-Dist: rapid-router==7.5.12; extra == "dev"
+Requires-Dist: requests==2.32.4; python_version >= "3.8" and extra == "dev"
 Requires-Dist: responses==0.18.0; python_version >= "3.7" and extra == "dev"
 Requires-Dist: selenium==4.29.0; python_version >= "3.9" and extra == "dev"
 Requires-Dist: setuptools==80.9.0; python_version >= "3.9" and extra == "dev"
-Requires-Dist: six==1.17.0; (python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3") and extra == "dev"
+Requires-Dist: six==1.17.0; (python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2") and extra == "dev"
 Requires-Dist: snapshottest==1.0.0a1; extra == "dev"
 Requires-Dist: sniffio==1.3.1; python_version >= "3.7" and extra == "dev"
 Requires-Dist: sortedcontainers==2.4.0; extra == "dev"

{codeforlife_portal-8.7.3 → codeforlife_portal-8.7.5/codeforlife_portal.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codeforlife-portal
-Version: 8.7.3
+Version: 8.7.5
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Framework :: Django
@@ -8,7 +8,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: asgiref==3.8.1; python_version >= "3.8"
 Requires-Dist: certifi==2025.4.26; python_version >= "3.6"
-Requires-Dist: cfl-common==8.7.3
+Requires-Dist: cfl-common==8.7.5
 Requires-Dist: chardet==5.2.0; python_version >= "3.7"
 Requires-Dist: charset-normalizer==3.4.2; python_version >= "3.7"
 Requires-Dist: diff-match-patch==20241021; python_version >= "3.7"
@@ -32,35 +32,35 @@ Requires-Dist: idna==3.10; python_version >= "3.6"
 Requires-Dist: importlib-metadata==4.13.0; python_version >= "3.7"
 Requires-Dist: libsass==0.23.0; python_version >= "3.8"
 Requires-Dist: more-itertools==8.7.0; python_version >= "3.5"
-Requires-Dist: numpy==2.2.6; python_version >= "3.10"
+Requires-Dist: numpy==2.3.0; python_version >= "3.11"
 Requires-Dist: pandas==2.3.0; python_version >= "3.9"
 Requires-Dist: pgeocode==0.4.0; python_version >= "3.8"
 Requires-Dist: phonenumbers==8.12.12
 Requires-Dist: pillow==11.2.1; python_version >= "3.9"
 Requires-Dist: pyjwt==2.6.0; python_version >= "3.7"
 Requires-Dist: pypng==0.20220715.0
-Requires-Dist: python-dateutil==2.9.0.post0; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3"
+Requires-Dist: python-dateutil==2.9.0.post0; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2"
 Requires-Dist: pytz==2025.2
 Requires-Dist: pyyaml==6.0.2; python_version >= "3.8"
 Requires-Dist: qrcode==7.4.2; python_version >= "3.7"
 Requires-Dist: reportlab==4.2.5; python_version >= "3.7" and python_version < "4"
-Requires-Dist: requests==2.32.3; python_version >= "3.8"
+Requires-Dist: requests==2.32.4; python_version >= "3.8"
 Requires-Dist: setuptools==80.9.0; python_version >= "3.9"
-Requires-Dist: six==1.17.0; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3"
+Requires-Dist: six==1.17.0; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2"
 Requires-Dist: sqlparse==0.5.3; python_version >= "3.8"
 Requires-Dist: tablib==3.7.0; python_version >= "3.9"
 Requires-Dist: typing-extensions==4.14.0; python_version >= "3.9"
 Requires-Dist: tzdata==2025.2; python_version >= "2"
 Requires-Dist: urllib3==2.4.0; python_version >= "3.9"
 Requires-Dist: wheel==0.45.1; python_version >= "3.8"
-Requires-Dist: zipp==3.22.0; python_version >= "3.9"
+Requires-Dist: zipp==3.23.0; python_version >= "3.9"
 Provides-Extra: dev
 Requires-Dist: asgiref==3.8.1; python_version >= "3.8" and extra == "dev"
 Requires-Dist: asttokens==3.0.0; python_version >= "3.8" and extra == "dev"
 Requires-Dist: attrs==25.3.0; python_version >= "3.8" and extra == "dev"
 Requires-Dist: black==25.1.0; python_version >= "3.9" and extra == "dev"
 Requires-Dist: certifi==2025.4.26; python_version >= "3.6" and extra == "dev"
-Requires-Dist: cfl-common==8.7.3; extra == "dev"
+Requires-Dist: cfl-common==8.7.5; extra == "dev"
 Requires-Dist: charset-normalizer==3.4.2; python_version >= "3.7" and extra == "dev"
 Requires-Dist: click==8.2.1; python_version >= "3.10" and extra == "dev"
 Requires-Dist: coverage[toml]==7.8.2; python_version >= "3.9" and extra == "dev"
@@ -85,7 +85,7 @@ Requires-Dist: fastdiff==0.3.0; extra == "dev"
 Requires-Dist: h11==0.16.0; python_version >= "3.8" and extra == "dev"
 Requires-Dist: idna==3.10; python_version >= "3.6" and extra == "dev"
 Requires-Dist: iniconfig==2.1.0; python_version >= "3.8" and extra == "dev"
-Requires-Dist: ipython==9.2.0; python_version >= "3.11" and extra == "dev"
+Requires-Dist: ipython==9.3.0; python_version >= "3.11" and extra == "dev"
 Requires-Dist: ipython-pygments-lexers==1.1.1; python_version >= "3.8" and extra == "dev"
 Requires-Dist: isort==6.0.1; python_full_version >= "3.9.0" and extra == "dev"
 Requires-Dist: jedi==0.19.2; python_version >= "3.6" and extra == "dev"
@@ -93,7 +93,7 @@ Requires-Dist: libsass==0.23.0; python_version >= "3.8" and extra == "dev"
 Requires-Dist: matplotlib-inline==0.1.7; python_version >= "3.8" and extra == "dev"
 Requires-Dist: more-itertools==8.7.0; python_version >= "3.5" and extra == "dev"
 Requires-Dist: mypy-extensions==1.1.0; python_version >= "3.8" and extra == "dev"
-Requires-Dist: numpy==2.2.6; python_version >= "3.10" and extra == "dev"
+Requires-Dist: numpy==2.3.0; python_version >= "3.11" and extra == "dev"
 Requires-Dist: outcome==1.3.0.post0; python_version >= "3.7" and extra == "dev"
 Requires-Dist: packaging==25.0; python_version >= "3.8" and extra == "dev"
 Requires-Dist: pandas==2.3.0; python_version >= "3.9" and extra == "dev"
@@ -118,16 +118,16 @@ Requires-Dist: pytest-django==4.8.0; python_version >= "3.8" and extra == "dev"
 Requires-Dist: pytest-mock==3.14.1; python_version >= "3.8" and extra == "dev"
 Requires-Dist: pytest-order==1.3.0; python_version >= "3.7" and extra == "dev"
 Requires-Dist: pytest-xdist==3.7.0; python_version >= "3.9" and extra == "dev"
-Requires-Dist: python-dateutil==2.9.0.post0; (python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3") and extra == "dev"
+Requires-Dist: python-dateutil==2.9.0.post0; (python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2") and extra == "dev"
 Requires-Dist: pytz==2025.2; extra == "dev"
 Requires-Dist: pyvirtualdisplay==3.0; extra == "dev"
 Requires-Dist: qrcode==7.4.2; python_version >= "3.7" and extra == "dev"
-Requires-Dist: rapid-router==7.5.10; extra == "dev"
-Requires-Dist: requests==2.32.3; python_version >= "3.8" and extra == "dev"
+Requires-Dist: rapid-router==7.5.12; extra == "dev"
+Requires-Dist: requests==2.32.4; python_version >= "3.8" and extra == "dev"
 Requires-Dist: responses==0.18.0; python_version >= "3.7" and extra == "dev"
 Requires-Dist: selenium==4.29.0; python_version >= "3.9" and extra == "dev"
 Requires-Dist: setuptools==80.9.0; python_version >= "3.9" and extra == "dev"
-Requires-Dist: six==1.17.0; (python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3") and extra == "dev"
+Requires-Dist: six==1.17.0; (python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2") and extra == "dev"
 Requires-Dist: snapshottest==1.0.0a1; extra == "dev"
 Requires-Dist: sniffio==1.3.1; python_version >= "3.7" and extra == "dev"
 Requires-Dist: sortedcontainers==2.4.0; extra == "dev"

{codeforlife_portal-8.7.3 → codeforlife_portal-8.7.5}/codeforlife_portal.egg-info/requires.txt

@@ -1,4 +1,4 @@
-cfl-common==8.7.3
+cfl-common==8.7.5
 django-countries==7.6.1
 django-csp==3.8
 django-preventconcurrentlogins==0.8.2
@@ -10,13 +10,15 @@ pytz==2025.2
 [:python_version >= "2"]
 tzdata==2025.2
 
-[:python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3"]
+[:python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2"]
 python-dateutil==2.9.0.post0
 six==1.17.0
 
 [:python_version >= "3.10"]
 django==5.1.10
-numpy==2.2.6
+
+[:python_version >= "3.11"]
+numpy==2.3.0
 
 [:python_version >= "3.4"]
 django-ratelimit==3.0.1
@@ -50,7 +52,7 @@ django-two-factor-auth==1.17.0
 libsass==0.23.0
 pgeocode==0.4.0
 pyyaml==6.0.2
-requests==2.32.3
+requests==2.32.4
 sqlparse==0.5.3
 wheel==0.45.1
 
@@ -65,10 +67,10 @@ setuptools==80.9.0
 tablib==3.7.0
 typing-extensions==4.14.0
 urllib3==2.4.0
-zipp==3.22.0
+zipp==3.23.0
 
 [dev]
-cfl-common==8.7.3
+cfl-common==8.7.5
 django-countries==7.6.1
 django-csp==3.8
 django-selenium-clean==1.0.1
@@ -79,7 +81,7 @@ pypng==0.20220715.0
 pysocks==1.7.1
 pytz==2025.2
 pyvirtualdisplay==3.0
-rapid-router==7.5.10
+rapid-router==7.5.12
 snapshottest==1.0.0a1
 sortedcontainers==2.4.0
 stack-data==0.6.3
@@ -96,7 +98,7 @@ isort==6.0.1
 [dev:python_version >= "2"]
 tzdata==2025.2
 
-[dev:python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3"]
+[dev:python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2"]
 python-dateutil==2.9.0.post0
 six==1.17.0
 
@@ -104,10 +106,10 @@ six==1.17.0
 click==8.2.1
 django==5.1.10
 django-reverse-js==0.1.8
-numpy==2.2.6
 
 [dev:python_version >= "3.11"]
-ipython==9.2.0
+ipython==9.3.0
+numpy==2.3.0
 
 [dev:python_version >= "3.5"]
 more-itertools==8.7.0
@@ -153,7 +155,7 @@ pygments==2.19.1
 pypdf==5.1.0
 pytest-django==4.8.0
 pytest-mock==3.14.1
-requests==2.32.3
+requests==2.32.4
 sqlparse==0.5.3
 traitlets==5.14.3
 trio-websocket==0.12.2

codeforlife_portal-8.7.5/portal/__init__.py

@@ -0,0 +1 @@
+__version__ = "8.7.5"

{codeforlife_portal-8.7.3 → codeforlife_portal-8.7.5}/portal/forms/organisation.py

@@ -1,9 +1,9 @@
+import re
 from builtins import object
 
 from common.models import School
 from django import forms
 from django.core.exceptions import ObjectDoesNotExist
-from django.core.validators import EmailValidator
 from django_countries.widgets import CountrySelectWidget
 
 
@@ -167,16 +167,10 @@ class OrganisationForm(forms.ModelForm):
 
     def clean_name(self):
         name = self.cleaned_data.get("name", None)
-        validator = EmailValidator()
 
-        if name:
-            try:
-                validator(name)
-                is_email = True
-            except forms.ValidationError:
-                is_email = False
-
-            if is_email:
-                raise forms.ValidationError("Please make sure your organisation name is valid")
+        if re.match(re.compile("^[\w\.' ]+$"), name) is None:
+            raise forms.ValidationError(
+                "School names cannot contain special characters except full stops and apostrophes."
+            )
 
         return name

{codeforlife_portal-8.7.3 → codeforlife_portal-8.7.5}/portal/tests/pageObjects/portal/teach/dashboard_page.py

@@ -52,12 +52,6 @@ class TeachDashboardPage(TeachBasePage):
         self.browser.find_element(By.ID, "update_details_button").click()
         return self
 
-    def has_edit_failed(self):
-        self.wait_for_element_by_id("edit_form")
-        errorlist = self.browser.find_element(By.ID, "edit_form").find_element(By.CLASS_NAME, "errorlist").text
-        error = "There is already a school or club registered with that name"
-        return error in errorlist
-
     def create_class(self, name, classmate_progress, teacher_id=None):
         self.browser.find_element(By.ID, "id_class_name").send_keys(name)
         if classmate_progress:

{codeforlife_portal-8.7.3 → codeforlife_portal-8.7.5}/portal/tests/pageObjects/portal/teach/onboarding_organisation_page.py

@@ -13,13 +13,13 @@ class OnboardingOrganisationPage(TeachBasePage):
 
         assert self.on_correct_page("onboarding_organisation_page")
 
-    def create_organisation(self, name, password, country="GB"):
-        self._create_organisation(name, password, country)
+    def create_organisation(self, name, country="GB"):
+        self._create_organisation(name, country)
 
         return onboarding_classes_page.OnboardingClassesPage(self.browser)
 
-    def create_organisation_failure(self, name, password, country="GB"):
-        self._create_organisation(name, password, country)
+    def create_organisation_failure(self, name, country="GB"):
+        self._create_organisation(name, country)
 
         return self
 
@@ -28,7 +28,7 @@ class OnboardingOrganisationPage(TeachBasePage):
 
         return self
 
-    def _create_organisation(self, name, password, country):
+    def _create_organisation(self, name, country):
         self.browser.find_element(By.ID, "id_name").send_keys(name)
         country_element = self.browser.find_element(By.ID, "id_country")
         select = Select(country_element)
@@ -47,10 +47,3 @@ class OnboardingOrganisationPage(TeachBasePage):
         )
         error = "There is already a school or club registered with that name and postcode"
         return error in errors
-
-    def was_postcode_invalid(self):
-        errors = (
-            self.browser.find_element(By.ID, "form-create-organisation").find_element(By.CLASS_NAME, "errorlist").text
-        )
-        error = "Please enter a valid postcode or ZIP code"
-        return error in errors

{codeforlife_portal-8.7.3 → codeforlife_portal-8.7.5}/portal/tests/test_organisation.py

@@ -16,7 +16,6 @@ from selenium.webdriver.common.by import By
 from portal.tests.pageObjects.portal.base_page import BasePage
 from portal.tests.pageObjects.portal.home_page import HomePage
 from portal.tests.test_invite_teacher import FADE_TIME
-
 from .base_test import BaseTest
 from .utils.messages import is_organisation_created_message_showing
 
@@ -28,8 +27,22 @@ class TestOrganisation(BaseTest, BasePage):
         self.selenium.get(self.live_server_url)
         page = HomePage(self.selenium).go_to_teacher_login_page().login_no_school(email, password)
 
-        page, name = create_organisation(page, password)
-        assert is_organisation_created_message_showing(self.selenium, name)
+        school_name = "My School"
+        page.create_organisation(school_name)
+        assert is_organisation_created_message_showing(self.selenium, school_name)
+
+    def test_create_invalid_name(self):
+        email, password = signup_teacher_directly()
+
+        self.selenium.get(self.live_server_url)
+        page = HomePage(self.selenium).go_to_teacher_login_page().login_no_school(email, password)
+
+        invalid_school_name = "<a>My School</a"
+        page.create_organisation_failure(invalid_school_name)
+        assert page.was_form_invalid(
+            "form-create-organisation",
+            "School names cannot contain special characters except full stops and apostrophes.",
+        )
 
     def test_kick(self):
         email_1, password_1 = signup_teacher_directly()
@@ -171,11 +184,30 @@ class TestOrganisation(BaseTest, BasePage):
 
         assert page.check_organisation_details({"name": school.name})
 
-        new_name = "new " + school.name
+        new_name = f"new {school.name}"
 
         page.change_organisation_details({"name": new_name})
         assert page.check_organisation_details({"name": new_name})
 
+    def test_edit_details_invalid_name(self):
+        email, password = signup_teacher_directly()
+        school = create_organisation_directly(email)
+        _, _, access_code = create_class_directly(email)
+        create_school_student_directly(access_code)
+
+        self.selenium.get(self.live_server_url)
+        page = HomePage(self.selenium).go_to_teacher_login_page().login(email, password)
+
+        assert page.check_organisation_details({"name": school.name})
+
+        new_name = f"<a>{school.name}</a>"
+
+        page.change_organisation_details({"name": new_name})
+
+        assert page.was_form_invalid(
+            "edit_form", "School names cannot contain special characters except full stops and apostrophes."
+        )
+
     def test_edit_clash(self):
         email_1, _ = signup_teacher_directly()
         email_2, password_2 = signup_teacher_directly()
@@ -193,4 +225,4 @@ class TestOrganisation(BaseTest, BasePage):
 
         page = page.change_organisation_details({"name": school1.name})
 
-        assert page.has_edit_failed()
+        assert page.was_form_invalid("edit_form", "There is already a school or club registered with that name")

{codeforlife_portal-8.7.3 → codeforlife_portal-8.7.5}/portal/tests/test_teacher.py

@@ -772,7 +772,7 @@ class TestTeacherFrontend(BaseTest):
             .login_no_school(email, password)
         )
 
-        page = page.create_organisation("Test school", "W1", "GB")
+        page = page.create_organisation("Test school")
         page = page.create_class("Test class", True)
         page = (
             page.type_student_name("Test Student")

codeforlife_portal-8.7.3/portal/__init__.py

@@ -1 +0,0 @@
-__version__ = "8.7.3"