codeforlife-portal 8.7.3__py2.py3-none-any.whl → 8.7.4__py2.py3-none-any.whl

{codeforlife_portal-8.7.3.dist-info → codeforlife_portal-8.7.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codeforlife-portal
-Version: 8.7.3
+Version: 8.7.4
 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.4
 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"
@@ -60,7 +60,7 @@ 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.4; 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"

{codeforlife_portal-8.7.3.dist-info → codeforlife_portal-8.7.4.dist-info}/RECORD

@@ -87,7 +87,7 @@ cfl_common/common/tests/utils/organisation.py,sha256=vNgKFtU3VPcWRnZfh82yCS90PLA
 cfl_common/common/tests/utils/student.py,sha256=PLd980iSlxmMoB8J3C2pVjNC5xHdVxfAkJXzhv_dRhg,3814
 cfl_common/common/tests/utils/teacher.py,sha256=KQ_NAl4yQqiX_zwcULQjkovc29JPhnkLR5Nk3Ljzbpg,2661
 cfl_common/common/tests/utils/user.py,sha256=NvLzZLVP4jy5Hn1iztOYF_BTQ9WsbSmuWMEzGzhAsRU,919
-codeforlife_portal-8.7.3.dist-info/licenses/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
+codeforlife_portal-8.7.4.dist-info/licenses/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
 deploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 deploy/captcha.py,sha256=MbOBuGnbT_SOIltSjP1XMOLrfo1DldCilaVAEim0vM4,23
 deploy/views.py,sha256=7mY2zNPkaBFrlWGByJHp2zFqHIHSMc0YArjE_sFWMMU,131
@@ -111,7 +111,7 @@ example_project/portal_test_settings.py,sha256=AaXwSSB2A6qu6My_7cBciQa_jONy084uq
 example_project/settings.py,sha256=RRSHhAgJVDn4uNZG395V6_Td7jwsSaBGNwQBZ_KJm0Y,5973
 example_project/urls.py,sha256=FUTzHPlUS1O5kqMHjL5V4L552N2ln7uTDXcw9wjKUto,422
 example_project/wsgi.py,sha256=U1W6WzZxZaIdYZ5tks7w9fqp5WS5qvn2iThsVcskrWw,829
-portal/__init__.py,sha256=PavQeg716DP21IX9gDpuQHJONNgvBGm_gqevlR32R_c,22
+portal/__init__.py,sha256=wHEOdRusBiLao3c9nqf81YK6XRQABxAMpJ9HVGTQfWg,22
 portal/admin.py,sha256=RKJizTF6dPJKmGPZw7nZUM0X8jkiTjgyKhLQxtvHJ0I,6148
 portal/app_settings.py,sha256=DhWLQOwM0zVOXE3O5TNKbMM9K6agfLuCsHOdr1J7xEI,651
 portal/backends.py,sha256=2Dss6_WoQwPuDzJUF1yEaTQTNG4eUrD12ujJQ5cp5Tc,812
@@ -126,7 +126,7 @@ portal/forms/admin.py,sha256=Cdl8-wvasAzvMfgUlFYzQjYeuyC7gIsSiy8V_-jMp7w,2080
 portal/forms/dotmailer.py,sha256=AiHoN8ZRl3A69FYSldkjlhICGx_l4BujP5HjYdSRCok,897
 portal/forms/error_messages.py,sha256=8d3z_3e2L-5zwj5hFhnUByC5k2CEpIVVuJg2nYkCUQ8,148
 portal/forms/invite_teacher.py,sha256=jkDNcCfkts4_lXRzhcI3xBam21Zn2yX9wMpMVhDtW1w,880
-portal/forms/organisation.py,sha256=QcQyd7AiqBmvt4y8uQSQylguUbKOKqo2pjqWIkpWjDg,7433
+portal/forms/organisation.py,sha256=-h4Lpl4WisqNGgohlsmqh_ABA0aLfeXtUxAR1sUdi0I,7278
 portal/forms/play.py,sha256=j_QYAKb4qyW0uy0VUUG49dmzDLINc3jR6ddK-djrbc4,11523
 portal/forms/registration.py,sha256=a-TuzikRc0Q-BAYs3rJ3Sz1wmQ1o_rTEtZmWdF7-xss,6008
 portal/forms/teach.py,sha256=lQivQ4pXnvJw8nJMSbqtg-Il5RYkw54ZxE5rJuNlFn0,22391
@@ -543,12 +543,12 @@ portal/tests/test_helper_methods.py,sha256=-SQCDZm2XUtyXGEp0CHIb_SSC9CPD-XOSnpnY
 portal/tests/test_independent_student.py,sha256=NrRjTEr6V4WXpCE74N8LYNVocvLSvddkjuo3dYpfAZc,27245
 portal/tests/test_invite_teacher.py,sha256=hynk2p63URQocCS8N6-IQnQWkdzggQ-1jGDuWcRSY_Y,14902
 portal/tests/test_middleware.py,sha256=HV7AdgWyvgrtPyDMw3np5YDbUstFpKif7Qqw-e8gs5s,8258
-portal/tests/test_organisation.py,sha256=kCMUNzLN6EzaMUBcFkqXwnqLGgOuQxQWIHHt63nhqBs,7574
+portal/tests/test_organisation.py,sha256=1rTHTUhdDHMG1Xf4FXMvwOAuXWzFWTVUnryJyW9zOgs,8949
 portal/tests/test_partials.py,sha256=cSLNLjdsriROjPxkZlM3HKD3CSKDuKgpaDIdL3fPyBs,1794
 portal/tests/test_ratelimit.py,sha256=XWq1A9XgRrlcMHibGoJ0kc4gLc5U_u5UhKHjthxCfYA,19376
 portal/tests/test_school_student.py,sha256=bFZwY4twaFHQLp0cltMq8cLNDZGgCHTZBCZHK0JcV8s,8604
 portal/tests/test_security.py,sha256=FGrlRfnzi-Xx2_bn4fTZlYORKm7w_GhGkD3havvplwc,3239
-portal/tests/test_teacher.py,sha256=y4h5Bt7Xlglh9pylSl1jOOl5tl6rqHTewddBjB3RzRA,29171
+portal/tests/test_teacher.py,sha256=fYdqWYVT-EcWUzQBNZ5qOORO7UC_S14NtACx64Rsrbg,29159
 portal/tests/test_teacher_student.py,sha256=4Di29Lsymbmh6WxZ0FYpqZ4fMN8NqNMTXXOsii1dfW4,21624
 portal/tests/test_views.py,sha256=Hv0rVOLmYivMqzJK1AQeRJ85YHTCRrlr12hcf1B83Bk,47566
 portal/tests/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -588,7 +588,7 @@ portal/tests/pageObjects/portal/teach/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCe
 portal/tests/pageObjects/portal/teach/add_independent_student_to_class_page.py,sha256=P2iW94L7tiLfPz789GcQMyEvGf0QW5i4FUQ_EyVCQyY,931
 portal/tests/pageObjects/portal/teach/added_independent_student_to_class_page.py,sha256=FnFfIref2Izu6Gquql_D5rvQ32_khulGM1LHnU0cHv8,585
 portal/tests/pageObjects/portal/teach/class_page.py,sha256=4UuKJxEglZcprR5redmoeVuO3wf0tuwsn-glucS8hKc,3932
-portal/tests/pageObjects/portal/teach/dashboard_page.py,sha256=Ttxvd7jOvEKMKQV21lqC6uBWjMLCebeoC7gEAZ76kkI,6709
+portal/tests/pageObjects/portal/teach/dashboard_page.py,sha256=rWtKgw6urggoIgKj10fj5IAh_X_C9MVPeLD7CWnTo1Y,6404
 portal/tests/pageObjects/portal/teach/dismiss_students_page.py,sha256=qU3D3og4sxIbn4RAKYTaQNQxF0OKodbYzH5XA2detnE,882
 portal/tests/pageObjects/portal/teach/edit_student_page.py,sha256=qv0B9tc2w1nmW21zu2ObhIhBYOAvF-HswqNZe39jkts,1399
 portal/tests/pageObjects/portal/teach/move_class_page.py,sha256=GbhCrSfUSIm_NWmqgw4qQPH8tgNiTn6HNSmOyTQ_CJU,1032
@@ -596,7 +596,7 @@ portal/tests/pageObjects/portal/teach/move_classes_page.py,sha256=FsXJV8s9hvI5lf
 portal/tests/pageObjects/portal/teach/move_students_disambiguate_page.py,sha256=-seb1yylbDzGMLeUrlu2-SlTqTBU-Awa_kPV_EXpfpM,673
 portal/tests/pageObjects/portal/teach/move_students_page.py,sha256=j_nt8e908Deq-d51tL88KHJfcRQkEJH2eQm6Hvz9Vfs,1078
 portal/tests/pageObjects/portal/teach/onboarding_classes_page.py,sha256=rVKaJyDeRpSYkG86KB3QWQfgsxuL4Gftj-z19KYOmNM,1046
-portal/tests/pageObjects/portal/teach/onboarding_organisation_page.py,sha256=86npz-pbyL9xYYEid4O08m-OTXOsLT2-zoUG7Ee06Rs,2005
+portal/tests/pageObjects/portal/teach/onboarding_organisation_page.py,sha256=Rm_zxQYn2STpgLPUyASnjG8Mdf5TvXeTIz8k5ve6-NM,1679
 portal/tests/pageObjects/portal/teach/onboarding_student_list_page.py,sha256=28Vz8-IrKf0VoFE_KisAApkunfEE7lX1yj0-nxvKsDw,1147
 portal/tests/pageObjects/portal/teach/onboarding_students_page.py,sha256=522Y79PfNV1PcR-Clf19KnNe2r3xf4sPPAUnroIzk80,971
 portal/tests/pageObjects/portal/teach/teach_base_page.py,sha256=vnd5YO15baBgCkqyBkXGZpdjZRMRpeeN69dH-fG383A,1229
@@ -634,7 +634,7 @@ portal/views/two_factor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 portal/views/two_factor/core.py,sha256=Lk32z2SN2Pg0rRkK-N-LXMvXC1kKKsH3l692kiSDQ4E,964
 portal/views/two_factor/form.py,sha256=lnHNKI-BMlpncTuW3zUzjPaJJNuEra2I_nOam0eOKFY,257
 portal/views/two_factor/profile.py,sha256=SHSg_xHccE5PtD-OfuOkYhREYz_er4bj5ro1RjJ88Yw,393
-codeforlife_portal-8.7.3.dist-info/METADATA,sha256=2SujtbBeNKzSBxIZLY-EIONzUD0SkoPRKedUL9P5Srw,12342
-codeforlife_portal-8.7.3.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-codeforlife_portal-8.7.3.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
-codeforlife_portal-8.7.3.dist-info/RECORD,,
+codeforlife_portal-8.7.4.dist-info/METADATA,sha256=GjLnfnrWW_nLiHkpJOUYaC-HqcOKkLqJ4F6FOkY-4i4,12342
+codeforlife_portal-8.7.4.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+codeforlife_portal-8.7.4.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
+codeforlife_portal-8.7.4.dist-info/RECORD,,

portal/__init__.py

@@ -1 +1 @@
-__version__ = "8.7.3"
+__version__ = "8.7.4"

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

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:

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

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")

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")