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

portal/tests/test_independent_student.py

@@ -1,35 +1,41 @@
 from __future__ import absolute_import
 
-import time
+import datetime
+from unittest.mock import ANY, Mock, patch
 
+from common.mail import campaign_ids
+from common.models import JoinReleaseStudent
 from common.tests.utils import email as email_utils
 from common.tests.utils.classes import create_class_directly
 from common.tests.utils.organisation import (
     create_organisation_directly,
+    join_teacher_to_organisation,
 )
 from common.tests.utils.student import (
     create_independent_student,
     create_independent_student_directly,
     create_school_student_directly,
-    signup_duplicate_independent_student_fail,
+    generate_independent_student_details,
     verify_email,
 )
 from common.tests.utils.teacher import signup_teacher_directly
+from django.contrib.auth.models import User
 from django.core import mail
 from django.test import Client, TestCase
 from django.urls import reverse
+from selenium.webdriver.common.by import By
 from selenium.webdriver.support.wait import WebDriverWait
 
 from portal.forms.error_messages import INVALID_LOGIN_MESSAGE
 from .base_test import BaseTest
 from .pageObjects.portal.home_page import HomePage
 from .utils.messages import (
+    is_email_updated_message_showing,
     is_email_verified_message_showing,
     is_indep_student_join_request_received_message_showing,
     is_indep_student_join_request_revoked_message_showing,
-    is_student_details_updated_message_showing,
-    is_email_updated_message_showing,
     is_password_updated_message_showing,
+    is_student_details_updated_message_showing,
 )
 
 
@@ -40,10 +46,12 @@ class TestIndependentStudent(TestCase):
         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-username": "TestUsername",
                 "independent_student_signup-email": "test@email.com",
-                "independent_student_signup-is_over_required_age": "on",
+                "independent_student_signup-consent_ticked": "on",
                 "independent_student_signup-password": "pass",
                 "independent_student_signup-confirm_password": "pass",
                 "g-recaptcha-response": "something",
@@ -59,10 +67,12 @@ class TestIndependentStudent(TestCase):
         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-username": "TestUsername",
                 "independent_student_signup-email": "test@email.com",
-                "independent_student_signup-is_over_required_age": "on",
+                "independent_student_signup-consent_ticked": "on",
                 "independent_student_signup-password": "Password1",
                 "independent_student_signup-confirm_password": "Password1",
                 "g-recaptcha-response": "something",
@@ -72,16 +82,34 @@ class TestIndependentStudent(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()
 
         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-username": "TestUsername",
                 "independent_student_signup-email": "test@email.com",
-                "independent_student_signup-is_over_required_age": "on",
+                "independent_student_signup-consent_ticked": "on",
                 "independent_student_signup-password": "Password1!",
                 "independent_student_signup-confirm_password": "Password2!",
                 "g-recaptcha-response": "something",
@@ -97,12 +125,14 @@ class TestIndependentStudent(TestCase):
         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": "///",
-                "independent_student_signup-username": "TestUsername",
                 "independent_student_signup-email": "test@email.com",
-                "independent_student_signup-is_over_required_age": "on",
-                "independent_student_signup-password": "Password1!",
-                "independent_student_signup-confirm_password": "Password1!",
+                "independent_student_signup-consent_ticked": "on",
+                "independent_student_signup-password": "$RRFVBGT%6yhnmju7",
+                "independent_student_signup-confirm_password": "$RRFVBGT%6yhnmju7",
                 "g-recaptcha-response": "something",
             },
         )
@@ -110,95 +140,132 @@ class TestIndependentStudent(TestCase):
         # Assert response isn't a redirect (submit failure)
         assert response.status_code == 200
 
-    def test_signup_invalid_username_fails(self):
+    @patch("common.helpers.emails.send_dotdigital_email")
+    def test_signup_under_13_sends_parent_email(self, mock_send_dotdigital_email: Mock):
         c = Client()
 
         response = c.post(
             reverse("register"),
             {
-                "independent_student_signup-name": "Test Name",
-                "independent_student_signup-username": "///",
+                "independent_student_signup-date_of_birth_day": datetime.date.today().day,
+                "independent_student_signup-date_of_birth_month": datetime.date.today().month,
+                "independent_student_signup-date_of_birth_year": datetime.date.today().year,
+                "independent_student_signup-name": "Young person",
                 "independent_student_signup-email": "test@email.com",
-                "independent_student_signup-is_over_required_age": "on",
-                "independent_student_signup-password": "Password1!",
-                "independent_student_signup-confirm_password": "Password1!",
+                "independent_student_signup-consent_ticked": "on",
+                "independent_student_signup-password": "$RRFVBGT%6yhnmju7",
+                "independent_student_signup-confirm_password": "$RRFVBGT%6yhnmju7",
                 "g-recaptcha-response": "something",
             },
         )
 
-        # Assert response isn't a redirect (submit failure)
-        assert response.status_code == 200
+        assert response.status_code == 302
+        mock_send_dotdigital_email.assert_called_once_with(
+            campaign_ids["verify_new_user_via_parent"], ANY, personalization_values=ANY
+        )
 
 
 # Class for Selenium tests. We plan to replace these and turn them into Cypress tests
 class TestIndependentStudentFrontend(BaseTest):
-    def test_signup_without_newsletter(self):
+    @patch("portal.views.registration.send_dotdigital_email")
+    def test_delete_indy_account(self, mock_send_dotdigital_email: Mock):
         page = self.go_to_homepage()
-        page, _, _, _, _ = create_independent_student(page)
-        assert is_email_verified_message_showing(self.selenium)
+        page, _, _, email, password = create_independent_student(page)
+        page = page.independent_student_login(email, password)
+        page = page.go_to_account_page()
+
+        # save the user to check if it was anonymised
+        user = User.objects.get(email=email)
+        user_id = user.id
 
-    def test_signup_with_newsletter(self):
+        # first check if a wrong password triggers the error
+        unsubscribe_newsletter_checkbox = page.browser.find_element(By.NAME, "unsubscribe_newsletter")
+        unsubscribe_newsletter_checkbox.click()
+
+        delete_account_form = page.browser.find_element(By.NAME, "delete_password")
+        delete_account_form.send_keys("123")  # wrong password
+
+        delete_account_button = page.browser.find_element(By.ID, "delete_account_button")
+        delete_account_button.click()
+        assert (
+            page.browser.find_element(By.CSS_SELECTOR, "#form-delete-indy-account > ul > li").text
+            == "Incorrect password"
+        )
+
+        # now delete the account
+        unsubscribe_newsletter_checkbox = page.browser.find_element(By.NAME, "unsubscribe_newsletter")
+        unsubscribe_newsletter_checkbox.click()
+
+        delete_account_form = page.browser.find_element(By.NAME, "delete_password")
+        delete_account_form.send_keys(password)
+
+        delete_account_button = page.browser.find_element(By.ID, "delete_account_button")
+        delete_account_button.click()
+
+        delete_button_confirm = page.browser.find_element(By.ID, "delete_button")
+        delete_button_confirm.click()
+
+        # check if can still login to the account
+        page = self.go_to_homepage()
+        assert page.go_to_independent_student_login_page().independent_student_login_failure(email, password)
+
+        # now check if anonymised
+        assert not User.objects.get(id=user_id).is_active
+
+        # check if email has been sent
+        mock_send_dotdigital_email.assert_called_once_with(campaign_ids["delete_account"], ANY)
+
+    def test_signup_without_newsletter(self):
         page = self.go_to_homepage()
-        page, _, _, _, _ = create_independent_student(page, newsletter=True)
+        page, _, _, _, _ = create_independent_student(page)
         assert is_email_verified_message_showing(self.selenium)
 
-    def test_signup_duplicate_email_failure(self):
+    @patch("portal.views.home.send_dotdigital_email")
+    def test_signup_duplicate_email_failure(self, mock_send_dotdigital_email):
         page = self.go_to_homepage()
         page, _, _, email, _ = create_independent_student(page)
         assert is_email_verified_message_showing(self.selenium)
 
-        page = self.go_to_homepage()
-        page, _, _, _, _ = signup_duplicate_independent_student_fail(
-            page, duplicate_email=email
+        page = self.go_to_homepage().go_to_signup_page()
+
+        name, username, email_address, password = generate_independent_student_details()
+        page = page.independent_student_signup(name, email, password=password, confirm_password=password)
+        page = page.return_to_home_page()
+
+        mock_send_dotdigital_email.assert_called_once_with(
+            campaign_ids["user_already_registered"], ANY, personalization_values=ANY
         )
 
-        assert len(mail.outbox) == 1
-        assert mail.outbox[0].subject == "Code for Life: Duplicate account error"
+        login_link = mock_send_dotdigital_email.call_args.kwargs["personalization_values"]["LOGIN_URL"]
+
+        page = email_utils.follow_duplicate_account_link_to_login(page, login_link, "independent")
 
         assert self.is_login_page(page)
 
-    def test_signup_duplicate_email_with_teacher(self):
+    @patch("portal.views.home.send_dotdigital_email")
+    def test_signup_duplicate_email_with_teacher(self, mock_send_dotdigital_email: Mock):
         teacher_email, _ = signup_teacher_directly()
 
         page = self.go_to_homepage()
         page = page.go_to_signup_page()
 
+        strong_password = "£EDCVFR$5tgbnhy6"
         page = page.independent_student_signup(
-            "indy",
-            teacher_email,
-            teacher_email,
-            password="Password1!",
-            confirm_password="Password1!",
+            "indy", teacher_email, password=strong_password, confirm_password=strong_password
         )
 
-        page = page.return_to_home_page()
-
-        assert len(mail.outbox) == 1
-        assert mail.outbox[0].subject == "Code for Life: Duplicate account error"
+        page.return_to_home_page()
 
-    def test_signup_duplicate_username_failure(self):
-        username, _, _ = create_independent_student_directly()
-
-        page = self.go_to_homepage()
-        page, _, _, _, _ = signup_duplicate_independent_student_fail(
-            page, duplicate_username=username
+        mock_send_dotdigital_email.assert_called_once_with(
+            campaign_ids["user_already_registered"], ANY, personalization_values=ANY
         )
 
-        assert len(mail.outbox) == 1
-        assert mail.outbox[0].subject == "Code for Life: Username already taken"
-
-        assert self.is_login_page(page)
-
     def test_login_failure(self):
         page = self.go_to_homepage()
         page = page.go_to_independent_student_login_page()
-        page = page.independent_student_login_failure(
-            "Non existent username", "Incorrect password"
-        )
+        page = page.independent_student_login_failure("non-existent-email@codeforlife.com", "Incorrect password")
 
-        assert page.has_login_failed(
-            "independent_student_login_form", INVALID_LOGIN_MESSAGE
-        )
+        assert page.has_login_failed("independent_student_login_form", INVALID_LOGIN_MESSAGE)
 
     def test_login_success(self):
         page = self.go_to_homepage()
@@ -206,18 +273,20 @@ class TestIndependentStudentFrontend(BaseTest):
         page = page.independent_student_login(username, password)
         assert self.is_dashboard(page)
 
-    def test_login_not_verified(self):
+    @patch("common.helpers.emails.send_dotdigital_email")
+    def test_login_not_verified(self, mock_send_dotdigital_email):
         username, password, _ = create_independent_student_directly(preverified=False)
         self.selenium.get(self.live_server_url)
         page = HomePage(self.selenium)
         page = page.go_to_independent_student_login_page()
         page = page.independent_student_login_failure(username, password)
 
-        assert page.has_login_failed(
-            "independent_student_login_form", INVALID_LOGIN_MESSAGE
-        )
+        page.has_login_failed("independent_student_login_form", INVALID_LOGIN_MESSAGE)
+        assert page.has_login_failed("independent_student_login_form", 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)
 
@@ -225,17 +294,22 @@ class TestIndependentStudentFrontend(BaseTest):
 
         assert self.is_dashboard(page)
 
-    def test_reset_password(self):
+    @patch("portal.forms.registration.send_dotdigital_email")
+    def test_reset_password(self, mock_send_dotdigital_email: Mock):
         page = self.go_to_homepage()
 
         page, name, username, _, _ = create_independent_student(page)
         page = self.get_to_forgotten_password_page()
 
-        page.reset_username_submit(username)
+        page.reset_email_submit(username)
 
-        self.wait_for_email()
+        mock_send_dotdigital_email.assert_called_with(campaign_ids["reset_password"], ANY, personalization_values=ANY)
 
-        page = email_utils.follow_reset_email_link(self.selenium, mail.outbox[0])
+        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)
 
         new_password = "AnotherPassword12"
 
@@ -253,26 +327,20 @@ class TestIndependentStudentFrontend(BaseTest):
         page = page.go_to_account_page()
         assert page.check_account_details({"name": name})
 
-    def test_reset_password_fail(self):
+    @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)
 
-        fake_username = "fake_username"
-        page.reset_username_submit(fake_username)
-
-        time.sleep(5)
-
-        assert len(mail.outbox) == 0
+        mock_send_dotdigital_email.assert_not_called()
 
     def test_update_name_success(self):
         homepage = self.go_to_homepage()
 
-        play_page, name, student_username, _, password = create_independent_student(
-            homepage
-        )
+        play_page, name, student_username, _, password = create_independent_student(homepage)
 
-        page = play_page.independent_student_login(
-            student_username, password
-        ).go_to_account_page()
+        page = play_page.independent_student_login(student_username, password).go_to_account_page()
 
         assert page.check_account_details({"name": name})
 
@@ -284,9 +352,7 @@ class TestIndependentStudentFrontend(BaseTest):
     def test_update_name_failure(self):
         homepage = self.go_to_homepage()
 
-        play_page, _, student_username, _, password = create_independent_student(
-            homepage
-        )
+        play_page, _, student_username, _, password = create_independent_student(homepage)
 
         page = (
             play_page.independent_student_login(student_username, password)
@@ -296,19 +362,17 @@ class TestIndependentStudentFrontend(BaseTest):
 
         assert self.is_account_page(page)
         assert page.was_form_invalid(
-            "student_account_form",
-            "Names may only contain letters, numbers, dashes, underscores, and spaces.",
+            "student_account_form", "Names may only contain letters, numbers, dashes, underscores, and spaces."
         )
 
-    def test_change_email(self):
+    @patch("common.helpers.emails.send_dotdigital_email")
+    def test_change_email(self, mock_send_dotdigital_email):
         homepage = self.go_to_homepage()
 
-        _, _, student_username, _, password = create_independent_student(homepage)
+        _, _, _, student_email, password = create_independent_student(homepage)
         play_page, _, _, other_email, _ = create_independent_student(homepage)
 
-        page = play_page.independent_student_login(
-            student_username, password
-        ).go_to_account_page()
+        page = play_page.independent_student_login(student_email, password).go_to_account_page()
 
         # Try changing email to an existing email, should fail
         page = page.change_email(other_email, password)
@@ -316,16 +380,16 @@ class TestIndependentStudentFrontend(BaseTest):
         assert is_student_details_updated_message_showing(self.selenium)
         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 teacher's email
         teacher_email, _ = signup_teacher_directly()
 
         page = (
             homepage.go_to_independent_student_login_page()
-            .independent_student_login(student_username, password)
+            .independent_student_login(student_email, password)
             .go_to_account_page()
         )
 
@@ -334,14 +398,14 @@ class TestIndependentStudentFrontend(BaseTest):
         assert is_student_details_updated_message_showing(self.selenium)
         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()
             .go_to_independent_student_login_page()
-            .independent_student_login(student_username, password)
+            .independent_student_login(student_email, password)
             .go_to_account_page()
         )
 
@@ -358,31 +422,29 @@ class TestIndependentStudentFrontend(BaseTest):
         page = (
             self.go_to_homepage()
             .go_to_independent_student_login_page()
-            .independent_student_login(student_username, password)
+            .independent_student_login(student_email, password)
         )
         assert self.is_dashboard(page)
 
         page = page.logout()
 
-        page = email_utils.follow_change_email_link_to_independent_dashboard(
-            page, mail.outbox[0]
+        mock_send_dotdigital_email.assert_called_with(
+            campaign_ids["email_change_verification"], ANY, personalization_values=ANY
         )
-        mail.outbox = []
+        verification_url = mock_send_dotdigital_email.call_args.kwargs["personalization_values"]["VERIFICATION_LINK"]
 
-        page = page.independent_student_login(student_username, password)
+        page = email_utils.follow_change_email_link_to_independent_dashboard(page, verification_url)
+
+        page = page.independent_student_login(new_email, password)
 
         assert self.is_dashboard(page)
 
     def test_change_password(self):
         homepage = self.go_to_homepage()
 
-        play_page, _, student_username, _, password = create_independent_student(
-            homepage
-        )
+        play_page, _, student_username, _, password = create_independent_student(homepage)
 
-        page = play_page.independent_student_login(
-            student_username, password
-        ).go_to_account_page()
+        page = play_page.independent_student_login(student_username, password).go_to_account_page()
 
         new_password = "AnotherPassword12"
         page = page.update_password_success(new_password, password, is_independent=True)
@@ -398,9 +460,7 @@ class TestIndependentStudentFrontend(BaseTest):
     def test_join_class_nonexistent_class(self):
         homepage = self.go_to_homepage()
 
-        play_page, _, student_username, _, password = create_independent_student(
-            homepage
-        )
+        play_page, _, student_username, _, password = create_independent_student(homepage)
 
         page = (
             play_page.independent_student_login(student_username, password)
@@ -410,7 +470,7 @@ class TestIndependentStudentFrontend(BaseTest):
 
         assert self.is_join_class_page(page)
         assert page.has_join_request_failed(
-            "Cannot find the school or club and/or class"
+            "The class code you entered either does not exist or is not currently accepting join requests. Please double check that you have entered the correct class code and contact the teacher of the class to ensure their class is currently accepting join requests."
         )
 
     def test_join_class_not_accepting_requests(self):
@@ -421,9 +481,7 @@ class TestIndependentStudentFrontend(BaseTest):
 
         homepage = self.go_to_homepage()
 
-        play_page, _, student_username, _, password = create_independent_student(
-            homepage
-        )
+        play_page, _, student_username, _, password = create_independent_student(homepage)
 
         page = (
             play_page.independent_student_login(student_username, password)
@@ -433,7 +491,7 @@ class TestIndependentStudentFrontend(BaseTest):
 
         assert self.is_join_class_page(page)
         assert page.has_join_request_failed(
-            "Cannot find the school or club and/or class"
+            "The class code you entered either does not exist or is not currently accepting join requests. Please double check that you have entered the correct class code and contact the teacher of the class to ensure their class is currently accepting join requests."
         )
 
     def test_join_class_revoked(self):
@@ -446,9 +504,7 @@ class TestIndependentStudentFrontend(BaseTest):
 
         homepage = self.go_to_homepage()
 
-        play_page, _, student_username, _, password = create_independent_student(
-            homepage
-        )
+        play_page, _, student_username, _, password = create_independent_student(homepage)
 
         page = (
             play_page.independent_student_login(student_username, password)
@@ -471,17 +527,12 @@ class TestIndependentStudentFrontend(BaseTest):
         klass.save()
 
         homepage = self.go_to_homepage()
+        page = homepage.go_to_independent_student_login_page()
 
-        (
-            play_page,
-            student_name,
-            student_username,
-            _,
-            password,
-        ) = create_independent_student(homepage)
+        username, password, student = create_independent_student_directly()
 
         page = (
-            play_page.independent_student_login(student_username, password)
+            page.independent_student_login(username, password)
             .go_to_join_a_school_or_club_page()
             .join_a_school_or_club(access_code)
         )
@@ -495,11 +546,16 @@ class TestIndependentStudentFrontend(BaseTest):
             .login(teacher_email, teacher_password)
             .open_classes_tab()
             .accept_independent_join_request()
-            .save(student_name)
+            .save(username)
             .return_to_class()
         )
 
-        assert page.student_exists(student_name)
+        assert page.student_exists(username)
+
+        # check whether a record is created correctly
+        logs = JoinReleaseStudent.objects.filter(student=student)
+        assert len(logs) == 1
+        assert logs[0].action_type == JoinReleaseStudent.JOIN
 
     def test_join_class_denied(self):
         teacher_email, teacher_password = signup_teacher_directly()
@@ -511,9 +567,7 @@ class TestIndependentStudentFrontend(BaseTest):
 
         homepage = self.go_to_homepage()
 
-        play_page, _, student_username, _, password = create_independent_student(
-            homepage
-        )
+        play_page, _, student_username, _, password = create_independent_student(homepage)
 
         page = (
             play_page.independent_student_login(student_username, password)
@@ -534,20 +588,77 @@ class TestIndependentStudentFrontend(BaseTest):
 
         assert dashboard_page.has_no_independent_join_requests()
 
-    def test_cannot_see_aimmo(self):
+    def test_join_class_denied_and_accepted_by_admin(self):
+        # Create 2 teachers in the same school, one admin, one standard
+        admin_email, admin_password1 = signup_teacher_directly()
+        standard_email, _ = signup_teacher_directly()
+        school = create_organisation_directly(admin_email)
+        join_teacher_to_organisation(standard_email, school.name, is_admin=False)
+
+        # Create class for standard teacher which always accepts external requests
+        klass, class_name, access_code = create_class_directly(standard_email)
+        klass.always_accept_requests = True
+        klass.save()
+
+        # Create two independent students
+        username1, password1, student1 = create_independent_student_directly()
+        username2, password2, student2 = create_independent_student_directly()
+
+        # Login as both students and request to join the same class
+        homepage = self.go_to_homepage()
+        page = homepage.go_to_independent_student_login_page()
+
+        page = (
+            page.independent_student_login(username1, password1)
+            .go_to_join_a_school_or_club_page()
+            .join_a_school_or_club(access_code)
+        )
+
+        page.logout()
+
         page = self.go_to_homepage()
-        page, _, username, _, password = create_independent_student(page)
-        page = page.independent_student_login(username, password)
+        page = page.go_to_independent_student_login_page()
+
+        page = (
+            page.independent_student_login(username2, password2)
+            .go_to_join_a_school_or_club_page()
+            .join_a_school_or_club(access_code)
+        )
 
-        assert page.element_does_not_exist_by_link_text("Kurono")
+        page.logout()
 
-    def get_to_forgotten_password_page(self):
-        self.selenium.get(self.live_server_url)
+        # Login as school admin, accept the first request
+        page = self.go_to_homepage()
         page = (
-            HomePage(self.selenium)
-            .go_to_independent_student_login_page()
-            .go_to_indep_forgotten_password_page()
+            page.go_to_teacher_login_page()
+            .login(admin_email, admin_password1)
+            .open_classes_tab()
+            .accept_independent_join_request()
+            .save(username1)
+            .return_to_class()
         )
+
+        assert page.student_exists(username1)
+
+        # check whether a record is created correctly
+        logs = JoinReleaseStudent.objects.filter(student=student1)
+        assert len(logs) == 1
+        assert logs[0].action_type == JoinReleaseStudent.JOIN
+
+        # Deny the second request
+        page = page.go_to_dashboard().open_classes_tab().deny_independent_join_request()
+
+        assert page.has_no_independent_join_requests()
+
+        # check a record hasn't been created and the student no longer has a join request
+        logs = JoinReleaseStudent.objects.filter(student=student2)
+        assert len(logs) == 0
+        assert student2.pending_class_request is None
+        assert student2.is_independent()
+
+    def get_to_forgotten_password_page(self):
+        self.selenium.get(self.live_server_url)
+        page = HomePage(self.selenium).go_to_independent_student_login_page().go_to_indep_forgotten_password_page()
         return page
 
     def wait_for_email(self):