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

portal/tests/test_class.py

@@ -2,10 +2,12 @@ from __future__ import absolute_import
 
 from datetime import datetime, timedelta
 
-from aimmo.models import Game
 from common.models import Class, DailyActivity, Teacher
 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_school_student_directly
 from common.tests.utils.teacher import signup_teacher_directly
 from django.test import Client, TestCase
@@ -19,26 +21,6 @@ from .utils.messages import is_class_created_message_showing
 
 
 class TestClass(TestCase):
-    def test_class_deletion_deletes_game(self):
-        email, password = signup_teacher_directly()
-        create_organisation_directly(email)
-        klass, _, access_code = create_class_directly(email, "class 1")
-        teacher: Teacher = Teacher.objects.get(new_user__email=email)
-        c = Client()
-        c.login(username=email, password=password)
-        assert Class.objects.filter(teacher=teacher).count() == 1
-
-        # create a game
-        response = c.post(reverse("teacher_aimmo_dashboard"), {"game_class": klass.pk})
-        assert response.status_code == 302
-        assert Game.objects.filter(game_class__teacher=teacher, is_archived=False).count() == 1
-
-        # try do delete class and see if game is also gone
-        delete_url = reverse("teacher_delete_class", kwargs={"access_code": access_code})
-        c.post(delete_url)
-        assert Class.objects.filter(teacher=teacher).count() == 0
-        assert Game.objects.filter(game_class__teacher=teacher, is_archived=True).count() == 1
-
     def test_delete_class(self):
         email1, password1 = signup_teacher_directly()
         email2, password2 = signup_teacher_directly()
@@ -48,7 +30,9 @@ class TestClass(TestCase):
 
         c = Client()
 
-        url = reverse("teacher_delete_class", kwargs={"access_code": access_code})
+        url = reverse(
+            "teacher_delete_class", kwargs={"access_code": access_code}
+        )
 
         # Login as another teacher, try to delete the class and check for 404
         c.login(username=email2, password=password2)
@@ -152,19 +136,93 @@ class TestClass(TestCase):
         old_daily_activity = DailyActivity(date=old_date)
         old_daily_activity.save()
 
-        url = reverse("teacher_edit_class", kwargs={"access_code": access_code1})
+        url = reverse(
+            "teacher_edit_class", kwargs={"access_code": access_code1}
+        )
         # POST request data for locking only the first level
         data = {
-            "Getting Started": ["2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"],
+            "Getting Started": [
+                "2",
+                "3",
+                "4",
+                "5",
+                "6",
+                "7",
+                "8",
+                "9",
+                "10",
+                "11",
+                "12",
+            ],
             "Shortest Route": ["13", "14", "15", "16", "17", "18"],
-            "Loops and Repetitions": ["19", "20", "21", "22", "23", "24", "25", "26", "27", "28"],
+            "Loops and Repetitions": [
+                "19",
+                "20",
+                "21",
+                "22",
+                "23",
+                "24",
+                "25",
+                "26",
+                "27",
+                "28",
+            ],
             "Loops with Conditions": ["29", "30", "31", "32"],
-            "If... Only": ["33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43"],
+            "If... Only": [
+                "33",
+                "34",
+                "35",
+                "36",
+                "37",
+                "38",
+                "39",
+                "40",
+                "41",
+                "42",
+                "43",
+            ],
             "Traffic Lights": ["44", "45", "46", "47", "48", "49", "50"],
-            "Limited Blocks": ["53", "78", "79", "80", "81", "82", "83", "84", "54", "55"],
+            "Limited Blocks": [
+                "53",
+                "78",
+                "79",
+                "80",
+                "81",
+                "82",
+                "83",
+                "84",
+                "54",
+                "55",
+            ],
             "Procedures": ["85", "52", "60", "86", "62", "87", "61"],
-            "Blockly Brain Teasers": ["56", "57", "58", "59", "88", "91", "90", "89", "110", "111", "112", "92"],
-            "Introduction to Python": ["93", "63", "64", "65", "94", "66", "67", "68", "95", "69", "96", "97"],
+            "Blockly Brain Teasers": [
+                "56",
+                "57",
+                "58",
+                "59",
+                "88",
+                "91",
+                "90",
+                "89",
+                "110",
+                "111",
+                "112",
+                "92",
+            ],
+            "Introduction to Python": [
+                "93",
+                "63",
+                "64",
+                "65",
+                "94",
+                "66",
+                "67",
+                "68",
+                "95",
+                "69",
+                "96",
+                "97",
+            ],
             "Python": [
                 "98",
                 "70",
@@ -203,21 +261,99 @@ class TestClass(TestCase):
         assert str(messages[0]) == "Your level preferences have been saved."
 
         # test the old analytic stays the same and the new one is incremented
-        assert DailyActivity.objects.get(date=old_date).level_control_submits == 0
-        assert DailyActivity.objects.get(date=datetime.now()).level_control_submits == 1
+        assert (
+            DailyActivity.objects.get(date=old_date).level_control_submits == 0
+        )
+        assert (
+            DailyActivity.objects.get(date=datetime.now()).level_control_submits
+            == 1
+        )
 
         # Resubmitting to unlock level 1
         data = {
-            "Getting Started": ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"],
+            "Getting Started": [
+                "1",
+                "2",
+                "3",
+                "4",
+                "5",
+                "6",
+                "7",
+                "8",
+                "9",
+                "10",
+                "11",
+                "12",
+            ],
             "Shortest Route": ["13", "14", "15", "16", "17", "18"],
-            "Loops and Repetitions": ["19", "20", "21", "22", "23", "24", "25", "26", "27", "28"],
+            "Loops and Repetitions": [
+                "19",
+                "20",
+                "21",
+                "22",
+                "23",
+                "24",
+                "25",
+                "26",
+                "27",
+                "28",
+            ],
             "Loops with Conditions": ["29", "30", "31", "32"],
-            "If... Only": ["33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43"],
+            "If... Only": [
+                "33",
+                "34",
+                "35",
+                "36",
+                "37",
+                "38",
+                "39",
+                "40",
+                "41",
+                "42",
+                "43",
+            ],
             "Traffic Lights": ["44", "45", "46", "47", "48", "49", "50"],
-            "Limited Blocks": ["53", "78", "79", "80", "81", "82", "83", "84", "54", "55"],
+            "Limited Blocks": [
+                "53",
+                "78",
+                "79",
+                "80",
+                "81",
+                "82",
+                "83",
+                "84",
+                "54",
+                "55",
+            ],
             "Procedures": ["85", "52", "60", "86", "62", "87", "61"],
-            "Blockly Brain Teasers": ["56", "57", "58", "59", "88", "91", "90", "89", "110", "111", "112", "92"],
-            "Introduction to Python": ["93", "63", "64", "65", "94", "66", "67", "68", "95", "69", "96", "97"],
+            "Blockly Brain Teasers": [
+                "56",
+                "57",
+                "58",
+                "59",
+                "88",
+                "91",
+                "90",
+                "89",
+                "110",
+                "111",
+                "112",
+                "92",
+            ],
+            "Introduction to Python": [
+                "93",
+                "63",
+                "64",
+                "65",
+                "94",
+                "66",
+                "67",
+                "68",
+                "95",
+                "69",
+                "96",
+                "97",
+            ],
             "Python": [
                 "98",
                 "70",
@@ -270,7 +406,9 @@ class TestClass(TestCase):
 
         c = Client()
 
-        url = reverse("teacher_edit_class", kwargs={"access_code": access_code1})
+        url = reverse(
+            "teacher_edit_class", kwargs={"access_code": access_code1}
+        )
         data = {"new_teacher": teacher2.id, "class_move_submit": ""}
 
         # Login as first teacher and transfer class to the second teacher
@@ -297,7 +435,12 @@ class TestClassFrontend(BaseTest):
     def test_create(self):
         email, password = signup_teacher_directly()
         create_organisation_directly(email)
-        page = self.go_to_homepage().go_to_teacher_login_page().login_no_class(email, password).open_classes_tab()
+        page = (
+            self.go_to_homepage()
+            .go_to_teacher_login_page()
+            .login_no_class(email, password)
+            .open_classes_tab()
+        )
 
         assert page.does_not_have_classes()
 
@@ -312,19 +455,34 @@ class TestClassFrontend(BaseTest):
         join_teacher_to_organisation(email2, school.name)
 
         # Check teacher 2 doesn't have any classes
-        page = self.go_to_homepage().go_to_teacher_login_page().login(email2, password2).open_classes_tab()
+        page = (
+            self.go_to_homepage()
+            .go_to_teacher_login_page()
+            .login(email2, password2)
+            .open_classes_tab()
+        )
         assert page.does_not_have_classes()
         page.logout()
 
         # Log in as the first teacher and create a class for the second one
-        page = self.go_to_homepage().go_to_teacher_login_page().login(email1, password1).open_classes_tab()
+        page = (
+            self.go_to_homepage()
+            .go_to_teacher_login_page()
+            .login(email1, password1)
+            .open_classes_tab()
+        )
         page, class_name = create_class(page, teacher_id=teacher2.id)
         page = TeachClassPage(page.browser)
         assert is_class_created_message_showing(self.selenium, class_name)
         page.logout()
 
         # Check teacher 2 now has the class
-        page = self.go_to_homepage().go_to_teacher_login_page().login(email2, password2).open_classes_tab()
+        page = (
+            self.go_to_homepage()
+            .go_to_teacher_login_page()
+            .login(email2, password2)
+            .open_classes_tab()
+        )
         assert page.has_classes()
 
     def test_create_dashboard(self):
@@ -333,7 +491,12 @@ class TestClassFrontend(BaseTest):
         klass, name, access_code = create_class_directly(email)
         create_school_student_directly(access_code)
 
-        page = self.go_to_homepage().go_to_teacher_login_page().login(email, password).open_classes_tab()
+        page = (
+            self.go_to_homepage()
+            .go_to_teacher_login_page()
+            .login(email, password)
+            .open_classes_tab()
+        )
 
         page, class_name = create_class(page)
 
@@ -349,7 +512,12 @@ class TestClassFrontend(BaseTest):
         klass_2, class_name_2, access_code_2 = create_class_directly(email_2)
         create_school_student_directly(access_code_2)
 
-        page = self.go_to_homepage().go_to_teacher_login_page().login(email_2, password_2).open_classes_tab()
+        page = (
+            self.go_to_homepage()
+            .go_to_teacher_login_page()
+            .login(email_2, password_2)
+            .open_classes_tab()
+        )
 
         page, class_name_3 = create_class(page)
 

portal/tests/test_independent_student.py

@@ -1,7 +1,6 @@
 from __future__ import absolute_import
 
 import datetime
-import time
 from unittest.mock import ANY, Mock, patch
 
 from common.mail import campaign_ids
@@ -28,7 +27,6 @@ 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 (
@@ -658,13 +656,6 @@ class TestIndependentStudentFrontend(BaseTest):
         assert student2.pending_class_request is None
         assert student2.is_independent()
 
-    def test_cannot_see_aimmo(self):
-        page = self.go_to_homepage()
-        page, _, username, _, password = create_independent_student(page)
-        page = page.independent_student_login(username, password)
-
-        assert page.element_does_not_exist_by_link_text("Kurono")
-
     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()

portal/tests/test_partials.py

@@ -1,4 +1,3 @@
-import pytest
 from django.template import Context, Template
 
 
@@ -12,7 +11,9 @@ def test_banner(snapshot):
     }
 
     context = Context({"BANNER": test_banner})
-    template_to_render = Template("{% load banner_tags %}" '{% banner banner_name="BANNER" %}')
+    template_to_render = Template(
+        "{% load banner_tags %}" '{% banner banner_name="BANNER" %}'
+    )
     rendered_template = template_to_render.render(context)
 
     snapshot.assert_match(rendered_template)
@@ -22,7 +23,9 @@ def test_headline(snapshot):
     test_headline = {"title": "Test title", "description": "Test description"}
 
     context = Context({"HEADLINE": test_headline})
-    template_to_render = Template("{% load headline_tags %}" '{% headline headline_name="HEADLINE" %}')
+    template_to_render = Template(
+        "{% load headline_tags %}" '{% headline headline_name="HEADLINE" %}'
+    )
     rendered_template = template_to_render.render(context)
 
     snapshot.assert_match(rendered_template)
@@ -57,56 +60,3 @@ def test_benefits(snapshot):
     rendered_template = template_to_render.render(context)
 
     snapshot.assert_match(rendered_template)
-
-
-def test_hero_card(snapshot):
-    test_hero_card = {
-        "image": "images/worksheets/future_active.png",
-        "title": "Test title",
-        "description": "Test description",
-        "button1": {"text": "Test button 1", "url": "https://www.codeforlife.education"},
-        "button2": {"text": "Test button 2", "url": "kurono/play", "url_args": 1},
-    }
-
-    context = Context({"HERO_CARD": test_hero_card})
-
-    template_to_render = Template("{% load hero_card_tags %}" "{% hero_card hero_card_name='HERO_CARD' %}")
-
-    rendered_template = template_to_render.render(context)
-
-    snapshot.assert_match(rendered_template)
-
-
-def test_card_list(snapshot):
-    test_card_list = {
-        "cards": [
-            {"image": "images/worksheets/future2.jpg", "title": "Test card 1", "description": "Test description 1"},
-            {"image": "images/worksheets/ancient.jpg", "title": "Test card 2", "description": "Test description 2"},
-            {"image": "images/worksheets/modern_day.jpg", "title": "Test card 3", "description": "Test description 3"},
-            {"image": "images/worksheets/prehistory.jpg", "title": "Test card 4", "description": "Test description 4"},
-            {
-                "image": "images/worksheets/broken_future.jpg",
-                "title": "Test card 5",
-                "description": "Test description 5",
-            },
-        ]
-    }
-
-    context = Context({"CARD_LIST": test_card_list})
-
-    template_to_render = Template("{% load card_list_tags %}" "{% card_list %}")
-
-    rendered_template = template_to_render.render(context)
-
-    snapshot.assert_match(rendered_template)
-
-
-@pytest.mark.django_db
-def test_character_list(snapshot):
-    context = Context()
-
-    template_to_render = Template("{% load character_list_tags %}" "{% character_list %}")
-
-    rendered_template = template_to_render.render(context)
-
-    snapshot.assert_match(rendered_template)