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

portal/tests/test_organisation.py

@@ -1,8 +1,8 @@
 from __future__ import absolute_import
 
-from builtins import range
+import time
 
-from common.tests.utils import email as email_utils
+from common.models import Teacher
 from common.tests.utils.classes import create_class_directly
 from common.tests.utils.organisation import (
     create_organisation,
@@ -10,11 +10,12 @@ from common.tests.utils.organisation import (
     join_teacher_to_organisation,
 )
 from common.tests.utils.student import create_school_student_directly
-from common.tests.utils.teacher import generate_details, signup_teacher_directly
-from django.core import mail
+from common.tests.utils.teacher import signup_teacher_directly
+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
 
@@ -24,202 +25,64 @@ class TestOrganisation(BaseTest, BasePage):
         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)
-        )
-
-        page, name, postcode = create_organisation(page, password)
-        assert is_organisation_created_message_showing(self.selenium, name)
-
-    def test_join_empty(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)
-            .join_empty_organisation()
-        )
-
-        assert page.__class__.__name__ == "OnboardingOrganisationPage"
-
-    def test_create_clash(self):
-        email_1, _ = signup_teacher_directly()
-        email_2, password_2 = signup_teacher_directly()
-        name, postcode = create_organisation_directly(email_1)
-
-        self.selenium.get(self.live_server_url)
-        page = (
-            HomePage(self.selenium)
-            .go_to_teacher_login_page()
-            .login_no_school(email_2, password_2)
-            .create_organisation_failure(name, password_2, postcode)
-        )
+        page = HomePage(self.selenium).go_to_teacher_login_page().login_no_school(email, password)
 
-        assert page.has_creation_failed()
+        school_name = "My School"
+        page.create_organisation(school_name)
+        assert is_organisation_created_message_showing(self.selenium, school_name)
 
-    def test_create_invalid_postcode(self):
+    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)
-        )
-
-        page = page.create_organisation_failure("School", password, "   ")
-        assert page.was_postcode_invalid()
-
-    def test_revoke(self):
-        email_1, _ = signup_teacher_directly()
-        email_2, password_2 = signup_teacher_directly()
-        name, postcode = create_organisation_directly(email_1)
-
-        self.selenium.get(self.live_server_url)
-        page = (
-            HomePage(self.selenium)
-            .go_to_teacher_login_page()
-            .login_no_school(email_2, password_2)
-        )
-        page = page.join_organisation(name)
-        assert page.__class__.__name__ == "OnboardingRevokeRequestPage"
-        assert page.check_organisation_name(name, postcode)
-
-        page = page.revoke_join()
-        assert page.__class__.__name__ == "OnboardingOrganisationPage"
-
-    def test_allow_join(self):
-        email_1, password_1 = signup_teacher_directly()
-        email_2, password_2 = signup_teacher_directly()
-        name, postcode = create_organisation_directly(email_1)
-        _, class_name, access_code = create_class_directly(email_1)
-        create_school_student_directly(access_code)
-
-        self.selenium.get(self.live_server_url)
-        page = (
-            HomePage(self.selenium)
-            .go_to_teacher_login_page()
-            .login_no_school(email_2, password_2)
-            .join_organisation(name)
-        )
-
-        assert page.__class__.__name__ == "OnboardingRevokeRequestPage"
-
-        page = page.logout().go_to_teacher_login_page().login(email_1, password_1)
-
-        assert page.has_join_request(email_2)
-        page = page.accept_join_request()
-
-        assert not page.has_join_request(email_2)
-
-        page = (
-            page.logout().go_to_teacher_login_page().login_no_class(email_2, password_2)
-        )
-
-        assert page.__class__.__name__ == "OnboardingClassesPage"
-
-    def test_deny_join(self):
-        email_1, password_1 = signup_teacher_directly()
-        email_2, password_2 = signup_teacher_directly()
-        name, _ = create_organisation_directly(email_1)
-        _, _, access_code = create_class_directly(email_1)
-        create_school_student_directly(access_code)
-
-        self.selenium.get(self.live_server_url)
-        page = (
-            HomePage(self.selenium)
-            .go_to_teacher_login_page()
-            .login_no_school(email_2, password_2)
-            .join_organisation(name)
-        )
-
-        assert page.__class__.__name__ == "OnboardingRevokeRequestPage"
+        page = HomePage(self.selenium).go_to_teacher_login_page().login_no_school(email, password)
 
-        page = page.logout().go_to_teacher_login_page().login(email_1, password_1)
-
-        assert page.has_join_request(email_2)
-        page = page.deny_join_request()
-
-        assert not page.has_join_request(email_2)
-
-        page = (
-            page.logout()
-            .go_to_teacher_login_page()
-            .login_no_school(email_2, password_2)
+        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.",
         )
 
-        assert page.__class__.__name__ == "OnboardingOrganisationPage"
-
     def test_kick(self):
         email_1, password_1 = signup_teacher_directly()
-        name, _ = create_organisation_directly(email_1)
+        email_2, password_2 = signup_teacher_directly()
+        school = create_organisation_directly(email_1)
         _, _, access_code = create_class_directly(email_1)
         create_school_student_directly(access_code)
 
-        first_name, _, email_2, password_2 = generate_details()
-
-        new_last_name = "New Teacher"
+        join_teacher_to_organisation(email_2, school.name)
 
         self.selenium.get(self.live_server_url)
-        page = (
-            HomePage(self.selenium)
-            .go_to_signup_page()
-            .signup(first_name, new_last_name, email_2, password_2, password_2)
-        )
-
-        page = email_utils.follow_verify_email_link_to_onboarding(page, mail.outbox[0])
-        mail.outbox = []
-
-        page = page.login_no_school(email_2, password_2).join_organisation(name)
-
-        assert page.__class__.__name__ == "OnboardingRevokeRequestPage"
-
-        page = page.logout().go_to_teacher_login_page().login(email_1, password_1)
+        page = HomePage(self.selenium).go_to_teacher_login_page().login(email_1, password_1)
 
-        page = page.accept_join_request()
+        teacher2 = Teacher.objects.get(new_user__email=email_2)
 
-        assert page.is_teacher_in_school(new_last_name)
+        assert page.is_teacher_in_school(teacher2.new_user.last_name)
 
         page = page.click_kick_button()
         assert page.is_dialog_showing()
         page = page.confirm_dialog()
 
-        assert page.is_not_teacher_in_school(new_last_name)
+        assert page.is_not_teacher_in_school(teacher2.new_user.last_name)
 
     def test_move_classes_and_kick(self):
         email_1, password_1 = signup_teacher_directly()
-        name, _ = create_organisation_directly(email_1)
+        email_2, password_2 = signup_teacher_directly()
+        school = create_organisation_directly(email_1)
         _, _, access_code_1 = create_class_directly(email_1)
         create_school_student_directly(access_code_1)
+        _, _, access_code_2 = create_class_directly(email_2)
+        create_school_student_directly(access_code_2)
 
-        first_name, _, email_2, password_2 = generate_details()
-
-        new_last_name = "New Teacher"
+        join_teacher_to_organisation(email_2, school.name)
 
         self.selenium.get(self.live_server_url)
-        page = (
-            HomePage(self.selenium)
-            .go_to_signup_page()
-            .signup(first_name, new_last_name, email_2, password_2, password_2)
-        )
-
-        page = email_utils.follow_verify_email_link_to_onboarding(page, mail.outbox[0])
-        mail.outbox = []
-
-        page = page.login_no_school(email_2, password_2).join_organisation(name)
+        page = HomePage(self.selenium).go_to_teacher_login_page().login(email_1, password_1)
 
-        page = page.logout().go_to_teacher_login_page().login(email_1, password_1)
-
-        page = page.accept_join_request()
+        teacher2 = Teacher.objects.get(new_user__email=email_2)
 
-        assert page.is_teacher_in_school(new_last_name)
-
-        _, _, access_code_2 = create_class_directly(email_2)
-        create_school_student_directly(access_code_2)
+        assert page.is_teacher_in_school(teacher2.new_user.last_name)
 
         page = page.click_kick_button()
         assert page.is_dialog_showing()
@@ -229,40 +92,21 @@ class TestOrganisation(BaseTest, BasePage):
 
         page = page.move_and_kick()
 
-        assert page.is_not_teacher_in_school(new_last_name)
+        assert page.is_not_teacher_in_school(teacher2.new_user.last_name)
 
     def test_leave_organisation(self):
         email_1, password_1 = signup_teacher_directly()
-        name, _ = create_organisation_directly(email_1)
+        email_2, password_2 = signup_teacher_directly()
+        school = create_organisation_directly(email_1)
         _, _, access_code_1 = create_class_directly(email_1)
         create_school_student_directly(access_code_1)
-
-        first_name, _, email_2, password_2 = generate_details()
-
-        new_last_name = "New Teacher"
-
-        self.selenium.get(self.live_server_url)
-        page = (
-            HomePage(self.selenium)
-            .go_to_signup_page()
-            .signup(first_name, new_last_name, email_2, password_2, password_2)
-        )
-
-        page = email_utils.follow_verify_email_link_to_onboarding(page, mail.outbox[0])
-        mail.outbox = []
-
-        page = page.login_no_school(email_2, password_2).join_organisation(name)
-
-        page = page.logout().go_to_teacher_login_page().login(email_1, password_1)
-
-        page = page.accept_join_request()
-
-        assert page.is_teacher_in_school(new_last_name)
-
         _, class_name_2, access_code_2 = create_class_directly(email_2)
         create_school_student_directly(access_code_2)
 
-        page = page.logout().go_to_teacher_login_page().login(email_2, password_2)
+        join_teacher_to_organisation(email_2, school.name)
+
+        self.selenium.get(self.live_server_url)
+        page = HomePage(self.selenium).go_to_teacher_login_page().login(email_2, password_2)
 
         page = page.leave_organisation_with_students()
 
@@ -274,28 +118,28 @@ class TestOrganisation(BaseTest, BasePage):
 
         page = page.logout().go_to_teacher_login_page().login(email_1, password_1)
 
-        assert page.is_not_teacher_in_school(new_last_name)
+        teacher2 = Teacher.objects.get(new_user__email=email_2)
+
+        assert page.is_not_teacher_in_school(teacher2.new_user.last_name)
 
     def test_toggle_admin(self):
         email_1, password_1 = signup_teacher_directly()
         email_2, _ = signup_teacher_directly()
-        name, postcode = create_organisation_directly(email_1)
+        school = create_organisation_directly(email_1)
         _, _, access_code = create_class_directly(email_1)
         create_school_student_directly(access_code)
-        join_teacher_to_organisation(email_2, name, postcode)
+        join_teacher_to_organisation(email_2, school.name)
 
         self.selenium.get(self.live_server_url)
-        page = (
-            HomePage(self.selenium)
-            .go_to_teacher_login_page()
-            .login(email_1, password_1)
-        )
+        page = HomePage(self.selenium).go_to_teacher_login_page().login(email_1, password_1)
 
         assert page.__class__.__name__ == "TeachDashboardPage"
 
         page = page.click_make_admin_button()
-        assert page.is_dialog_showing()
-        page = page.confirm_dialog()
+        time.sleep(FADE_TIME)
+        popup_make_admin_button = page.browser.find_element(By.ID, "add_admin_button")
+        assert popup_make_admin_button.text == "Add as admin"
+        popup_make_admin_button.click()
 
         assert page.is_teacher_admin()
 
@@ -306,23 +150,22 @@ class TestOrganisation(BaseTest, BasePage):
     def test_disable_2FA(self):
         email_1, password_1 = signup_teacher_directly()
         email_2, _ = signup_teacher_directly()
-        name, postcode = create_organisation_directly(email_1)
+        school = create_organisation_directly(email_1)
         _, _, access_code = create_class_directly(email_1)
         create_school_student_directly(access_code)
-        join_teacher_to_organisation(email_2, name, postcode)
+        join_teacher_to_organisation(email_2, school.name)
 
         self.selenium.get(self.live_server_url)
-        page = (
-            HomePage(self.selenium)
-            .go_to_teacher_login_page()
-            .login(email_1, password_1)
-        )
+        page = HomePage(self.selenium).go_to_teacher_login_page().login(email_1, password_1)
 
         assert page.__class__.__name__ == "TeachDashboardPage"
 
         page = page.click_make_admin_button()
-        assert page.is_dialog_showing()
-        page = page.confirm_dialog()
+        # check if the new popup appears
+        time.sleep(FADE_TIME)
+        make_admin_button = page.browser.find_element(By.ID, "add_admin_button")
+        assert make_admin_button.text == "Add as admin"
+        make_admin_button.click()
 
         assert page.is_teacher_admin()
 
@@ -330,64 +173,45 @@ class TestOrganisation(BaseTest, BasePage):
 
         assert page.is_teacher_non_admin()
 
-    def test_multiple_schools(self):
-        # There was a bug where join requests to school 35 say would go to school 3,
-        # 62 would go to 6, etc... this test checks for that
-
-        n = 12
-
-        emails, passwords, names, postcodes = self.initialise_data(n)
-
-        for i in range(n):
-            emails[i], passwords[i] = signup_teacher_directly()
-            names[i], postcodes[i] = create_organisation_directly(emails[i])
-
+    def test_edit_details(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_no_school(email, password)
-        )
+        page = HomePage(self.selenium).go_to_teacher_login_page().login(email, password)
 
-        page = page.join_organisation(names[n - 1])
-        assert page.__class__.__name__ == "OnboardingRevokeRequestPage"
-        assert page.check_organisation_name(names[n - 1], postcodes[n - 1])
+        assert page.check_organisation_details({"name": school.name})
 
-    def initialise_data(self, n):
-        emails = ["" for i in range(n)]
-        passwords = ["" for i in range(n)]
-        names = ["" for i in range(n)]
-        postcodes = ["" for i in range(n)]
+        new_name = f"new {school.name}"
 
-        return emails, passwords, names, postcodes
+        page.change_organisation_details({"name": new_name})
+        assert page.check_organisation_details({"name": new_name})
 
-    def test_edit_details(self):
+    def test_edit_details_invalid_name(self):
         email, password = signup_teacher_directly()
-        school_name, postcode = create_organisation_directly(email)
+        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, "postcode": postcode}
-        )
+        assert page.check_organisation_details({"name": school.name})
+
+        new_name = f"<a>{school.name}</a>"
 
-        new_name = "new " + school_name
-        new_postcode = "OX2 6LE"
+        page.change_organisation_details({"name": new_name})
 
-        page.change_organisation_details({"name": new_name, "postcode": new_postcode})
-        assert page.check_organisation_details(
-            {"name": new_name, "postcode": new_postcode}
+        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()
-        school_name_1, postcode_1 = create_organisation_directly(email_1)
+        school1 = create_organisation_directly(email_1)
         create_organisation_directly(email_2)
         _, _, access_code_1 = create_class_directly(email_1)
         _, _, access_code_2 = create_class_directly(email_2)
@@ -395,18 +219,10 @@ class TestOrganisation(BaseTest, BasePage):
         create_school_student_directly(access_code_2)
 
         self.selenium.get(self.live_server_url)
-        page = (
-            HomePage(self.selenium)
-            .go_to_teacher_login_page()
-            .login(email_2, password_2)
-        )
+        page = HomePage(self.selenium).go_to_teacher_login_page().login(email_2, password_2)
 
-        assert not page.check_organisation_details(
-            {"name": school_name_1, "postcode": postcode_1}
-        )
+        assert not page.check_organisation_details({"name": school1.name})
 
-        page = page.change_organisation_details(
-            {"name": school_name_1, "postcode": postcode_1}
-        )
+        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_partials.py

@@ -1,4 +1,3 @@
-import pytest
 from django.template import Context, Template
 
 
@@ -61,90 +60,3 @@ def test_benefits(snapshot):
     rendered_template = template_to_render.render(context)
 
     snapshot.assert_match(rendered_template)
-
-
-def test_hero_card(snapshot):
-    test_hero_card = {
-        "image": "images/worksheets/future_active.png",
-        "title": "Test title",
-        "description": "Test description",
-        "button1": {
-            "text": "Test button 1",
-            "url": "https://www.codeforlife.education",
-        },
-        "button2": {"text": "Test button 2", "url": "kurono/play", "url_args": 1},
-    }
-
-    context = Context({"HERO_CARD": test_hero_card})
-
-    template_to_render = Template(
-        "{% load hero_card_tags %}" "{% hero_card hero_card_name='HERO_CARD' %}"
-    )
-
-    rendered_template = template_to_render.render(context)
-
-    snapshot.assert_match(rendered_template)
-
-
-def test_card_list(snapshot):
-    test_card_list = {
-        "cards": [
-            {
-                "image": "images/worksheets/future2.jpg",
-                "title": "Test card 1",
-                "description": "Test description 1",
-                "thumbnail_image": "images/worksheets/lock.png",
-            },
-            {
-                "image": "images/worksheets/ancient.jpg",
-                "title": "Test card 2",
-                "description": "Test description 2",
-                "thumbnail_text": "Coming Soon",
-            },
-            {
-                "image": "images/worksheets/modern_day.jpg",
-                "title": "Test card 3",
-                "description": "Test description 3",
-                "thumbnail_text": "Coming Soon",
-            },
-            {
-                "image": "images/worksheets/prehistory.jpg",
-                "title": "Test card 4",
-                "description": "Test description 4",
-                "thumbnail_text": "Coming Soon",
-            },
-            {
-                "image": "images/worksheets/broken_future.jpg",
-                "title": "Test card 5",
-                "description": "Test description 5",
-                "thumbnail_text": "Coming Soon",
-            },
-            {
-                "image": "images/worksheets/kurono_logo.svg",
-                "title": "Test card 6",
-                "button_text": "Test button",
-                "button_link": "home",
-            },
-        ]
-    }
-
-    context = Context({"CARD_LIST": test_card_list})
-
-    template_to_render = Template("{% load card_list_tags %}" "{% card_list %}")
-
-    rendered_template = template_to_render.render(context)
-
-    snapshot.assert_match(rendered_template)
-
-
-@pytest.mark.django_db
-def test_character_list(snapshot):
-    context = Context()
-
-    template_to_render = Template(
-        "{% load character_list_tags %}" "{% character_list %}"
-    )
-
-    rendered_template = template_to_render.render(context)
-
-    snapshot.assert_match(rendered_template)