codeforlife-portal 6.41.4__tar.gz → 6.41.6__tar.gz

{codeforlife-portal-6.41.4/codeforlife_portal.egg-info → codeforlife-portal-6.41.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codeforlife-portal
-Version: 6.41.4
+Version: 6.41.6
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Framework :: Django

{codeforlife-portal-6.41.4 → codeforlife-portal-6.41.6/codeforlife_portal.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codeforlife-portal
-Version: 6.41.4
+Version: 6.41.6
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Framework :: Django

{codeforlife-portal-6.41.4 → codeforlife-portal-6.41.6}/codeforlife_portal.egg-info/requires.txt

@@ -18,7 +18,7 @@ sqlparse==0.4.4
 libsass==0.22.0
 phonenumbers==8.12.12
 more-itertools==8.7.0
-cfl-common==6.41.4
+cfl-common==6.41.6
 django-ratelimit==3.0.1
 django-preventconcurrentlogins==0.8.2
 django-csp==3.7

codeforlife-portal-6.41.6/portal/__init__.py

@@ -0,0 +1 @@
+__version__ = "6.41.6"

{codeforlife-portal-6.41.4 → codeforlife-portal-6.41.6}/portal/tests/test_independent_student.py

@@ -2,11 +2,16 @@ from __future__ import absolute_import
 
 import datetime
 import time
+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.organisation import (
+    create_organisation_directly,
+    join_teacher_to_organisation,
+)
 from common.tests.utils.student import (
     create_independent_student,
     create_independent_student_directly,
@@ -137,7 +142,8 @@ class TestIndependentStudent(TestCase):
         # Assert response isn't a redirect (submit failure)
         assert response.status_code == 200
 
-    def test_signup_under_13_sends_parent_email(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(
@@ -156,8 +162,9 @@ class TestIndependentStudent(TestCase):
         )
 
         assert response.status_code == 302
-        assert len(mail.outbox) == 1
-        assert mail.outbox[0].subject == "Code for Life account request"
+        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
@@ -256,16 +263,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)
 
+        errors = page.has_login_failed("independent_student_login_form", INVALID_LOGIN_MESSAGE)
         assert page.has_login_failed("independent_student_login_form", INVALID_LOGIN_MESSAGE)
 
-        verify_email(page)
+        verification_url = mock_send_dotdigital_email.call_args.kwargs["personalization_values"]["VERIFICATION_LINK"]
+
+        verify_email(page, verification_url)
 
         assert is_email_verified_message_showing(self.selenium)
 
@@ -340,7 +351,8 @@ class TestIndependentStudentFrontend(BaseTest):
             "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_email, password = create_independent_student(homepage)
@@ -354,9 +366,9 @@ 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 == "Email address update"
-        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()
@@ -372,9 +384,9 @@ 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 == "Email address update"
-        mail.outbox = []
+        mock_send_dotdigital_email.assert_called_with(
+            campaign_ids["email_change_notification"], ANY, personalization_values=ANY
+        )
 
         page = (
             self.go_to_homepage()
@@ -402,11 +414,12 @@ class TestIndependentStudentFrontend(BaseTest):
 
         page = page.logout()
 
-        subject = str(mail.outbox[0].subject)
-        assert subject == "Email address update"
+        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_independent_dashboard(page, mail.outbox[1])
-        mail.outbox = []
+        page = email_utils.follow_change_email_link_to_independent_dashboard(page, verification_url)
 
         page = page.independent_student_login(new_email, password)
 

{codeforlife-portal-6.41.4 → codeforlife-portal-6.41.6}/portal/tests/test_ratelimit.py

@@ -2,10 +2,12 @@ from __future__ import absolute_import
 
 import re
 from datetime import datetime, timedelta
+from unittest.mock import ANY, Mock, patch
 
 import pytest
 import pytz
-from common.models import Teacher, Student, DailyActivity
+from common.mail import campaign_ids
+from common.models import DailyActivity, Student, Teacher
 from common.tests.utils.classes import create_class_directly
 from common.tests.utils.organisation import create_organisation_directly
 from common.tests.utils.student import (
@@ -13,11 +15,10 @@ from common.tests.utils.student import (
     create_school_student_directly,
     generate_independent_student_details,
 )
-from common.tests.utils.teacher import signup_teacher_directly, generate_details
+from common.tests.utils.teacher import generate_details, signup_teacher_directly
 from django.core import mail
 from django.test import Client, TestCase
-from django.urls import reverse
-from django.urls import reverse_lazy
+from django.urls import reverse, reverse_lazy
 
 from portal.helpers.ratelimit import get_ratelimit_count_for_user
 from portal.views.login import has_user_lockout_expired
@@ -432,8 +433,9 @@ class TestRatelimit(TestCase):
         assert current_daily_activity.school_student_lockout_resets == 2
 
 
+@patch("common.helpers.emails.send_dotdigital_email")
 @pytest.mark.django_db
-def test_teacher_already_registered_email(client):
+def test_teacher_already_registered_email(mock_send_dotdigital_email: Mock, client):
     first_name, last_name, email, password = generate_details()
     register_url = reverse("register")
     data = {
@@ -448,19 +450,20 @@ def test_teacher_already_registered_email(client):
 
     # Register the teacher first time, there should be a registration email
     client.post(register_url, data)
-    assert len(mail.outbox) == 1
+    mock_send_dotdigital_email.assert_called_once_with(campaign_ids["verify_new_user"], ANY, personalization_values=ANY)
 
     # Register with the same email again, there should also be an already registered email
     client.post(register_url, data)
-    assert len(mail.outbox) == 2
+    assert len(mail.outbox) == 1
 
     # Register with the same email one more time, there shouldn't be any new emails
     client.post(register_url, data)
-    assert len(mail.outbox) == 2
+    assert len(mail.outbox) == 1
 
 
+@patch("common.helpers.emails.send_dotdigital_email")
 @pytest.mark.django_db
-def test_independent_student_already_registered_email(client):
+def test_independent_student_already_registered_email(mock_send_dotdigital_email: Mock, client):
     name, username, email_address, password = generate_independent_student_details()
     register_url = reverse("register")
     data = {
@@ -477,12 +480,12 @@ def test_independent_student_already_registered_email(client):
 
     # Register the independent student first time, there should be a registration email
     client.post(register_url, data)
-    assert len(mail.outbox) == 1
+    mock_send_dotdigital_email.assert_called_once_with(campaign_ids["verify_new_user"], ANY, personalization_values=ANY)
 
     # Register with the same email again, there should also be an already registered email
     client.post(register_url, data)
-    assert len(mail.outbox) == 2
+    assert len(mail.outbox) == 1
 
     # Reset mock and register with the same email one more time, there shouldn't be any new emails
     client.post(register_url, data)
-    assert len(mail.outbox) == 2
+    assert len(mail.outbox) == 1

{codeforlife-portal-6.41.4 → codeforlife-portal-6.41.6}/portal/tests/test_teacher.py

@@ -1,17 +1,24 @@
 from __future__ import absolute_import
 
-import re
 import time
 from datetime import timedelta
+from unittest.mock import ANY, Mock, patch
 from uuid import uuid4
 
 import jwt
 from aimmo.models import Game
+from common.mail import campaign_ids
 from common.models import Class, Student, Teacher
 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_directly, create_school_student_directly
+from common.tests.utils.organisation import (
+    create_organisation_directly,
+    join_teacher_to_organisation,
+)
+from common.tests.utils.student import (
+    create_independent_student_directly,
+    create_school_student_directly,
+)
 from common.tests.utils.teacher import (
     signup_duplicate_teacher_fail,
     signup_teacher,
@@ -357,7 +364,8 @@ class TestTeacher(TestCase):
         # Assert response isn't a redirect (submit failure)
         assert response.status_code == 200
 
-    def test_signup_email_verification(self):
+    @patch("common.helpers.emails.send_dotdigital_email")
+    def test_signup_email_verification(self, mock_send_dotdigital_email: Mock):
         c = Client()
 
         response = c.post(
@@ -374,7 +382,9 @@ class TestTeacher(TestCase):
         )
 
         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
         fake_token = jwt.encode(
@@ -393,9 +403,8 @@ class TestTeacher(TestCase):
         # 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)
@@ -472,7 +481,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)
@@ -484,7 +494,9 @@ class TestTeacherFrontend(BaseTest):
 
         assert page.has_login_failed("form-login-teacher", INVALID_LOGIN_MESSAGE)
 
-        verify_email(page)
+        verification_url = mock_send_dotdigital_email.call_args.kwargs["personalization_values"]["VERIFICATION_LINK"]
+
+        verify_email(page, verification_url)
 
         assert is_email_verified_message_showing(self.selenium)
 
@@ -537,7 +549,8 @@ class TestTeacherFrontend(BaseTest):
 
         assert page.check_account_details({"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)
@@ -553,9 +566,9 @@ class TestTeacherFrontend(BaseTest):
         assert self.is_email_verification_page(page)
         assert is_email_updated_message_showing(self.selenium)
 
-        subject = str(mail.outbox[0].subject)
-        assert subject == "Email address update"
-        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()
@@ -566,9 +579,9 @@ class TestTeacherFrontend(BaseTest):
         assert self.is_email_verification_page(page)
         assert is_email_updated_message_showing(self.selenium)
 
-        subject = str(mail.outbox[0].subject)
-        assert subject == "Email address update"
-        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()
@@ -586,11 +599,12 @@ class TestTeacherFrontend(BaseTest):
 
         page = page.logout()
 
-        subject = str(mail.outbox[0].subject)
-        assert subject == "Email address update"
+        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, mail.outbox[1])
-        mail.outbox = []
+        page = email_utils.follow_change_email_link_to_dashboard(page, verification_url)
 
         page = page.login(new_email, password).open_account_tab()
 

{codeforlife-portal-6.41.4 → codeforlife-portal-6.41.6}/portal/tests/test_teacher_student.py

@@ -1,11 +1,15 @@
 from __future__ import absolute_import
 
 import json
+from unittest.mock import Mock, patch
 
 import pytest
 from common.models import JoinReleaseStudent
 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.organisation import (
+    create_organisation_directly,
+    join_teacher_to_organisation,
+)
 from common.tests.utils.student import (
     create_many_school_students,
     create_school_student,
@@ -528,7 +532,8 @@ class TestTeacherStudentFrontend(BaseTest):
         page = page.logout().go_to_teacher_login_page().login(email_2, password_2).open_classes_tab().go_to_class_page()
         assert page.student_exists(student_name_1)
 
-    def test_dismiss(self):
+    @patch("common.helpers.emails.send_dotdigital_email")
+    def test_dismiss(self, mock_send_dotdigital_email: Mock):
         email, password = signup_teacher_directly()
         create_organisation_directly(email)
         _, _, access_code = create_class_directly(email)
@@ -557,7 +562,10 @@ class TestTeacherStudentFrontend(BaseTest):
         assert len(logs) == 1
         assert logs[0].action_type == JoinReleaseStudent.RELEASE
 
-    def test_multiple_dismiss(self):
+        mock_send_dotdigital_email.assert_called()
+
+    @patch("common.helpers.emails.send_dotdigital_email")
+    def test_multiple_dismiss(self, mock_send_dotdigital_email: Mock):
         email, password = signup_teacher_directly()
         create_organisation_directly(email)
         _, _, access_code = create_class_directly(email)
@@ -597,3 +605,5 @@ class TestTeacherStudentFrontend(BaseTest):
 
         # student should still exist
         assert page.student_exists(student_name_2)
+
+        mock_send_dotdigital_email.assert_called()