fix: PT59628-1312-R4632 (#2448)

* fix: PT59628-1312-R4632

* fix test

* Add dashboard test

* Simplify

Author: faucomte97

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 @@ def clean(self):
 
     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 @@ def change_organisation_details(self, details):
         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 @@ def __init__(self, browser):
 
         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 @@ def create_organisation_empty(self):
 
         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 @@ def has_creation_failed(self):
         )
         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 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 @@ def test_create(self):
         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 @@ def test_edit_details(self):
 
         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 @@ def test_edit_clash(self):
 
         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 @@ def test_onboarding_complete(self):
             .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")