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

portal/tests/test_teacher.py

@@ -1,10 +1,12 @@
 from __future__ import absolute_import
 
 import time
-import re
+from datetime import timedelta
+from unittest.mock import ANY, Mock, patch
+from uuid import uuid4
 
-from aimmo.models import Game
-from common.models import Class, Student, Teacher
+import jwt
+from common.mail import campaign_ids
 from common.tests.utils import email as email_utils
 from common.tests.utils.classes import create_class_directly
 from common.tests.utils.organisation import (
@@ -21,284 +23,29 @@ from common.tests.utils.teacher import (
     signup_teacher_directly,
     verify_email,
 )
+from django.conf import settings
 from django.core import mail
 from django.test import Client, TestCase
 from django.urls import reverse
+from django.utils import timezone
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.wait import WebDriverWait
 
 from portal.forms.error_messages import INVALID_LOGIN_MESSAGE
+from portal.tests.test_invite_teacher import WAIT_TIME
 from .base_test import BaseTest
 from .pageObjects.portal.home_page import HomePage
 from .utils.messages import (
-    is_email_verified_message_showing,
-    is_teacher_details_updated_message_showing,
     is_email_updated_message_showing,
+    is_email_verified_message_showing,
+    is_message_showing,
     is_password_updated_message_showing,
+    is_teacher_details_updated_message_showing,
 )
 
 
 class TestTeacher(TestCase):
-    def test_new_student_can_play_games(self):
-        """
-        Given a teacher has an kurono game,
-        When they add a new student to their class,
-        Then the new student should be able to play that class's games
-        """
-        email, password = signup_teacher_directly()
-        create_organisation_directly(email)
-        klass, _, access_code = create_class_directly(email)
-        create_school_student_directly(access_code)
-
-        c = Client()
-        c.login(username=email, password=password)
-        c.post(
-            reverse("teacher_aimmo_dashboard"),
-            {"game_class": klass.id},
-        )
-        c.post(
-            reverse("view_class", kwargs={"access_code": access_code}),
-            {"names": "Florian"},
-        )
-
-        game = Game.objects.get(id=1)
-        new_student = Student.objects.last()
-        assert game.can_user_play(new_student.new_user)
-
-    def test_accepted_independent_student_can_play_games(self):
-        """
-        Given an independent student requests access to a class,
-        When the teacher for that class accepts the request,
-        Then the new student should have access to that class's games
-        """
-        email, password = signup_teacher_directly()
-        create_organisation_directly(email)
-        klass, _, access_code = create_class_directly(email)
-        klass.always_accept_requests = True
-        klass.save()
-        create_school_student_directly(access_code)
-        (
-            indep_username,
-            indep_password,
-            indep_student,
-        ) = create_independent_student_directly()
-
-        c = Client()
-
-        c.login(username=indep_username, password=indep_password)
-        c.post(
-            reverse("student_join_organisation"),
-            {"access_code": access_code, "class_join_request": "Request"},
-        )
-        c.logout()
-
-        c.login(username=email, password=password)
-        c.post(
-            reverse("teacher_aimmo_dashboard"),
-            {"game_class": klass.pk},
-        )
-        c.post(
-            reverse("teacher_accept_student_request", kwargs={"pk": indep_student.pk}),
-            {"name": "Florian"},
-        )
-
-        game: Game = Game.objects.get(id=1)
-        new_student = Student.objects.last()
-        assert game.can_user_play(new_student.new_user)
-
-    def test_moved_class_has_correct_permissions_for_students_and_teachers(self):
-        """
-        Given two teachers each with a class and an aimmo game,
-        When teacher 1 transfers their class to teacher 2,
-        Then:
-            - Students in each class still only have access to their class games
-            - Teacher 2 has access to both games and teacher 1 has access to none
-        """
-
-        # Create teacher 1 -> class 1 -> student 1
-        email1, password1 = signup_teacher_directly()
-        school_name, postcode = create_organisation_directly(email1)
-        klass1, _, access_code1 = create_class_directly(email1, "Class 1")
-        create_school_student_directly(access_code1)
-
-        # Create teacher 2 -> class 2 -> student 2
-        email2, password2 = signup_teacher_directly()
-        join_teacher_to_organisation(email2, school_name, postcode)
-        klass2, _, access_code2 = create_class_directly(email2, "Class 2")
-        create_school_student_directly(access_code2)
-
-        teacher1: Teacher = Teacher.objects.get(new_user__email=email1)
-        teacher2: Teacher = Teacher.objects.get(new_user__email=email2)
-
-        c = Client()
-
-        # Create game 1 under class 1
-        c.login(username=email1, password=password1)
-        c.post(
-            reverse("teacher_aimmo_dashboard"),
-            {"game_class": klass1.pk},
-        )
-        c.logout()
-
-        # Create game 2 under class 2
-        c.login(username=email2, password=password2)
-        c.post(
-            reverse("teacher_aimmo_dashboard"),
-            {"game_class": klass2.pk},
-        )
-        c.logout()
-
-        game1: Game = Game.objects.get(owner=teacher1.new_user)
-        game2: Game = Game.objects.get(owner=teacher2.new_user)
-
-        student1: Student = Student.objects.get(class_field=klass1)
-        student2: Student = Student.objects.get(class_field=klass2)
-
-        # Check student permissions for each game
-        assert game1.can_user_play(student1.new_user)
-        assert game2.can_user_play(student2.new_user)
-        assert not game1.can_user_play(student2.new_user)
-        assert not game2.can_user_play(student1.new_user)
-
-        # Check teacher permissions for each game
-        assert game1.can_user_play(teacher1.new_user)
-        assert game2.can_user_play(teacher2.new_user)
-        assert not game1.can_user_play(teacher2.new_user)
-        assert not game2.can_user_play(teacher1.new_user)
-
-        # Transfer class 1 over to teacher 2
-        c.login(username=email1, password=password1)
-        response = c.post(
-            reverse("teacher_edit_class", kwargs={"access_code": access_code1}),
-            {"new_teacher": teacher2.pk, "class_move_submit": ""},
-        )
-        assert response.status_code == 302
-        c.logout()
-
-        # Refresh model instances
-        klass1: Class = Class.objects.get(pk=klass1.pk)
-        klass2: Class = Class.objects.get(pk=klass2.pk)
-        game1 = Game.objects.get(pk=game1.pk)
-        game2 = Game.objects.get(pk=game2.pk)
-
-        # Check teacher 2 is the teacher for class 1
-        assert klass1.teacher == teacher2
-
-        # Check that the students' permissions have not changed
-        assert game1.can_user_play(student1.new_user)
-        assert game2.can_user_play(student2.new_user)
-        assert not game1.can_user_play(student2.new_user)
-        assert not game2.can_user_play(student1.new_user)
-
-        # Check that teacher 1 cannot access class 1's game 1 anymore
-        assert not game1.can_user_play(teacher1.new_user)
-
-        # Check that teacher 2 can access game 1
-        assert game1.can_user_play(teacher2.new_user)
-
-    def test_moved_student_has_access_to_only_new_teacher_games(self):
-        """
-        Given a student in a class,
-        When a teacher transfers them to another class with a new teacher,
-        Then the student should only have access to the new teacher's games
-        """
-
-        email1, password1 = signup_teacher_directly()
-        school_name, postcode = create_organisation_directly(email1)
-        klass1, _, access_code1 = create_class_directly(email1, "Class 1")
-        create_school_student_directly(access_code1)
-
-        email2, password2 = signup_teacher_directly()
-        join_teacher_to_organisation(email2, school_name, postcode)
-        klass2, _, access_code2 = create_class_directly(email2, "Class 2")
-        create_school_student_directly(access_code2)
-
-        teacher1 = Teacher.objects.get(new_user__email=email1)
-        teacher2 = Teacher.objects.get(new_user__email=email2)
-
-        c = Client()
-        c.login(username=email2, password=password2)
-        c.post(
-            reverse("teacher_aimmo_dashboard"),
-            {"game_class": klass2.pk},
-        )
-        c.logout()
-
-        c.login(username=email1, password=password1)
-        c.post(
-            reverse("teacher_aimmo_dashboard"),
-            {"game_class": klass1.pk},
-        )
-
-        game1 = Game.objects.get(owner=teacher1.new_user)
-        game2 = Game.objects.get(owner=teacher2.new_user)
-
-        student1 = Student.objects.get(class_field=klass1)
-        student2 = Student.objects.get(class_field=klass2)
-
-        assert game1.can_user_play(student1.new_user)
-        assert game2.can_user_play(student2.new_user)
-
-        c.post(
-            reverse("teacher_move_students", kwargs={"access_code": access_code1}),
-            {"transfer_students": student1.pk},
-        )
-        c.post(
-            reverse(
-                "teacher_move_students_to_class", kwargs={"access_code": access_code1}
-            ),
-            {
-                "form-0-name": student1.user.user.first_name,
-                "form-MAX_NUM_FORMS": 1000,
-                "form-0-orig_name": student1.user.user.first_name,
-                "form-TOTAL_FORMS": 1,
-                "form-MIN_NUM_FORMS": 0,
-                "submit_disambiguation": "",
-                "form-INITIAL_FORMS": 1,
-                "new_class": klass2.pk,
-            },
-        )
-        c.logout()
-
-        game1 = Game.objects.get(owner=teacher1.new_user)
-        game2 = Game.objects.get(owner=teacher2.new_user)
-
-        assert not game1.can_user_play(student1.new_user)
-        assert game2.can_user_play(student1.new_user)
-
-    def test_teacher_cannot_create_duplicate_game(self):
-        """
-        Given a teacher, a class and a worksheet,
-        When the teacher creates a game for that class and worksheet, and then tries to
-        create the exact same game again,
-        Then the class should only have one game, and an error message should appear.
-        """
-
-        email, password = signup_teacher_directly()
-        _, _ = create_organisation_directly(email)
-        klass, _, _ = create_class_directly(email)
-
-        c = Client()
-        c.login(username=email, password=password)
-        game1_response = c.post(
-            reverse("teacher_aimmo_dashboard"),
-            {"game_class": klass.pk},
-        )
-
-        assert game1_response.status_code == 302
-        assert Game.objects.filter(game_class=klass, is_archived=False).count() == 1
-        assert klass.active_game != None
-        messages = list(game1_response.wsgi_request._messages)
-        assert len([m for m in messages if m.tags == "warning"]) == 0
-
-        game2_response = c.post(
-            reverse("teacher_aimmo_dashboard"),
-            {"game_class": klass.pk},
-        )
-
-        messages = list(game2_response.wsgi_request._messages)
-        assert len([m for m in messages if m.tags == "warning"]) == 1
-        assert messages[0].message == "An active game already exists for this class"
-
     def test_signup_short_password_fails(self):
         c = Client()
 
@@ -308,6 +55,7 @@ class TestTeacher(TestCase):
                 "teacher_signup-teacher_first_name": "Test Name",
                 "teacher_signup-teacher_last_name": "Test Last Name",
                 "teacher_signup-teacher_email": "test@email.com",
+                "teacher_signup-consent_ticked": "on",
                 "teacher_signup-teacher_password": "test",
                 "teacher_signup-teacher_confirm_password": "test",
                 "g-recaptcha-response": "something",
@@ -326,6 +74,7 @@ class TestTeacher(TestCase):
                 "teacher_signup-teacher_first_name": "Test Name",
                 "teacher_signup-teacher_last_name": "Test Last Name",
                 "teacher_signup-teacher_email": "test@email.com",
+                "teacher_signup-consent_ticked": "on",
                 "teacher_signup-teacher_password": "Password1",
                 "teacher_signup-teacher_confirm_password": "Password1",
                 "g-recaptcha-response": "something",
@@ -335,6 +84,22 @@ class TestTeacher(TestCase):
         # Assert response isn't a redirect (submit failure)
         assert response.status_code == 200
 
+        response = c.post(
+            reverse("register"),
+            {
+                "independent_student_signup-date_of_birth_day": 7,
+                "independent_student_signup-date_of_birth_month": 10,
+                "independent_student_signup-date_of_birth_year": 1997,
+                "independent_student_signup-name": "Test Name",
+                "independent_student_signup-email": "test@email.com",
+                "independent_student_signup-consent_ticked": "on",
+                "independent_student_signup-password": "Password123$",
+                "independent_student_signup-confirm_password": "Password123$",
+                "g-recaptcha-response": "something",
+            },
+        )
+        assert response.status_code == 200
+
     def test_signup_passwords_do_not_match_fails(self):
         c = Client()
 
@@ -344,6 +109,7 @@ class TestTeacher(TestCase):
                 "teacher_signup-teacher_first_name": "Test Name",
                 "teacher_signup-teacher_last_name": "Test Last Name",
                 "teacher_signup-teacher_email": "test@email.com",
+                "teacher_signup-consent_ticked": "on",
                 "teacher_signup-teacher_password": "StrongPassword1!",
                 "teacher_signup-teacher_confirm_password": "StrongPassword2!",
                 "g-recaptcha-response": "something",
@@ -353,7 +119,7 @@ class TestTeacher(TestCase):
         # Assert response isn't a redirect (submit failure)
         assert response.status_code == 200
 
-    def test_signup_email_verification(self):
+    def test_signup_fails_without_consent(self):
         c = Client()
 
         response = c.post(
@@ -368,19 +134,52 @@ class TestTeacher(TestCase):
             },
         )
 
+        # Assert response isn't a redirect (submit failure)
+        assert response.status_code == 200
+
+    @patch("common.helpers.emails.send_dotdigital_email")
+    def test_signup_email_verification(self, mock_send_dotdigital_email: Mock):
+        c = Client()
+
+        response = c.post(
+            reverse("register"),
+            {
+                "teacher_signup-teacher_first_name": "Test Name",
+                "teacher_signup-teacher_last_name": "Test Last Name",
+                "teacher_signup-teacher_email": "test@email.com",
+                "teacher_signup-consent_ticked": "on",
+                "teacher_signup-teacher_password": "czYuH)g0FbD_5E9/",
+                "teacher_signup-teacher_confirm_password": "czYuH)g0FbD_5E9/",
+                "g-recaptcha-response": "something",
+            },
+        )
+
         assert response.status_code == 302
-        assert len(mail.outbox) == 1
+        mock_send_dotdigital_email.assert_called_once_with(
+            campaign_ids["verify_new_user"], ANY, personalization_values=ANY
+        )
 
         # Try verification URL with a fake token
-        bad_url = reverse("verify_email", kwargs={"token": "abcdef"})
+        fake_token = jwt.encode(
+            {
+                "email": "fake_email",
+                "new_email": "",
+                "email_verification_token": uuid4().hex[:30],
+                "expires": (timezone.now() + timedelta(hours=1)).timestamp(),
+            },
+            settings.SECRET_KEY,
+            algorithm="HS256",
+        )
+        bad_url = reverse("verify_email", kwargs={"token": fake_token})
         bad_verification_response = c.get(bad_url)
 
         # Assert response isn't a redirect (get failure)
         assert bad_verification_response.status_code == 200
 
-        # Get verification link from email
-        message = str(mail.outbox[0].body)
-        verification_url = re.search("http.+/", message).group(0)
+        # Get verification link from function call
+        verification_url = mock_send_dotdigital_email.call_args.kwargs[
+            "personalization_values"
+        ]["VERIFICATION_LINK"]
 
         # Verify the email properly
         verification_response = c.get(verification_url)
@@ -397,6 +196,28 @@ class TestTeacher(TestCase):
 
 # Class for Selenium tests. We plan to replace these and turn them into Cypress tests
 class TestTeacherFrontend(BaseTest):
+    def test_password_too_common(self):
+        self.selenium.get(self.live_server_url)
+        page = HomePage(self.selenium).go_to_signup_page()
+        page = page.signup(
+            "first_name",
+            "last_name",
+            "e@ma.il",
+            "Password123$",
+            "Password123$",
+            success=False,
+        )
+        try:
+            submit_button = WebDriverWait(self.selenium, 10).until(
+                EC.element_to_be_clickable((By.NAME, "teacher_signup"))
+            )
+            submit_button.click()
+        except:
+            assert page.was_form_invalid(
+                "form-reg-teacher",
+                "Password is too common, consider using a different password.",
+            )
+
     def test_signup_without_newsletter(self):
         self.selenium.get(self.live_server_url)
         page = HomePage(self.selenium)
@@ -432,7 +253,9 @@ class TestTeacherFrontend(BaseTest):
         page = page.login_failure(
             "non-existent-email@codeforlife.com", "Incorrect password"
         )
-        assert page.has_login_failed("form-login-teacher", INVALID_LOGIN_MESSAGE)
+        assert page.has_login_failed(
+            "form-login-teacher", INVALID_LOGIN_MESSAGE
+        )
 
     def test_login_success(self):
         email, password = signup_teacher_directly()
@@ -445,7 +268,8 @@ class TestTeacherFrontend(BaseTest):
         page = page.login(email, password)
         assert self.is_dashboard_page(page)
 
-    def test_login_not_verified(self):
+    @patch("common.helpers.emails.send_dotdigital_email")
+    def test_login_not_verified(self, mock_send_dotdigital_email):
         email, password = signup_teacher_directly(preverified=False)
         create_organisation_directly(email)
         _, _, access_code = create_class_directly(email)
@@ -455,9 +279,15 @@ class TestTeacherFrontend(BaseTest):
         page = page.go_to_teacher_login_page()
         page = page.login_failure(email, password)
 
-        assert page.has_login_failed("form-login-teacher", INVALID_LOGIN_MESSAGE)
+        assert page.has_login_failed(
+            "form-login-teacher", INVALID_LOGIN_MESSAGE
+        )
+
+        verification_url = mock_send_dotdigital_email.call_args.kwargs[
+            "personalization_values"
+        ]["VERIFICATION_LINK"]
 
-        verify_email(page)
+        verify_email(page, verification_url)
 
         assert is_email_verified_message_showing(self.selenium)
 
@@ -472,26 +302,6 @@ class TestTeacherFrontend(BaseTest):
         page = page.login_no_school(email, password)
         assert self.is_onboarding_page(page)
 
-    def test_view_resources(self):
-        email, password = signup_teacher_directly()
-        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)
-        page = page.go_to_teacher_login_page()
-        page = page.login(email, password)
-
-        assert self.is_dashboard_page(page)
-
-        page = page.go_to_rapid_router_resources_page()
-
-        assert self.is_resources_page(page)
-
-        page = page.go_to_kurono_resources_page()
-
-        assert self.is_resources_page(page)
-
     def test_edit_details(self):
         email, password = signup_teacher_directly()
         create_organisation_directly(email)
@@ -510,7 +320,7 @@ class TestTeacherFrontend(BaseTest):
             {
                 "first_name": "Paulina",
                 "last_name": "Koch",
-                "current_password": "Password2!",
+                "current_password": "$RFVBGT%6yhn$RFVBGT%6yhn$RFVBGT%6yhn$RFVBGT%6yhn",
             }
         )
         assert self.is_dashboard_page(page)
@@ -523,10 +333,10 @@ class TestTeacherFrontend(BaseTest):
     def test_edit_details_non_admin(self):
         email_1, _ = signup_teacher_directly()
         email_2, password_2 = signup_teacher_directly()
-        name, postcode = create_organisation_directly(email_1)
+        school = create_organisation_directly(email_1)
         _, _, access_code_1 = create_class_directly(email_1)
         create_school_student_directly(access_code_1)
-        join_teacher_to_organisation(email_2, name, postcode)
+        join_teacher_to_organisation(email_2, school.name)
         _, _, access_code_2 = create_class_directly(email_2)
         create_school_student_directly(access_code_2)
 
@@ -542,7 +352,7 @@ class TestTeacherFrontend(BaseTest):
             {
                 "first_name": "Florian",
                 "last_name": "Aucomte",
-                "current_password": "Password2!",
+                "current_password": password_2,
             }
         )
         assert self.is_dashboard_page(page)
@@ -552,7 +362,8 @@ class TestTeacherFrontend(BaseTest):
             {"first_name": "Florian", "last_name": "Aucomte"}
         )
 
-    def test_change_email(self):
+    @patch("common.helpers.emails.send_dotdigital_email")
+    def test_change_email(self, mock_send_dotdigital_email):
         email, password = signup_teacher_directly()
         create_organisation_directly(email)
         _, _, access_code = create_class_directly(email)
@@ -561,32 +372,48 @@ class TestTeacherFrontend(BaseTest):
         other_email, _ = signup_teacher_directly()
 
         page = self.go_to_homepage()
-        page = page.go_to_teacher_login_page().login(email, password).open_account_tab()
+        page = (
+            page.go_to_teacher_login_page()
+            .login(email, password)
+            .open_account_tab()
+        )
 
         # Try changing email to an existing email, should fail
         page = page.change_email("Test", "Teacher", other_email, password)
         assert self.is_email_verification_page(page)
         assert is_email_updated_message_showing(self.selenium)
 
-        subject = str(mail.outbox[0].subject)
-        assert subject == "Code for Life: Duplicate account error"
-        mail.outbox = []
+        mock_send_dotdigital_email.assert_called_with(
+            campaign_ids["email_change_notification"],
+            ANY,
+            personalization_values=ANY,
+        )
 
         # Try changing email to an existing indy student's email, should fail
         indy_email, _, _ = create_independent_student_directly()
         page = self.go_to_homepage()
-        page = page.go_to_teacher_login_page().login(email, password).open_account_tab()
+        page = (
+            page.go_to_teacher_login_page()
+            .login(email, password)
+            .open_account_tab()
+        )
 
         page = page.change_email("Test", "Teacher", indy_email, password)
         assert self.is_email_verification_page(page)
         assert is_email_updated_message_showing(self.selenium)
 
-        subject = str(mail.outbox[0].subject)
-        assert subject == "Code for Life: Duplicate account error"
-        mail.outbox = []
+        mock_send_dotdigital_email.assert_called_with(
+            campaign_ids["email_change_notification"],
+            ANY,
+            personalization_values=ANY,
+        )
 
         page = self.go_to_homepage()
-        page = page.go_to_teacher_login_page().login(email, password).open_account_tab()
+        page = (
+            page.go_to_teacher_login_page()
+            .login(email, password)
+            .open_account_tab()
+        )
 
         # Try changing email to a new one, should succeed
         new_email = "another-email@codeforlife.com"
@@ -596,13 +423,27 @@ class TestTeacherFrontend(BaseTest):
 
         # Check user can still log in with old account before verifying new email
         self.selenium.get(self.live_server_url)
-        page = HomePage(self.selenium).go_to_teacher_login_page().login(email, password)
+        page = (
+            HomePage(self.selenium)
+            .go_to_teacher_login_page()
+            .login(email, password)
+        )
         assert self.is_dashboard_page(page)
 
         page = page.logout()
 
-        page = email_utils.follow_change_email_link_to_dashboard(page, mail.outbox[0])
-        mail.outbox = []
+        mock_send_dotdigital_email.assert_called_with(
+            campaign_ids["email_change_verification"],
+            ANY,
+            personalization_values=ANY,
+        )
+        verification_url = mock_send_dotdigital_email.call_args.kwargs[
+            "personalization_values"
+        ]["VERIFICATION_LINK"]
+
+        page = email_utils.follow_change_email_link_to_dashboard(
+            page, verification_url
+        )
 
         page = page.login(new_email, password).open_account_tab()
 
@@ -633,7 +474,8 @@ class TestTeacherFrontend(BaseTest):
 
         assert self.is_dashboard_page(page)
 
-    def test_reset_password(self):
+    @patch("portal.forms.registration.send_dotdigital_email")
+    def test_reset_password(self, mock_send_dotdigital_email: Mock):
         email, _ = signup_teacher_directly()
         create_organisation_directly(email)
         _, _, access_code = create_class_directly(email)
@@ -643,9 +485,17 @@ class TestTeacherFrontend(BaseTest):
 
         page.reset_email_submit(email)
 
-        self.wait_for_email()
+        mock_send_dotdigital_email.assert_called_with(
+            campaign_ids["reset_password"], ANY, personalization_values=ANY
+        )
+
+        reset_password_url = mock_send_dotdigital_email.call_args.kwargs[
+            "personalization_values"
+        ]["RESET_PASSWORD_LINK"]
 
-        page = email_utils.follow_reset_email_link(self.selenium, mail.outbox[0])
+        page = email_utils.follow_reset_email_link(
+            self.selenium, reset_password_url
+        )
 
         new_password = "AnotherPassword12!"
 
@@ -659,32 +509,280 @@ class TestTeacherFrontend(BaseTest):
         )
         assert self.is_dashboard_page(page)
 
-    def test_reset_password_fail(self):
+    @patch("portal.forms.registration.send_dotdigital_email")
+    def test_reset_with_same_password(self, mock_send_dotdigital_email: Mock):
+        email, password = signup_teacher_directly()
+        create_organisation_directly(email)
+        _, _, access_code = create_class_directly(email)
+        create_school_student_directly(access_code)
+
+        page = self.get_to_forgotten_password_page()
+
+        page.reset_email_submit(email)
+
+        mock_send_dotdigital_email.assert_called_with(
+            campaign_ids["reset_password"], ANY, personalization_values=ANY
+        )
+
+        reset_password_url = mock_send_dotdigital_email.call_args.kwargs[
+            "personalization_values"
+        ]["RESET_PASSWORD_LINK"]
+
+        page = email_utils.follow_reset_email_link(
+            self.selenium, reset_password_url
+        )
+
+        page.reset_password_fail(password)
+
+        message = page.browser.find_element(By.CLASS_NAME, "errorlist")
+        assert (
+            "Please choose a password that you haven't used before"
+            in message.text
+        )
+
+    @patch("portal.forms.registration.send_dotdigital_email")
+    def test_reset_password_fail(self, mock_send_dotdigital_email: Mock):
         page = self.get_to_forgotten_password_page()
         fake_email = "fake_email@fakeemail.com"
         page.reset_email_submit(fake_email)
 
-        time.sleep(5)
+        mock_send_dotdigital_email.assert_not_called()
+
+    def test_admin_sees_all_school_classes(self):
+        email, password = signup_teacher_directly()
+        school = create_organisation_directly(email)
+        klass, _, access_code = create_class_directly(email, "class123")
 
-        assert len(mail.outbox) == 0
+        # create non_admin account to join the school
+        # check if they cannot see classes
+        standard_email, standard_password = signup_teacher_directly()
+        join_teacher_to_organisation(standard_email, school.name)
+
+        page = (
+            self.go_to_homepage()
+            .go_to_teacher_login_page()
+            .login(standard_email, standard_password)
+            .open_classes_tab()
+        )
+
+        assert page.element_does_not_exist_by_id(f"class-code-{access_code}")
+
+        self.go_to_homepage().teacher_logout()
+        # then make an admin account and check
+        # if the teacher can see the classes
+
+        admin_email, admin_password = signup_teacher_directly()
+        join_teacher_to_organisation(admin_email, school.name, is_admin=True)
+
+        page = (
+            self.go_to_homepage()
+            .go_to_teacher_login_page()
+            .login(admin_email, admin_password)
+            .open_classes_tab()
+        )
+        class_code_field = page.browser.find_element(
+            By.ID, f"class-code-{access_code}"
+        )
+        assert class_code_field.text == access_code
+
+    def test_admin_student_edit(self):
+        email, password = signup_teacher_directly()
+        school = create_organisation_directly(email)
+
+        klass, _, access_code = create_class_directly(email, "class123")
+        (
+            student_name,
+            student_password,
+            student_student,
+        ) = create_school_student_directly(access_code)
+
+        joining_email, joining_password = signup_teacher_directly()
+        join_teacher_to_organisation(joining_email, school.name, is_admin=True)
+
+        page = (
+            self.go_to_homepage()
+            .go_to_teacher_login_page()
+            .login(joining_email, joining_password)
+            .open_classes_tab()
+        )
+
+        class_button = WebDriverWait(self.selenium, WAIT_TIME).until(
+            EC.element_to_be_clickable((By.ID, "class_button"))
+        )
+        class_button.click()
+
+        edit_student_button = WebDriverWait(self.selenium, WAIT_TIME).until(
+            EC.element_to_be_clickable((By.ID, "edit_student_button"))
+        )
+        edit_student_button.click()
+
+        title = page.browser.find_element(By.ID, "student_details")
+        assert (
+            title.text
+            == f"Edit student details for {student_name} from class {klass} ({access_code})"
+        )
+
+    def test_make_admin_popup(self):
+        email, password = signup_teacher_directly()
+        school = create_organisation_directly(email)
+        page = (
+            self.go_to_homepage()
+            .go_to_teacher_login_page()
+            .login(email, password)
+        )
+        joining_email, _ = signup_teacher_directly()
+
+        invite_data = {
+            "teacher_first_name": "Real",
+            "teacher_last_name": "Name",
+            "teacher_email": "ren@me.me",
+        }
+
+        for key in invite_data.keys():
+            field = page.browser.find_element(By.NAME, key)
+            field.send_keys(invite_data[key])
+
+        page.browser.find_element(By.NAME, "invite_teacher_button").click()
+        # Once invite sent test the make admin button
+        page.browser.find_element(By.ID, "make_admin_button_invite").click()
+        time.sleep(1)
+        page.browser.find_element(By.ID, "cancel_admin_popup_button").click()
+        time.sleep(1)
+        page.browser.find_element(By.ID, "delete-invite").click()
+
+        # Delete the invite and check if the form invite with
+        # admin checked also makes a popup
+
+        for key in invite_data.keys():
+            field = page.browser.find_element(By.NAME, key)
+            field.send_keys(invite_data[key])
+        checkbox = page.browser.find_element(By.NAME, "make_admin_ticked")
+        checkbox.click()
+
+        page.browser.find_element(By.ID, "invite_teacher_button").click()
+        time.sleep(1)
+        page.browser.find_element(By.ID, "cancel_admin_popup_button").click()
+
+        # Non admin teacher joined - make admin should also make a popup
+        join_teacher_to_organisation(joining_email, school.name)
+
+        # refresh the page and scroll to the buttons
+        time.sleep(1)
+        page.browser.find_element(By.CSS_SELECTOR, ".logo").click()
+        page.browser.find_element(By.ID, "make_admin_button").click()
+
+        assert page.element_exists((By.CLASS_NAME, "popup-box__msg"))
+
+    def test_delete_account(self):
+        FADE_TIME = 0.9  # often fails if lower
 
-    def test_onboarding_complete(self):
         email, password = signup_teacher_directly()
         create_organisation_directly(email)
-        create_class_directly(email)
 
-        student_name = "Test Student"
+        self.selenium.get(self.live_server_url)
+        page = (
+            HomePage(self.selenium)
+            .go_to_teacher_login_page()
+            .login(email, password)
+            .open_account_tab()
+        )
+
+        # test incorrect password
+        page.browser.find_element(By.ID, "id_delete_password").send_keys(
+            "IncorrectPassword"
+        )
+        page.browser.find_element(By.ID, "delete_account_button").click()
+        is_message_showing(page.browser, "Your account was not deleted")
+
+        # test cancel (no class)
+        time.sleep(FADE_TIME)
+        page.browser.find_element(By.ID, "id_delete_password").clear()
+        page.browser.find_element(By.ID, "id_delete_password").send_keys(
+            password
+        )
+        page.browser.find_element(By.ID, "delete_account_button").click()
+
+        time.sleep(FADE_TIME)
+        assert page.browser.find_element(
+            By.ID, "popup-delete-review"
+        ).is_displayed()
+        page.browser.find_element(By.ID, "cancel_popup_button").click()
+        time.sleep(FADE_TIME)
+
+        # test close button in the corner
+        page.browser.find_element(By.ID, "id_delete_password").clear()
+        page.browser.find_element(By.ID, "id_delete_password").send_keys(
+            password
+        )
+        page.browser.find_element(By.ID, "delete_account_button").click()
+
+        time.sleep(FADE_TIME)
+        page.browser.find_element(By.ID, "close_popup_button").click()
+        time.sleep(FADE_TIME)
+
+        # create class
+        _, _, access_code = create_class_directly(email)
+        create_school_student_directly(access_code)
+
+        # delete then review classes
+        page.browser.find_element(By.ID, "id_delete_password").send_keys(
+            password
+        )
+        page.browser.find_element(By.ID, "delete_account_button").click()
+
+        time.sleep(FADE_TIME)
+        assert page.browser.find_element(
+            By.ID, "popup-delete-review"
+        ).is_displayed()
+        page.browser.find_element(By.ID, "review_button").click()
+        time.sleep(FADE_TIME)
+
+        assert page.has_classes()
+        page = page.open_account_tab()
+
+        # test actual deletion
+        page.browser.find_element(By.ID, "id_delete_password").send_keys(
+            password
+        )
+        page.browser.find_element(By.ID, "delete_account_button").click()
+
+        time.sleep(FADE_TIME)
+        page.browser.find_element(By.ID, "delete_button").click()
+
+        # back to homepage
+        assert page.browser.find_element(By.CLASS_NAME, "banner--homepage")
+
+        # user should not be able to login now
+        page = (
+            HomePage(self.selenium)
+            .go_to_teacher_login_page()
+            .login_failure(email, password)
+        )
+
+        assert page.has_login_failed(
+            "form-login-teacher", INVALID_LOGIN_MESSAGE
+        )
+
+    def test_onboarding_complete(self):
+        email, password = signup_teacher_directly()
 
         self.selenium.get(self.live_server_url)
         page = (
             HomePage(self.selenium)
             .go_to_teacher_login_page()
-            .login_no_students(email, password)
-            .type_student_name(student_name)
+            .login_no_school(email, password)
+        )
+
+        page = page.create_organisation("Test school")
+        page = page.create_class("Test class", True)
+        page = (
+            page.type_student_name("Test Student")
             .create_students()
             .complete_setup()
         )
 
+        time.sleep(1)
+
         assert page.has_onboarding_complete_popup()
 
     def get_to_forgotten_password_page(self):
@@ -697,7 +795,9 @@ class TestTeacherFrontend(BaseTest):
         return page
 
     def wait_for_email(self):
-        WebDriverWait(self.selenium, 2).until(lambda driver: len(mail.outbox) == 1)
+        WebDriverWait(self.selenium, 2).until(
+            lambda driver: len(mail.outbox) == 1
+        )
 
     def is_dashboard_page(self, page):
         return page.__class__.__name__ == "TeachDashboardPage"