codeforlife-portal 6.41.5__py2.py3-none-any.whl → 6.41.6__py2.py3-none-any.whl

cfl_common/common/migrations/0030_add_maintenance_banner.py

@@ -22,6 +22,4 @@ class Migration(migrations.Migration):
 
     dependencies = [("common", "0029_dynamicelement")]
 
-    operations = [
-        migrations.RunPython(add_maintenance_banner, remove_maintenance_banner)
-    ]
+    operations = [migrations.RunPython(add_maintenance_banner, remove_maintenance_banner)]

cfl_common/common/migrations/0031_improve_admin_panel.py

@@ -7,32 +7,50 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('common', '0030_add_maintenance_banner'),
+        ("common", "0030_add_maintenance_banner"),
     ]
 
     operations = [
         migrations.AlterModelOptions(
-            name='dailyactivity',
-            options={'verbose_name_plural': 'Daily activities'},
+            name="dailyactivity",
+            options={"verbose_name_plural": "Daily activities"},
         ),
         migrations.AlterField(
-            model_name='student',
-            name='blocked_time',
+            model_name="student",
+            name="blocked_time",
             field=models.DateTimeField(blank=True, null=True),
         ),
         migrations.AlterField(
-            model_name='student',
-            name='class_field',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='students', to='common.class'),
+            model_name="student",
+            name="class_field",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="students",
+                to="common.class",
+            ),
         ),
         migrations.AlterField(
-            model_name='student',
-            name='pending_class_request',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='class_request', to='common.class'),
+            model_name="student",
+            name="pending_class_request",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="class_request",
+                to="common.class",
+            ),
         ),
         migrations.AlterField(
-            model_name='teacher',
-            name='school',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='teacher_school', to='common.school'),
+            model_name="teacher",
+            name="school",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="teacher_school",
+                to="common.school",
+            ),
         ),
     ]

cfl_common/common/migrations/0032_dailyactivity_level_control_submits.py

@@ -6,13 +6,13 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('common', '0031_improve_admin_panel'),
+        ("common", "0031_improve_admin_panel"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='dailyactivity',
-            name='level_control_submits',
+            model_name="dailyactivity",
+            name="level_control_submits",
             field=models.PositiveBigIntegerField(default=0),
         ),
     ]

cfl_common/common/migrations/0033_password_reset_tracking_fields.py

@@ -6,18 +6,18 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('common', '0032_dailyactivity_level_control_submits'),
+        ("common", "0032_dailyactivity_level_control_submits"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='dailyactivity',
-            name='daily_indy_lockout_reset',
+            model_name="dailyactivity",
+            name="daily_indy_lockout_reset",
             field=models.PositiveIntegerField(default=0),
         ),
         migrations.AddField(
-            model_name='dailyactivity',
-            name='daily_teacher_lockout_reset',
+            model_name="dailyactivity",
+            name="daily_teacher_lockout_reset",
             field=models.PositiveIntegerField(default=0),
         ),
     ]

cfl_common/common/migrations/0034_dailyactivity_daily_school_student_lockout_reset.py

@@ -6,13 +6,13 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('common', '0033_password_reset_tracking_fields'),
+        ("common", "0033_password_reset_tracking_fields"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='dailyactivity',
-            name='daily_school_student_lockout_reset',
+            model_name="dailyactivity",
+            name="daily_school_student_lockout_reset",
             field=models.PositiveIntegerField(default=0),
         ),
     ]

cfl_common/common/migrations/0035_rename_lockout_fields.py

@@ -5,23 +5,23 @@ from django.db import migrations
 
 class Migration(migrations.Migration):
     dependencies = [
-        ('common', '0034_dailyactivity_daily_school_student_lockout_reset'),
+        ("common", "0034_dailyactivity_daily_school_student_lockout_reset"),
     ]
 
     operations = [
         migrations.RenameField(
-            model_name='dailyactivity',
-            old_name='daily_indy_lockout_reset',
-            new_name='indy_lockout_resets',
+            model_name="dailyactivity",
+            old_name="daily_indy_lockout_reset",
+            new_name="indy_lockout_resets",
         ),
         migrations.RenameField(
-            model_name='dailyactivity',
-            old_name='daily_school_student_lockout_reset',
-            new_name='school_student_lockout_resets',
+            model_name="dailyactivity",
+            old_name="daily_school_student_lockout_reset",
+            new_name="school_student_lockout_resets",
         ),
         migrations.RenameField(
-            model_name='dailyactivity',
-            old_name='daily_teacher_lockout_reset',
-            new_name='teacher_lockout_resets',
+            model_name="dailyactivity",
+            old_name="daily_teacher_lockout_reset",
+            new_name="teacher_lockout_resets",
         ),
     ]

cfl_common/common/migrations/0037_migrate_email_verification.py

@@ -7,13 +7,13 @@ class Migration(migrations.Migration):
     ]
 
     def forwards(apps, schema_editor):
-        """ Finds the users of verified Email Verification objects and sets their `is_verified` to True """
+        """Finds the users of verified Email Verification objects and sets their `is_verified` to True"""
         UserProfile = apps.get_model("common", "UserProfile")
         db_alias = schema_editor.connection.alias
         UserProfile.objects.using(db_alias).filter(user__email_verifications__verified=True).update(is_verified=True)
 
     def backwards(apps, schema_editor):
-        """ Finds the users of verified Email Verification objects and sets their `is_verified` to False """
+        """Finds the users of verified Email Verification objects and sets their `is_verified` to False"""
         UserProfile = apps.get_model("common", "UserProfile")
         db_alias = schema_editor.connection.alias
         UserProfile.objects.using(db_alias).filter(user__email_verifications__verified=True).update(is_verified=False)

cfl_common/common/migrations/0038_delete_emailverification.py

@@ -6,11 +6,11 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('common', '0037_migrate_email_verification'),
+        ("common", "0037_migrate_email_verification"),
     ]
 
     operations = [
         migrations.DeleteModel(
-            name='EmailVerification',
+            name="EmailVerification",
         ),
     ]

cfl_common/common/migrations/0039_copy_email_to_username.py

@@ -15,9 +15,4 @@ class Migration(migrations.Migration):
         ("common", "0038_delete_emailverification"),
     ]
 
-    operations = [
-        migrations.RunPython(
-            code=copy_email_to_username, reverse_code=migrations.RunPython.noop
-        )
-    ]
-
+    operations = [migrations.RunPython(code=copy_email_to_username, reverse_code=migrations.RunPython.noop)]

cfl_common/common/migrations/0040_school_county.py

@@ -6,13 +6,13 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('common', '0039_copy_email_to_username'),
+        ("common", "0039_copy_email_to_username"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='school',
-            name='county',
+            model_name="school",
+            name="county",
             field=models.CharField(blank=True, max_length=50, null=True),
         ),
     ]

cfl_common/common/migrations/0042_totalactivity.py

@@ -6,20 +6,20 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('common', '0041_populate_gb_counties'),
+        ("common", "0041_populate_gb_counties"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='TotalActivity',
+            name="TotalActivity",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('teacher_registrations', models.PositiveIntegerField(default=0)),
-                ('student_registrations', models.PositiveIntegerField(default=0)),
-                ('independent_registrations', models.PositiveIntegerField(default=0)),
+                ("id", models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                ("teacher_registrations", models.PositiveIntegerField(default=0)),
+                ("student_registrations", models.PositiveIntegerField(default=0)),
+                ("independent_registrations", models.PositiveIntegerField(default=0)),
             ],
             options={
-                'verbose_name_plural': 'Total activity',
+                "verbose_name_plural": "Total activity",
             },
         ),
     ]

cfl_common/common/migrations/0044_update_activity_models.py

@@ -6,28 +6,28 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('common', '0043_add_total_activity'),
+        ("common", "0043_add_total_activity"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='dailyactivity',
-            name='anonymised_unverified_independents',
+            model_name="dailyactivity",
+            name="anonymised_unverified_independents",
             field=models.PositiveIntegerField(default=0),
         ),
         migrations.AddField(
-            model_name='dailyactivity',
-            name='anonymised_unverified_teachers',
+            model_name="dailyactivity",
+            name="anonymised_unverified_teachers",
             field=models.PositiveIntegerField(default=0),
         ),
         migrations.AddField(
-            model_name='totalactivity',
-            name='anonymised_unverified_independents',
+            model_name="totalactivity",
+            name="anonymised_unverified_independents",
             field=models.PositiveIntegerField(default=0),
         ),
         migrations.AddField(
-            model_name='totalactivity',
-            name='anonymised_unverified_teachers',
+            model_name="totalactivity",
+            name="anonymised_unverified_teachers",
             field=models.PositiveIntegerField(default=0),
         ),
     ]

cfl_common/common/migrations/0045_otp.py

@@ -6,18 +6,18 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('common', '0044_update_activity_models'),
+        ("common", "0044_update_activity_models"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='userprofile',
-            name='last_otp_for_time',
+            model_name="userprofile",
+            name="last_otp_for_time",
             field=models.DateTimeField(blank=True, null=True),
         ),
         migrations.AddField(
-            model_name='userprofile',
-            name='otp_secret',
+            model_name="userprofile",
+            name="otp_secret",
             field=models.CharField(blank=True, max_length=40, null=True),
         ),
     ]

cfl_common/common/migrations/0046_alter_school_country.py

@@ -7,13 +7,13 @@ import django_countries.fields
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('common', '0045_otp'),
+        ("common", "0045_otp"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='school',
-            name='country',
+            model_name="school",
+            name="country",
             field=django_countries.fields.CountryField(blank=True, max_length=2, null=True),
         ),
     ]

cfl_common/common/tests/utils/email.py

@@ -2,20 +2,14 @@ import re
 from builtins import str
 
 
-def follow_verify_email_link_to_onboarding(page, email):
-    _follow_verify_email_link(page, email)
+def follow_verify_email_link_to_onboarding(page, url):
+    page.browser.get(url)
 
     return go_to_teacher_login_page(page.browser)
 
 
-def follow_verify_email_link_to_teacher_dashboard(page, email):
-    _follow_verify_email_link(page, email)
-
-    return go_to_teacher_dashboard_page(page.browser)
-
-
-def follow_verify_email_link_to_login(page, email, user_type):
-    _follow_verify_email_link(page, email)
+def follow_verify_email_link_to_login(page, url, user_type):
+    page.browser.get(url)
 
     if user_type == "teacher":
         return go_to_teacher_login_page(page.browser)
@@ -32,15 +26,6 @@ def follow_duplicate_account_link_to_login(page, email, user_type):
         return go_to_independent_student_login_page(page.browser)
 
 
-def _follow_verify_email_link(page, email):
-    message = str(email.message())
-    prefix = '<p>Please go to <a href="'
-    i = str.find(message, prefix) + len(prefix)
-    suffix = '" rel="nofollow">'
-    j = str.find(message, suffix, i)
-    page.browser.get(message[i:j])
-
-
 def _follow_duplicate_account_email_link(page, email):
     message = str(email.message())
     prefix = 'please login: <a href="'
@@ -55,32 +40,25 @@ def follow_reset_email_link(browser, email):
     link = re.search("http.+/", message).group(0)[:-1]
     browser.get(link)
 
-    from portal.tests.pageObjects.portal.password_reset_form_page import PasswordResetPage
+    from portal.tests.pageObjects.portal.password_reset_form_page import (
+        PasswordResetPage,
+    )
 
     return PasswordResetPage(browser)
 
 
-def follow_change_email_link_to_dashboard(page, email):
-    _follow_change_email_link(page, email)
+def follow_change_email_link_to_dashboard(page, url):
+    page.browser.get(url)
 
     return go_to_teacher_login_page(page.browser)
 
 
-def follow_change_email_link_to_independent_dashboard(page, email):
-    _follow_change_email_link(page, email)
+def follow_change_email_link_to_independent_dashboard(page, url):
+    page.browser.get(url)
 
     return go_to_independent_student_login_page(page.browser)
 
 
-def _follow_change_email_link(page, email):
-    message = str(email.message())
-    prefix = "please go to "
-    i = str.find(message, prefix) + len(prefix)
-    suffix = " to verify"
-    j = str.find(message, suffix, i)
-    page.browser.get(message[i:j])
-
-
 def go_to_teacher_login_page(browser):
     from portal.tests.pageObjects.portal.teacher_login_page import TeacherLoginPage
 
@@ -94,6 +72,8 @@ def go_to_teacher_dashboard_page(browser):
 
 
 def go_to_independent_student_login_page(browser):
-    from portal.tests.pageObjects.portal.independent_login_page import IndependentStudentLoginPage
+    from portal.tests.pageObjects.portal.independent_login_page import (
+        IndependentStudentLoginPage,
+    )
 
     return IndependentStudentLoginPage(browser)

cfl_common/common/tests/utils/student.py

@@ -1,5 +1,6 @@
 from builtins import range
 from typing import Tuple
+from unittest.mock import patch
 
 from common.helpers.emails import generate_token
 from common.helpers.generators import generate_login_id
@@ -118,7 +119,8 @@ 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()
@@ -126,16 +128,14 @@ def create_independent_student(page):
 
     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"]
 
-    return page, name, username, email_address, password
+    page = email.follow_verify_email_link_to_login(page, verification_url, "independent")
 
+    return page, name, username, email_address, password
 
-def verify_email(page):
-    assert len(mail.outbox) > 0
 
-    page = email.follow_verify_email_link_to_login(page, mail.outbox[0], "independent")
-    mail.outbox = []
+def verify_email(page, verification_url):
+    page = email.follow_verify_email_link_to_login(page, verification_url, "independent")
 
     return page

cfl_common/common/tests/utils/teacher.py

@@ -1,5 +1,6 @@
 import random
 import sys
+from unittest.mock import patch
 
 from common.helpers.emails import generate_token
 from common.models import Teacher
@@ -47,7 +48,8 @@ def signup_duplicate_teacher_fail(page, duplicate_email):
     return page, email_address, password
 
 
-def signup_teacher(page, newsletter=False):
+@patch("common.helpers.emails.send_dotdigital_email")
+def signup_teacher(page, mock_send_dotdigital_email, newsletter=False):
     page = page.go_to_signup_page()
 
     first_name, last_name, email_address, password = generate_details()
@@ -57,16 +59,14 @@ def signup_teacher(page, newsletter=False):
 
     page = page.return_to_home_page()
 
-    page = email.follow_verify_email_link_to_onboarding(page, mail.outbox[0])
-    mail.outbox = []
+    verification_url = mock_send_dotdigital_email.call_args.kwargs["personalization_values"]["VERIFICATION_LINK"]
 
-    return page, email_address, password
+    page = email.follow_verify_email_link_to_onboarding(page, verification_url)
 
+    return page, email_address, password
 
-def verify_email(page):
-    assert len(mail.outbox) > 0
 
-    page = email.follow_verify_email_link_to_login(page, mail.outbox[0], "teacher")
-    mail.outbox = []
+def verify_email(page, verification_url):
+    page = email.follow_verify_email_link_to_login(page, verification_url, "teacher")
 
     return page

{codeforlife_portal-6.41.5.dist-info → codeforlife_portal-6.41.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codeforlife-portal
-Version: 6.41.5
+Version: 6.41.6
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Framework :: Django
@@ -25,7 +25,7 @@ Requires-Dist: sqlparse ==0.4.4
 Requires-Dist: libsass ==0.22.0
 Requires-Dist: phonenumbers ==8.12.12
 Requires-Dist: more-itertools ==8.7.0
-Requires-Dist: cfl-common ==6.41.5
+Requires-Dist: cfl-common ==6.41.6
 Requires-Dist: django-ratelimit ==3.0.1
 Requires-Dist: django-preventconcurrentlogins ==0.8.2
 Requires-Dist: django-csp ==3.7