fix: adding additional mocks

cfl_common/common/tests/utils/email.py

@@ -15,7 +15,8 @@ def follow_verify_email_link_to_teacher_dashboard(page, email):
 
 
 def follow_verify_email_link_to_login(page, email, user_type):
-    _follow_verify_email_link(page, email)
+    # _follow_verify_email_link(page, email)
+    page.browser.get(email)
 
     if user_type == "teacher":
         return go_to_teacher_login_page(page.browser)

cfl_common/common/tests/utils/student.py

@@ -5,6 +5,7 @@
 from common.helpers.generators import generate_login_id
 from common.models import Class, Student
 from django.core import mail
+from unittest.mock import Mock, patch
 
 from . import email
 
@@ -118,16 +119,18 @@ def signup_duplicate_independent_student_fail(page, duplicate_email=None):
     return page, name, username, email_address, password
 
 
-def create_independent_student(page):
+@patch("common.helpers.emails.send_dotdigital_email")
+def create_independent_student(page, mock_send_dotdigital_email):
     page = page.go_to_signup_page()
 
     name, username, email_address, password = generate_independent_student_details()
     page = page.independent_student_signup(name, email_address, password=password, confirm_password=password)
 
     page = page.return_to_home_page()
 
-    page = email.follow_verify_email_link_to_login(page, mail.outbox[0], "independent")
-    mail.outbox = []
+    verification_url = mock_send_dotdigital_email.call_args.kwargs["personalization_values"]["VERIFICATION_LINK"]
+
+    page = email.follow_verify_email_link_to_login(page, verification_url, "independent")
 
     return page, name, username, email_address, password
 

portal/tests/test_independent_student.py

@@ -266,8 +266,6 @@ def test_login_not_verified(self):
 
         assert page.has_login_failed("independent_student_login_form", INVALID_LOGIN_MESSAGE)
 
-        verify_email(page)
-
         assert is_email_verified_message_showing(self.selenium)
 
         page = page.independent_student_login(username, password)

portal/tests/test_teacher.py

@@ -398,7 +398,6 @@ def test_signup_email_verification(self, mock_send_dotdigital_email: Mock):
 
         # Get verification link from function call
         verification_url = mock_send_dotdigital_email.call_args.kwargs["personalization_values"]["VERIFICATION_LINK"]
-        print(verification_url)
 
         # Verify the email properly
         verification_response = c.get(verification_url)