codeforlife-portal 5.33.5__py2.py3-none-any.whl → 8.9.9__py2.py3-none-any.whl

portal/tests/pageObjects/portal/teach/class_page.py

@@ -1,3 +1,5 @@
+from selenium.webdriver.common.by import By
+
 from .teach_base_page import TeachBasePage
 
 
@@ -8,44 +10,61 @@ class TeachClassPage(TeachBasePage):
         assert self.on_correct_page("teach_class_page")
 
     def type_student_name(self, name):
-        self.browser.find_element_by_id("id_names").send_keys(name + "\n")
+        self.browser.find_element(By.ID, "id_names").send_keys(name + "\n")
         return self
 
     def create_students(self):
-        self._click_create_students()
+        self.click_create_students()
 
         import portal.tests.pageObjects.portal.teach.onboarding_student_list_page as onboarding_student_list_page
 
         return onboarding_student_list_page.OnboardingStudentListPage(self.browser)
 
-    def _click_create_students(self):
-        self.browser.find_element_by_name("new_students").click()
+    def click_create_students(self):
+        self.browser.find_element(By.NAME, "new_students").click()
+        return self
+
+    def adding_students_failed(self):
+        if not self.element_exists_by_css(".errorlist"):
+            return False
+
+        error_list = self.browser.find_element(By.ID, "form-create-students").find_element(By.CLASS_NAME, "errorlist")
+
+        return error_list.text
+
+    def duplicate_students(self, name):
+        if not self.element_exists_by_css(".errorlist"):
+            return False
+
+        errors = self.browser.find_element(By.ID, "form-create-students").find_element(By.CLASS_NAME, "errorlist").text
+        error = "You cannot add more than one student called '{0}'".format(name)
+        return error in errors
 
     def student_exists(self, name):
-        return name in self.browser.find_element_by_id("student_table").text
+        return name in self.browser.find_element(By.ID, "student_table").text
 
     def delete_students(self):
-        self.browser.find_element_by_id("deleteSelectedStudents").click()
+        self.browser.find_element(By.ID, "deleteSelectedStudents").click()
         return self
 
     def reset_passwords(self):
-        self.browser.find_element_by_id("resetSelectedStudents").click()
+        self.browser.find_element(By.ID, "resetSelectedStudents").click()
         return self
 
     def move_students(self):
-        self.browser.find_element_by_id("moveSelectedStudents").click()
+        self.browser.find_element(By.ID, "moveSelectedStudents").click()
 
         import portal.tests.pageObjects.portal.teach.move_students_page as move_students_page
 
         return move_students_page.TeachMoveStudentsPage(self.browser)
 
     def move_students_none_selected(self):
-        self.browser.find_element_by_id("moveSelectedStudents").click()
+        self.browser.find_element(By.ID, "moveSelectedStudents").click()
 
         return self
 
     def dismiss_students(self):
-        self.browser.find_element_by_id("dismissSelectedStudents").click()
+        self.browser.find_element(By.ID, "dismissSelectedStudents").click()
 
         import portal.tests.pageObjects.portal.teach.dismiss_students_page as dismiss_students_page
 
@@ -64,21 +83,25 @@ class TeachClassPage(TeachBasePage):
         return onboarding_student_list_page.OnboardingStudentListPage(self.browser)
 
     def toggle_select_student(self):
-        self.browser.find_element_by_id("student_checkbox").click()
+        self.browser.find_element(By.ID, "student_checkbox").click()
+        return self
+
+    def toggle_all_students(self):
+        self.browser.find_element(By.ID, "selectedStudentsListToggle").click()
         return self
 
     def has_students(self):
         return self.element_exists_by_id("student_table")
 
     def go_to_edit_student_page(self):
-        self.browser.find_element_by_id("edit_student_button").click()
+        self.browser.find_element(By.ID, "edit_student_button").click()
 
         import portal.tests.pageObjects.portal.teach.edit_student_page as edit_student_page
 
         return edit_student_page.EditStudentPage(self.browser)
 
     def go_to_dashboard(self):
-        self.browser.find_element_by_id("return_to_classes_button").click()
+        self.browser.find_element(By.ID, "return_to_classes_button").click()
         # stop scrolling animation and scroll to top as the classes page will scroll to classes by default
         self.browser.execute_script("$('html,body').stop();window.scrollTo(0, 0)")
 

portal/tests/pageObjects/portal/teach/dashboard_page.py

@@ -1,12 +1,14 @@
 from __future__ import absolute_import
 
-import time
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support.ui import Select
 
-from .add_independent_student_to_class_page import AddIndependentStudentToClassPage
+from ..email_verification_needed_page import EmailVerificationNeededPage
+from .add_independent_student_to_class_page import \
+    AddIndependentStudentToClassPage
 from .class_page import TeachClassPage
 from .move_classes_page import TeachMoveClassesPage
 from .teach_base_page import TeachBasePage
-from ..email_verification_needed_page import EmailVerificationNeededPage
 
 
 class TeachDashboardPage(TeachBasePage):
@@ -16,19 +18,19 @@ class TeachDashboardPage(TeachBasePage):
         assert self.on_correct_page("teach_dashboard_page")
 
     def go_to_class_page(self):
-        self.browser.find_element_by_id("class_button").click()
+        self.browser.find_element(By.ID, "class_button").click()
         return TeachClassPage(self.browser)
 
     def open_school_tab(self):
-        self.browser.find_element_by_id("tab-school").click()
+        self.browser.find_element(By.ID, "tab-school").click()
         return self
 
     def open_classes_tab(self):
-        self.browser.find_element_by_id("tab-classes").click()
+        self.browser.find_element(By.ID, "tab-classes").click()
         return self
 
     def open_account_tab(self):
-        self.browser.find_element_by_id("tab-account").click()
+        self.browser.find_element(By.ID, "tab-account").click()
         return self
 
     def check_organisation_details(self, details):
@@ -38,39 +40,27 @@ class TeachDashboardPage(TeachBasePage):
         self.wait_for_element_by_id("id_" + first_field)
 
         for field, value in list(details.items()):
-            correct &= (
-                self.browser.find_element_by_id("id_" + field).get_attribute("value")
-                == value
-            )
+            correct &= self.browser.find_element(By.ID, "id_" + field).get_attribute("value") == value
 
         return correct
 
     def change_organisation_details(self, details):
         for field, value in list(details.items()):
-            self.browser.find_element_by_id("id_" + field).clear()
-            self.browser.find_element_by_id("id_" + field).send_keys(value)
+            self.browser.find_element(By.ID, "id_" + field).clear()
+            self.browser.find_element(By.ID, "id_" + field).send_keys(value)
 
-        self.browser.find_element_by_id("update_details_button").click()
+        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 and postcode"
-        )
-        return error in errorlist
-
-    def create_class(self, name, classmate_progress):
-        self.browser.find_element_by_id("id_class_name").send_keys(name)
+    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:
-            self.browser.find_element_by_id("id_classmate_progress").click()
+            self.browser.find_element(By.ID, "id_classmate_progress").click()
 
-        self.browser.find_element_by_id("create_class_button").click()
+        if teacher_id is not None:
+            Select(self.browser.find_element(By.ID, "id_teacher")).select_by_value(str(teacher_id))
+
+        self.browser.find_element(By.ID, "create_class_button").click()
 
         return self
 
@@ -81,12 +71,7 @@ class TeachDashboardPage(TeachBasePage):
 
     def change_email(self, first_name, last_name, new_email, password):
         self._change_details(
-            {
-                "first_name": first_name,
-                "last_name": last_name,
-                "email": new_email,
-                "current_password": password,
-            }
+            {"first_name": first_name, "last_name": last_name, "email": new_email, "current_password": password}
         )
 
         return EmailVerificationNeededPage(self.browser)
@@ -102,60 +87,36 @@ class TeachDashboardPage(TeachBasePage):
             }
         )
 
-        from portal.tests.pageObjects.portal.teacher_login_page import (
-            TeacherLoginPage,
-        )
+        from portal.tests.pageObjects.portal.teacher_login_page import \
+            TeacherLoginPage
 
         return TeacherLoginPage(self.browser)
 
     def _change_details(self, details):
         for field, value in list(details.items()):
-            self.browser.find_element_by_id("id_" + field).clear()
-            self.browser.find_element_by_id("id_" + field).send_keys(value)
-        self.browser.find_element_by_id("update_button").click()
+            self.browser.find_element(By.ID, "id_" + field).clear()
+            self.browser.find_element(By.ID, "id_" + field).send_keys(value)
+        self.browser.find_element(By.ID, "update_button").click()
 
     def check_account_details(self, details):
         correct = True
 
         for field, value in list(details.items()):
-            correct &= (
-                self.browser.find_element_by_id("id_" + field).get_attribute("value")
-                == value
-            )
+            correct &= self.browser.find_element(By.ID, "id_" + field).get_attribute("value") == value
 
         return correct
 
-    def accept_join_request(self):
-        self.browser.find_element_by_id("requests_button").click()
-        time.sleep(3)
-        self.browser.find_element_by_id("allow_button").click()
-        return self
-
-    def deny_join_request(self):
-        self.browser.find_element_by_id("requests_button").click()
-        time.sleep(3)
-        self.browser.find_element_by_id("deny_button").click()
-        return self
-
     def accept_independent_join_request(self):
-        self.browser.find_element_by_id("allow_independent_button").click()
+        self.browser.find_element(By.ID, "allow_independent_button").click()
         return AddIndependentStudentToClassPage(self.browser)
 
     def deny_independent_join_request(self):
-        self.browser.find_element_by_id("deny_independent_button").click()
+        self.browser.find_element(By.ID, "deny_independent_button").click()
         return self
 
-    def has_join_request(self, email):
-        return self.element_exists_by_id("request_table") and (
-            email in self.browser.find_element_by_id("request_table").text
-        )
-
-    def has_no_join_requests(self):
-        return self.element_does_not_exist_by_id("request_table")
-
     def has_independent_join_request(self, email):
         return self.element_exists_by_id("independent_request_table") and (
-            email in self.browser.find_element_by_id("independent_request_table").text
+            email in self.browser.find_element(By.ID, "independent_request_table").text
         )
 
     def has_no_independent_join_requests(self):
@@ -163,21 +124,19 @@ class TeachDashboardPage(TeachBasePage):
 
     def has_onboarding_complete_popup(self):
         return self.element_exists_by_id("info-popup") and (
-            self.browser.find_element_by_id("info-popup").text.startswith(
-                "Registration complete!"
-            )
+            self.browser.find_element(By.ID, "info-popup").text.startswith("Registration complete!")
         )
 
     def is_teacher_in_school(self, name):
-        return name in self.browser.find_element_by_id("teachers_table").text
+        return name in self.browser.find_element(By.ID, "teachers_table").text
 
     def is_not_teacher_in_school(self, name):
-        return name not in self.browser.find_element_by_id("teachers_table").text
+        return name not in self.browser.find_element(By.ID, "teachers_table").text
 
     def is_teacher_admin(self):
-        return "Revoke admin" in self.browser.find_element_by_id("teachers_table").text
+        return "Revoke admin" in self.browser.find_element(By.ID, "teachers_table").text
 
-    def have_classes(self):
+    def has_classes(self):
         return self.element_exists_by_id("classes-table")
 
     def does_not_have_classes(self):
@@ -185,26 +144,26 @@ class TeachDashboardPage(TeachBasePage):
 
     def does_class_exist(self, name, access_code):
         return (
-            self.have_classes()
-            and (name in self.browser.find_element_by_id("classes-table").text)
-            and (access_code in self.browser.find_element_by_id("classes-table").text)
+            self.has_classes()
+            and (name in self.browser.find_element(By.ID, "classes-table").text)
+            and (access_code in self.browser.find_element(By.ID, "classes-table").text)
         )
 
     def is_teacher_non_admin(self):
-        return "Make admin" in self.browser.find_element_by_id("teachers_table").text
+        return "Make admin" in self.browser.find_element(By.ID, "teachers_table").text
 
     def click_kick_button(self):
-        self.browser.find_element_by_id("kick_button").click()
+        self.browser.find_element(By.ID, "kick_button").click()
 
         return self
 
     def click_make_admin_button(self):
-        self.browser.find_element_by_id("make_admin_button").click()
+        self.browser.find_element(By.ID, "make_admin_button").click()
 
         return self
 
     def click_make_non_admin_button(self):
-        self.browser.find_element_by_id("make_non_admin_button").click()
+        self.browser.find_element(By.ID, "make_non_admin_button").click()
 
         return self
 
@@ -214,7 +173,7 @@ class TeachDashboardPage(TeachBasePage):
         return TeachMoveClassesPage(self.browser)
 
     def _click_leave_button(self):
-        self.browser.find_element_by_id("leave_organisation_button").click()
+        self.browser.find_element(By.ID, "leave_organisation_button").click()
 
     def confirm_kick_with_students_dialog(self):
         self.confirm_dialog()

portal/tests/pageObjects/portal/teach/dismiss_students_page.py

@@ -1,5 +1,7 @@
 from __future__ import absolute_import
 
+from selenium.webdriver.common.by import By
+
 from . import class_page
 from .teach_base_page import TeachBasePage
 
@@ -10,15 +12,15 @@ class TeachDismissStudentsPage(TeachBasePage):
 
         assert self.on_correct_page("dismiss_students_page")
 
-    def enter_email(self, email):
-        self.browser.find_element_by_id("id_form-0-email").send_keys(email)
-        self.browser.find_element_by_id("id_form-0-confirm_email").send_keys(email)
+    def enter_email(self, email, id=0):
+        self.browser.find_element(By.ID, f"id_form-{id}-email").send_keys(email)
+        self.browser.find_element(By.ID, f"id_form-{id}-confirm_email").send_keys(email)
         return self
 
     def cancel(self):
-        self.browser.find_element_by_id("cancel_button").click()
+        self.browser.find_element(By.ID, "cancel_button").click()
         return class_page.TeachClassPage(self.browser)
 
     def dismiss(self):
-        self.browser.find_element_by_id("dismiss_button").click()
+        self.browser.find_element(By.ID, "dismiss_button").click()
         return class_page.TeachClassPage(self.browser)

portal/tests/pageObjects/portal/teach/edit_student_page.py

@@ -1,5 +1,7 @@
 from __future__ import absolute_import
 
+from selenium.webdriver.common.by import By
+
 from . import class_page, onboarding_student_list_page
 from .teach_base_page import TeachBasePage
 
@@ -11,26 +13,26 @@ class EditStudentPage(TeachBasePage):
         assert self.on_correct_page("edit_student_page")
 
     def type_student_name(self, name):
-        self.browser.find_element_by_id("id_name").clear()
-        self.browser.find_element_by_id("id_name").send_keys(name)
+        self.browser.find_element(By.ID, "id_name").clear()
+        self.browser.find_element(By.ID, "id_name").send_keys(name)
         return self
 
     def type_student_password(self, password):
-        self.browser.find_element_by_id("id_password").send_keys(password)
-        self.browser.find_element_by_id("id_confirm_password").send_keys(password)
+        self.browser.find_element(By.ID, "id_password").send_keys(password)
+        self.browser.find_element(By.ID, "id_confirm_password").send_keys(password)
         return self
 
     def click_update_button(self):
-        self.browser.find_element_by_id("update_name_button").click()
+        self.browser.find_element(By.ID, "update_name_button").click()
         return class_page.TeachClassPage(self.browser)
 
     def click_update_button_fail(self):
-        self.browser.find_element_by_id("update_name_button").click()
+        self.browser.find_element(By.ID, "update_name_button").click()
         return self
 
     def click_set_password_button(self):
-        self.browser.find_element_by_id("set_new_password_button").click()
+        self.browser.find_element(By.ID, "set_new_password_button").click()
         return onboarding_student_list_page.OnboardingStudentListPage(self.browser)
 
     def is_student_name(self, name):
-        return name in self.browser.find_element_by_id("student_details").text
+        return name in self.browser.find_element(By.ID, "student_details").text

portal/tests/pageObjects/portal/teach/move_class_page.py

@@ -1,5 +1,6 @@
 from __future__ import absolute_import
 
+from selenium.webdriver.common.by import By
 from selenium.webdriver.support.ui import Select
 
 from . import class_page
@@ -14,22 +15,16 @@ class TeachMoveClassPage(TeachBasePage):
         assert self.on_correct_page("teach_move_class_page")
 
     def get_list_length(self):
-        return len(
-            self.browser.find_element_by_id("id_new_teacher").find_elements_by_tag_name(
-                "option"
-            )
-        )
+        return len(self.browser.find_element(By.ID, "id_new_teacher").find_elements(By.TAG_NAME, "option"))
 
     def select_teacher_by_index(self, teacher_index):
-        Select(self.browser.find_element_by_id("id_new_teacher")).select_by_index(
-            teacher_index
-        )
+        Select(self.browser.find_element(By.ID, "id_new_teacher")).select_by_index(teacher_index)
         return self
 
     def cancel(self):
-        self.browser.find_element_by_id("cancel_button").click()
+        self.browser.find_element(By.ID, "cancel_button").click()
         return class_page.TeachClassPage(self.browser)
 
     def move(self):
-        self.browser.find_element_by_id("move_button").click()
+        self.browser.find_element(By.ID, "move_button").click()
         return dashboard_page.TeachDashboardPage(self.browser)

portal/tests/pageObjects/portal/teach/move_classes_page.py

@@ -1,5 +1,7 @@
 from __future__ import absolute_import
 
+from selenium.webdriver.common.by import By
+
 from .teach_base_page import TeachBasePage
 
 
@@ -10,13 +12,13 @@ class TeachMoveClassesPage(TeachBasePage):
         assert self.on_correct_page("move_all_classes_page")
 
     def move_and_kick(self):
-        self.browser.find_element_by_id("move_classes_button").click()
+        self.browser.find_element(By.ID, "move_classes_button").click()
         import portal.tests.pageObjects.portal.teach.dashboard_page as dashboard_page
 
         return dashboard_page.TeachDashboardPage(self.browser)
 
     def move_and_leave(self):
-        self.browser.find_element_by_id("move_classes_button").click()
+        self.browser.find_element(By.ID, "move_classes_button").click()
         import portal.tests.pageObjects.portal.teach.onboarding_organisation_page as onboarding_organisation_page
 
         return onboarding_organisation_page.OnboardingOrganisationPage(self.browser)

portal/tests/pageObjects/portal/teach/move_students_disambiguate_page.py

@@ -1,5 +1,7 @@
 from __future__ import absolute_import
 
+from selenium.webdriver.common.by import By
+
 from . import class_page
 from .teach_base_page import TeachBasePage
 
@@ -11,9 +13,9 @@ class TeachMoveStudentsDisambiguatePage(TeachBasePage):
         assert self.on_correct_page("move_students_disambiguate_page")
 
     def cancel(self):
-        self.browser.find_element_by_id("cancel_button").click()
+        self.browser.find_element(By.ID, "cancel_button").click()
         return class_page.TeachClassPage(self.browser)
 
     def move(self):
-        self.browser.find_element_by_id("move_button").click()
+        self.browser.find_element(By.ID, "move_button").click()
         return class_page.TeachClassPage(self.browser)

portal/tests/pageObjects/portal/teach/move_students_page.py

@@ -1,5 +1,6 @@
 from __future__ import absolute_import
 
+from selenium.webdriver.common.by import By
 from selenium.webdriver.support.ui import Select
 
 from . import class_page
@@ -14,24 +15,16 @@ class TeachMoveStudentsPage(TeachBasePage):
         assert self.on_correct_page("move_students_page")
 
     def get_list_length(self):
-        return len(
-            self.browser.find_element_by_id("id_new_class").find_elements_by_tag_name(
-                "option"
-            )
-        )
+        return len(self.browser.find_element(By.ID, "id_new_class").find_elements(By.TAG_NAME, "option"))
 
     def select_class_by_index(self, teacher_index):
-        Select(self.browser.find_element_by_id("id_new_class")).select_by_index(
-            teacher_index
-        )
+        Select(self.browser.find_element(By.ID, "id_new_class")).select_by_index(teacher_index)
         return self
 
     def cancel(self):
-        self.browser.find_element_by_id("cancel_button").click()
+        self.browser.find_element(By.ID, "cancel_button").click()
         return class_page.TeachClassPage(self.browser)
 
     def move(self):
-        self.browser.find_element_by_id("move_button").click()
-        return move_students_disambiguate_page.TeachMoveStudentsDisambiguatePage(
-            self.browser
-        )
+        self.browser.find_element(By.ID, "move_button").click()
+        return move_students_disambiguate_page.TeachMoveStudentsDisambiguatePage(self.browser)

portal/tests/pageObjects/portal/teach/onboarding_classes_page.py

@@ -1,5 +1,7 @@
 from __future__ import absolute_import
 
+from selenium.webdriver.common.by import By
+
 from . import onboarding_students_page
 from .teach_base_page import TeachBasePage
 
@@ -11,9 +13,9 @@ class OnboardingClassesPage(TeachBasePage):
         assert self.on_correct_page("onboarding_classes_page")
 
     def create_class(self, name, classmate_progress):
-        self.browser.find_element_by_id("id_class_name").send_keys(name)
+        self.browser.find_element(By.ID, "id_class_name").send_keys(name)
         if classmate_progress:
-            self.browser.find_element_by_id("id_classmate_progress").click()
+            self.browser.find_element(By.ID, "id_classmate_progress").click()
 
         self._click_create_class_button()
 
@@ -25,7 +27,7 @@ class OnboardingClassesPage(TeachBasePage):
         return self
 
     def _click_create_class_button(self):
-        self.browser.find_element_by_id("create_class_button").click()
+        self.browser.find_element(By.ID, "create_class_button").click()
 
     def does_not_have_classes(self):
         return self.element_does_not_exist_by_id("add_students")

portal/tests/pageObjects/portal/teach/onboarding_organisation_page.py

@@ -1,11 +1,9 @@
 from __future__ import absolute_import
 
-import time
-
+from selenium.webdriver.common.by import By
 from selenium.webdriver.support.ui import Select
 
 from . import onboarding_classes_page
-from . import onboarding_revoke_request_page
 from .teach_base_page import TeachBasePage
 
 
@@ -15,13 +13,13 @@ class OnboardingOrganisationPage(TeachBasePage):
 
         assert self.on_correct_page("onboarding_organisation_page")
 
-    def create_organisation(self, name, password, postcode, country="GB"):
-        self._create_organisation(name, password, postcode, 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, postcode, country="GB"):
-        self._create_organisation(name, password, postcode, country)
+    def create_organisation_failure(self, name, country="GB"):
+        self._create_organisation(name, country)
 
         return self
 
@@ -30,58 +28,22 @@ class OnboardingOrganisationPage(TeachBasePage):
 
         return self
 
-    def join_empty_organisation(self):
-        self.browser.find_element_by_id("join-button").click()
-        self._click_join_school_button()
-
-        return self
-
-    def _create_organisation(self, name, password, postcode, country):
-        self.browser.find_element_by_id("id_name").send_keys(name)
-        self.browser.find_element_by_id("id_postcode").send_keys(postcode)
-        country_element = self.browser.find_element_by_id("id_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)
         select.select_by_value(country)
         self._click_create_school_button()
 
     def _click_create_school_button(self):
-        self.browser.find_element_by_name("create_organisation").click()
-
-    def _click_join_school_button(self):
-        self.browser.find_element_by_name("join_organisation").click()
+        self.browser.find_element(By.NAME, "create_organisation").click()
 
     def has_creation_failed(self):
         if not self.element_exists_by_css(".errorlist"):
             return False
 
         errors = (
-            self.browser.find_element_by_id("form-create-organisation")
-            .find_element_by_class_name("errorlist")
-            .text
-        )
-        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
+            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"
+        error = "There is already a school or club registered with that name and postcode"
         return error in errors
-
-    def join_organisation(self, name):
-        self.browser.find_element_by_id("join-button").click()
-        self.browser.find_element_by_id("id_fuzzy_name").send_keys(name)
-        time.sleep(1)
-        self._click_join_school_button()
-
-        if self.on_correct_page("onboarding_revoke_request_page"):
-            return onboarding_revoke_request_page.OnboardingRevokeRequestPage(
-                self.browser
-            )
-        else:
-            return self