codeforlife-portal 6.46.1__py2.py3-none-any.whl → 7.0.0__py2.py3-none-any.whl

portal/tests/test_views.py

@@ -6,7 +6,6 @@ from unittest.mock import ANY, Mock, patch
 
 import PyPDF2
 import pytest
-from aimmo.models import Game
 from common.models import (
     Class,
     DailyActivity,
@@ -55,7 +54,9 @@ class TestTeacherViews(TestCase):
         cls.email, cls.password = signup_teacher_directly()
         cls.school = create_organisation_directly(cls.email)
         _, _, cls.class_access_code = create_class_directly(cls.email)
-        _, cls.password_student, cls.student = create_school_student_directly(cls.class_access_code)
+        _, cls.password_student, cls.student = create_school_student_directly(
+            cls.class_access_code
+        )
 
     def login(self):
         c = Client()
@@ -64,7 +65,9 @@ class TestTeacherViews(TestCase):
 
     def test_reminder_cards(self):
         c = self.login()
-        url = reverse("teacher_print_reminder_cards", args=[self.class_access_code])
+        url = reverse(
+            "teacher_print_reminder_cards", args=[self.class_access_code]
+        )
 
         # First test with 2 dummy students
         NAME1 = "Test name"
@@ -98,7 +101,9 @@ class TestTeacherViews(TestCase):
         # page number
         students_per_page = REMINDER_CARDS_PDF_ROWS * REMINDER_CARDS_PDF_COLUMNS
         for _ in range(len(studentlist), students_per_page + 1):
-            studentlist.append({"name": NAME1, "password": PASSWORD1, "login_url": URL})
+            studentlist.append(
+                {"name": NAME1, "password": PASSWORD1, "login_url": URL}
+            )
 
         assert len(studentlist) == students_per_page + 1
 
@@ -137,7 +142,9 @@ class TestTeacherViews(TestCase):
         reader = csv.reader(io.StringIO(content))
 
         access_code = self.class_access_code
-        class_url = reverse("student_login", kwargs={"access_code": access_code})
+        class_url = reverse(
+            "student_login", kwargs={"access_code": access_code}
+        )
         row0 = next(reader)
         assert row0[0].strip() == access_code
         assert class_url in row0[1].strip()
@@ -176,7 +183,9 @@ class TestTeacherViews(TestCase):
 
     def test_daily_activity_student_details(self):
         c = self.login()
-        url = reverse("teacher_print_reminder_cards", args=[self.class_access_code])
+        url = reverse(
+            "teacher_print_reminder_cards", args=[self.class_access_code]
+        )
 
         data = {
             "data": json.dumps(
@@ -224,7 +233,9 @@ class TestTeacherViews(TestCase):
 
     def test_release_verified_student(self):
         c = Client()
-        student_login_url = reverse("student_login", args=[self.class_access_code])
+        student_login_url = reverse(
+            "student_login", args=[self.class_access_code]
+        )
         response = c.post(
             student_login_url,
             {
@@ -240,7 +251,9 @@ class TestTeacherViews(TestCase):
         c.logout()
         c.login(username=self.email, password=self.password)
 
-        release_url = reverse("teacher_dismiss_students", args=[self.class_access_code])
+        release_url = reverse(
+            "teacher_dismiss_students", args=[self.class_access_code]
+        )
         response = c.post(
             release_url,
             {
@@ -277,7 +290,9 @@ class TestLoginViews(TestCase):
         teacher_email, teacher_password = signup_teacher_directly()
         create_organisation_directly(teacher_email)
         _, _, class_access_code = create_class_directly(teacher_email)
-        student_name, student_password, _ = create_school_student_directly(class_access_code)
+        student_name, student_password, _ = create_school_student_directly(
+            class_access_code
+        )
 
         return (
             teacher_email,
@@ -310,9 +325,16 @@ class TestLoginViews(TestCase):
         _, _, name, password, class_access_code = self._set_up_test_data()
 
         if next_url:
-            url = reverse("student_login", kwargs={"access_code": class_access_code}) + "?next=/"
+            url = (
+                reverse(
+                    "student_login", kwargs={"access_code": class_access_code}
+                )
+                + "?next=/"
+            )
         else:
-            url = reverse("student_login", kwargs={"access_code": class_access_code})
+            url = reverse(
+                "student_login", kwargs={"access_code": class_access_code}
+            )
 
         c = Client()
         response = c.post(url, {"username": name, "password": password})
@@ -351,7 +373,9 @@ class TestLoginViews(TestCase):
 
     def _get_user_class(self, name, class_access_code):
         klass = Class.objects.get(access_code=class_access_code)
-        students = Student.objects.filter(new_user__first_name__iexact=name, class_field=klass)
+        students = Student.objects.filter(
+            new_user__first_name__iexact=name, class_field=klass
+        )
         assert len(students) == 1
         user = students[0].new_user
         return user, klass
@@ -393,7 +417,9 @@ class TestLoginViews(TestCase):
         _, _, name, password, class_access_code = self._set_up_test_data()
 
         c = Client()
-        url = reverse("student_login", kwargs={"access_code": class_access_code})
+        url = reverse(
+            "student_login", kwargs={"access_code": class_access_code}
+        )
         c.post(url, {"username": name, "password": password})
 
         # check if there's a UserSession data within the last 10 secs
@@ -414,7 +440,9 @@ class TestLoginViews(TestCase):
         randomname = "randomname"
 
         c = Client()
-        url = reverse("student_login", kwargs={"access_code": class_access_code})
+        url = reverse(
+            "student_login", kwargs={"access_code": class_access_code}
+        )
         c.post(url, {"username": randomname, "password": "xx"})
 
         # check if there's a UserSession data within the last 10 secs
@@ -440,7 +468,9 @@ class TestLoginViews(TestCase):
 
     def test_student_direct_login(self):
         _, _, _, _, class_access_code = self._set_up_test_data()
-        student, login_id, _, _ = create_student_with_direct_login(class_access_code)
+        student, login_id, _, _ = create_student_with_direct_login(
+            class_access_code
+        )
 
         c = Client()
         assert c.login(user_id=student.new_user.id, login_id=login_id) == True
@@ -543,7 +573,8 @@ class TestViews(TestCase):
             "total_available_score": 2040,
         }
 
-        # Expected context data when a student has also attempted some custom RR levels
+        # Expected context data when a student has also attempted some custom RR
+        # levels
         EXPECTED_DATA_WITH_CUSTOM_ATTEMPTS = {
             "num_completed": 2,
             "num_top_scores": 1,
@@ -553,22 +584,12 @@ class TestViews(TestCase):
             "total_custom_available_score": 20,
         }
 
-        # Expected context data when a student also has access to a Kurono game
-        EXPECTED_DATA_WITH_KURONO_GAME = {
-            "num_completed": 2,
-            "num_top_scores": 1,
-            "total_score": 39,
-            "total_available_score": 2040,
-            "total_custom_score": 10,
-            "total_custom_available_score": 20,
-            "worksheet_id": 3,
-            "worksheet_image": "images/worksheets/ancient.jpg",
-        }
-
         c = Client()
 
         # Login and check initial data
-        url = reverse("student_login", kwargs={"access_code": class_access_code})
+        url = reverse(
+            "student_login", kwargs={"access_code": class_access_code}
+        )
         c.post(url, {"username": student_name, "password": student_password})
 
         student_dashboard_url = reverse("student_details")
@@ -589,9 +610,9 @@ class TestViews(TestCase):
         assert response.status_code == 200
         assert response.context_data == EXPECTED_DATA_WITH_ATTEMPTS
 
-        # Teacher creates 3 custom levels, only shares the first 2 with the student.
-        # Check that the total available score only includes the levels shared with the
-        # student. Student attempts one level only.
+        # Teacher creates 3 custom levels, only shares the first 2 with the
+        # student. Check that the total available score only includes the
+        # levels shared with the student. Student attempts one level only.
         custom_level1_id = create_save_level(student.class_field.teacher)
         custom_level2_id = create_save_level(student.class_field.teacher)
         create_save_level(student.class_field.teacher)
@@ -608,15 +629,6 @@ class TestViews(TestCase):
         assert response.status_code == 200
         assert response.context_data == EXPECTED_DATA_WITH_CUSTOM_ATTEMPTS
 
-        # Link Kurono game to student's class
-        game = Game(game_class=klass, worksheet_id=3)
-        game.save()
-
-        response = c.get(student_dashboard_url)
-
-        assert response.status_code == 200
-        assert response.context_data == EXPECTED_DATA_WITH_KURONO_GAME
-
     @patch("portal.views.registration.send_dotdigital_email")
     def test_delete_account(self, mock_send_dotdigital_email: Mock):
         email, password = signup_teacher_directly()
@@ -647,7 +659,9 @@ class TestViews(TestCase):
 
         # try again with the correct password
         url = reverse("delete_account")
-        response = c.post(url, {"password": password, "unsubscribe_newsletter": "on"})
+        response = c.post(
+            url, {"password": password, "unsubscribe_newsletter": "on"}
+        )
 
         assert response.status_code == 302
         mock_send_dotdigital_email.assert_called_once()
@@ -729,7 +743,9 @@ class TestViews(TestCase):
 
         school_id = school.id
         school_name = school.name
-        teachers = Teacher.objects.filter(school=school).order_by("new_user__last_name", "new_user__first_name")
+        teachers = Teacher.objects.filter(school=school).order_by(
+            "new_user__last_name", "new_user__first_name"
+        )
         assert len(teachers) == 3
 
         # one of the remaining teachers should be admin (the second in our case, as it's alphabetical)
@@ -760,7 +776,9 @@ class TestViews(TestCase):
         self.assertEqual(mock_send_dotdigital_email.call_count, 2)
 
         # 2 teachers left
-        teachers = Teacher.objects.filter(school=school).order_by("new_user__last_name", "new_user__first_name")
+        teachers = Teacher.objects.filter(school=school).order_by(
+            "new_user__last_name", "new_user__first_name"
+        )
         assert len(teachers) == 2
 
         # teacher2 should still be admin, teacher4 is not passed admin role because there is teacher2
@@ -772,7 +790,9 @@ class TestViews(TestCase):
         # delete teacher4
         anonymise(user4)
 
-        teachers = Teacher.objects.filter(school=school).order_by("new_user__last_name", "new_user__first_name")
+        teachers = Teacher.objects.filter(school=school).order_by(
+            "new_user__last_name", "new_user__first_name"
+        )
         assert len(teachers) == 1
         u = User.objects.get(id=usrid2)
         assert u.new_teacher.is_admin
@@ -830,13 +850,17 @@ class TestViews(TestCase):
         c.logout()
 
     @patch("common.helpers.emails.send_dotdigital_email")
-    def test_registrations_increment_data(self, mock_send_dotdigital_email: Mock):
+    def test_registrations_increment_data(
+        self, mock_send_dotdigital_email: Mock
+    ):
         c = Client()
 
         total_activity = TotalActivity.objects.get(id=1)
         teacher_registration_count = total_activity.teacher_registrations
         student_registration_count = total_activity.student_registrations
-        independent_registration_count = total_activity.independent_registrations
+        independent_registration_count = (
+            total_activity.independent_registrations
+        )
 
         response = c.post(
             reverse("register"),
@@ -856,7 +880,10 @@ class TestViews(TestCase):
 
         total_activity = TotalActivity.objects.get(id=1)
 
-        assert total_activity.teacher_registrations == teacher_registration_count + 1
+        assert (
+            total_activity.teacher_registrations
+            == teacher_registration_count + 1
+        )
 
         response = c.post(
             reverse("register"),
@@ -878,7 +905,10 @@ class TestViews(TestCase):
 
         total_activity = TotalActivity.objects.get(id=1)
 
-        assert total_activity.independent_registrations == independent_registration_count + 1
+        assert (
+            total_activity.independent_registrations
+            == independent_registration_count + 1
+        )
 
         teacher_email, teacher_password = signup_teacher_directly()
         create_organisation_directly(teacher_email)
@@ -894,7 +924,10 @@ class TestViews(TestCase):
 
         total_activity = TotalActivity.objects.get(id=1)
 
-        assert total_activity.student_registrations == student_registration_count + 3
+        assert (
+            total_activity.student_registrations
+            == student_registration_count + 3
+        )
 
 
 # CRON view tests
@@ -913,8 +946,12 @@ class CronTestClient(APIClient):
         secure=False,
         **extra,
     ):
-        wsgi_response = super().generic(method, path, data, content_type, secure, **extra)
-        assert 200 <= wsgi_response.status_code < 300, f"Response has error status code: {wsgi_response.status_code}"
+        wsgi_response = super().generic(
+            method, path, data, content_type, secure, **extra
+        )
+        assert (
+            200 <= wsgi_response.status_code < 300
+        ), f"Response has error status code: {wsgi_response.status_code}"
 
         return wsgi_response
 
@@ -933,7 +970,9 @@ class TestUser(CronTestCase):
         indy_email, _, _ = create_independent_student_directly()
 
         self.teacher_user = User.objects.get(email=teacher_email)
-        self.teacher_user_profile = UserProfile.objects.get(user=self.teacher_user)
+        self.teacher_user_profile = UserProfile.objects.get(
+            user=self.teacher_user
+        )
 
         self.indy_user = User.objects.get(email=indy_email)
         self.indy_user_profile = UserProfile.objects.get(user=self.indy_user)
@@ -949,11 +988,17 @@ class TestUser(CronTestCase):
         assert_called: bool,
         mock_send_dotdigital_email: Mock,
     ):
-        self.teacher_user.date_joined = timezone.now() - timedelta(days=days, hours=12)
+        self.teacher_user.date_joined = timezone.now() - timedelta(
+            days=days, hours=12
+        )
         self.teacher_user.save()
-        self.student_user.date_joined = timezone.now() - timedelta(days=days, hours=12)
+        self.student_user.date_joined = timezone.now() - timedelta(
+            days=days, hours=12
+        )
         self.student_user.save()
-        self.indy_user.date_joined = timezone.now() - timedelta(days=days, hours=12)
+        self.indy_user.date_joined = timezone.now() - timedelta(
+            days=days, hours=12
+        )
         self.indy_user.save()
 
         self.teacher_user_profile.is_verified = is_verified
@@ -964,9 +1009,13 @@ class TestUser(CronTestCase):
         self.client.get(reverse(view_name))
 
         if assert_called:
-            mock_send_dotdigital_email.assert_any_call(ANY, [self.teacher_user.email], personalization_values=ANY)
+            mock_send_dotdigital_email.assert_any_call(
+                ANY, [self.teacher_user.email], personalization_values=ANY
+            )
 
-            mock_send_dotdigital_email.assert_any_call(ANY, [self.indy_user.email], personalization_values=ANY)
+            mock_send_dotdigital_email.assert_any_call(
+                ANY, [self.indy_user.email], personalization_values=ANY
+            )
 
             # Check only two emails are sent - the student should never be included.
             assert mock_send_dotdigital_email.call_count == 2
@@ -976,22 +1025,40 @@ class TestUser(CronTestCase):
         mock_send_dotdigital_email.reset_mock()
 
     def test_first_verify_email_reminder_view(self):
-        self.send_verify_email_reminder(6, False, "first-verify-email-reminder", False)
-        self.send_verify_email_reminder(7, False, "first-verify-email-reminder", True)
-        self.send_verify_email_reminder(7, True, "first-verify-email-reminder", False)
-        self.send_verify_email_reminder(8, False, "first-verify-email-reminder", False)
+        self.send_verify_email_reminder(
+            6, False, "first-verify-email-reminder", False
+        )
+        self.send_verify_email_reminder(
+            7, False, "first-verify-email-reminder", True
+        )
+        self.send_verify_email_reminder(
+            7, True, "first-verify-email-reminder", False
+        )
+        self.send_verify_email_reminder(
+            8, False, "first-verify-email-reminder", False
+        )
 
     def test_second_verify_email_reminder_view(self):
-        self.send_verify_email_reminder(13, False, "second-verify-email-reminder", False)
-        self.send_verify_email_reminder(14, False, "second-verify-email-reminder", True)
-        self.send_verify_email_reminder(14, True, "second-verify-email-reminder", False)
-        self.send_verify_email_reminder(15, False, "second-verify-email-reminder", False)
+        self.send_verify_email_reminder(
+            13, False, "second-verify-email-reminder", False
+        )
+        self.send_verify_email_reminder(
+            14, False, "second-verify-email-reminder", True
+        )
+        self.send_verify_email_reminder(
+            14, True, "second-verify-email-reminder", False
+        )
+        self.send_verify_email_reminder(
+            15, False, "second-verify-email-reminder", False
+        )
 
     def test_anonymise_unverified_accounts_view(self):
         now = timezone.now()
 
         for user in [self.teacher_user, self.indy_user, self.student_user]:
-            user.date_joined = now - timedelta(days=USER_DELETE_UNVERIFIED_ACCOUNT_DAYS + 1)
+            user.date_joined = now - timedelta(
+                days=USER_DELETE_UNVERIFIED_ACCOUNT_DAYS + 1
+            )
             user.save()
 
         for user_profile in [self.teacher_user_profile, self.indy_user_profile]:
@@ -1056,7 +1123,9 @@ class TestUser(CronTestCase):
                 new_user=indy_user,
             )
 
-            activity_today = DailyActivity.objects.get_or_create(date=datetime.now().date())[0]
+            activity_today = DailyActivity.objects.get_or_create(
+                date=datetime.now().date()
+            )[0]
             daily_teacher_count = activity_today.anonymised_unverified_teachers
             daily_indy_count = activity_today.anonymised_unverified_independents
 
@@ -1079,16 +1148,30 @@ class TestUser(CronTestCase):
             assert indy_user_active == assert_active
             assert student_user_active
 
-            activity_today = DailyActivity.objects.get_or_create(date=datetime.now().date())[0]
+            activity_today = DailyActivity.objects.get_or_create(
+                date=datetime.now().date()
+            )[0]
             total_activity = TotalActivity.objects.get(id=1)
 
             if not teacher_user_active:
-                assert activity_today.anonymised_unverified_teachers == daily_teacher_count + 1
-                assert total_activity.anonymised_unverified_teachers == total_teacher_count + 1
+                assert (
+                    activity_today.anonymised_unverified_teachers
+                    == daily_teacher_count + 1
+                )
+                assert (
+                    total_activity.anonymised_unverified_teachers
+                    == total_teacher_count + 1
+                )
 
             if not indy_user_active:
-                assert activity_today.anonymised_unverified_independents == daily_indy_count + 1
-                assert total_activity.anonymised_unverified_independents == total_indy_count + 1
+                assert (
+                    activity_today.anonymised_unverified_independents
+                    == daily_indy_count + 1
+                )
+                assert (
+                    total_activity.anonymised_unverified_independents
+                    == total_indy_count + 1
+                )
 
             teacher_user.delete()
             indy_user.delete()

portal/urls.py

@@ -1,4 +1,3 @@
-from aimmo.urls import HOMEPAGE_REGEX
 from common.permissions import teacher_verified
 from django.conf.urls import include, url
 from django.http import HttpResponse
@@ -25,8 +24,10 @@ from portal.helpers.ratelimit import (
 from portal.helpers.regexes import ACCESS_CODE_REGEX, JWT_REGEX
 from portal.views import cron
 from portal.views.about import about, contribute, getinvolved
-from portal.views.admin import AdminChangePasswordDoneView, AdminChangePasswordView
-from portal.views.aimmo.dashboard import StudentAimmoDashboard, TeacherAimmoDashboard
+from portal.views.admin import (
+    AdminChangePasswordDoneView,
+    AdminChangePasswordView,
+)
 from portal.views.api import (
     AnonymiseOrphanSchoolsView,
     InactiveUsersView,
@@ -35,7 +36,10 @@ from portal.views.api import (
     number_users_per_country,
     registered_users,
 )
-from portal.views.dotmailer import dotmailer_consent_form, process_newsletter_form
+from portal.views.dotmailer import (
+    dotmailer_consent_form,
+    process_newsletter_form,
+)
 from portal.views.email import verify_email
 from portal.views.home import (
     coding_club,
@@ -109,7 +113,9 @@ from portal.views.two_factor.profile import CustomDisableView
 js_info_dict = {"packages": ("conf.locale",)}
 
 two_factor_patterns = [
-    url(r"^account/two_factor/setup/$", CustomSetupView.as_view(), name="setup"),
+    url(
+        r"^account/two_factor/setup/$", CustomSetupView.as_view(), name="setup"
+    ),
     url(r"^account/two_factor/qrcode/$", QRGeneratorView.as_view(), name="qr"),
     url(
         r"^account/two_factor/setup/complete/$",
@@ -164,20 +170,11 @@ urlpatterns = [
             ]
         ),
     ),
-    url(HOMEPAGE_REGEX, include("aimmo.urls")),
-    url(
-        r"^teach/kurono/dashboard/$",
-        TeacherAimmoDashboard.as_view(),
-        name="teacher_aimmo_dashboard",
-    ),
-    url(
-        r"^play/kurono/dashboard/$",
-        StudentAimmoDashboard.as_view(),
-        name="student_aimmo_dashboard",
-    ),
     url(
         r"^favicon\.ico$",
-        RedirectView.as_view(url="/static/portal/img/favicon.ico", permanent=True),
+        RedirectView.as_view(
+            url="/static/portal/img/favicon.ico", permanent=True
+        ),
     ),
     url(
         r"^administration/password_change/$",
@@ -189,7 +186,9 @@ urlpatterns = [
         AdminChangePasswordDoneView.as_view(),
         name="administration_password_change_done",
     ),
-    url(r"^users/inactive/", InactiveUsersView.as_view(), name="inactive_users"),
+    url(
+        r"^users/inactive/", InactiveUsersView.as_view(), name="inactive_users"
+    ),
     url(
         r"^locked_out/$",
         TemplateView.as_view(template_name="portal/locked_out.html"),
@@ -267,7 +266,9 @@ urlpatterns = [
     url(r"^consent_form/$", dotmailer_consent_form, name="consent_form"),
     url(
         r"^verify_email/$",
-        TemplateView.as_view(template_name="portal/email_verification_needed.html"),
+        TemplateView.as_view(
+            template_name="portal/email_verification_needed.html"
+        ),
         name="email_verification",
     ),
     url(
@@ -380,7 +381,9 @@ urlpatterns = [
     url(r"^contribute", contribute, name="contribute"),
     url(r"^terms", terms, name="terms"),
     url(r"^privacy-notice/$", privacy_notice, name="privacy_notice"),
-    url(r"^privacy-policy/$", privacy_notice, name="privacy_policy"),  # Keeping this to route from old URL
+    url(
+        r"^privacy-policy/$", privacy_notice, name="privacy_policy"
+    ),  # Keeping this to route from old URL
     url(r"^teach/dashboard/$", dashboard_manage, name="dashboard"),
     url(
         r"^teach/dashboard/kick/(?P<pk>[0-9]+)/$",