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

portal/tests/pageObjects/portal/kurono_teacher_dashboard_page.py

@@ -1,49 +0,0 @@
-from __future__ import absolute_import
-
-from selenium.webdriver.common.by import By
-
-from .base_page import BasePage
-
-
-class KuronoTeacherDashboardPage(BasePage):
-    def __init__(self, browser):
-        super(KuronoTeacherDashboardPage, self).__init__(browser)
-
-        assert self.on_correct_page("kurono_teacher_dashboard_page")
-
-    def create_game(self, class_id):
-        self._click_add_game_dropdown()
-
-        self.browser.find_element(By.ID, f"class_{class_id}").click()
-
-        return self
-
-    def change_game_worksheet(self, worksheet_id):
-        self._click_change_worksheet_dropdown()
-
-        self.browser.find_element(By.ID, f"worksheet_{worksheet_id}").click()
-
-        self.confirm_dialog()
-
-        return self
-
-    def delete_games(self, game_ids):
-        # Tick checkboxes
-        for game_id in game_ids:
-            self.browser.find_element(By.XPATH, f"//input[@name='game_ids' and @value='{game_id}']").click()
-
-        # Click delete
-        self.browser.find_element(By.ID, "deleteGamesButton").click()
-
-        self.confirm_dialog()
-
-        return self
-
-    def _click_change_worksheet_confirm_button(self):
-        self.browser.find_element(By.ID, "confirm_button").click()
-
-    def _click_add_game_dropdown(self):
-        self.browser.find_element(By.ID, "add_class_dropdown").click()
-
-    def _click_change_worksheet_dropdown(self):
-        self.browser.find_element(By.ID, "worksheets_dropdown").click()

portal/tests/test_aimmo_dashboards.py

@@ -1,206 +0,0 @@
-import json
-
-import pytest
-from aimmo.models import Game
-from aimmo.worksheets import WORKSHEETS
-from common.models import Class, 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.student import create_school_student_directly
-from common.tests.utils.teacher import signup_teacher_directly
-from django.test.client import Client
-from django.urls.base import reverse
-
-from .base_test import BaseTest
-from .conftest import IndependentStudent, SchoolStudent
-
-
-# @pytest.mark.django_db
-# TODO: move tests to kurono microservice and fix them.
-@pytest.mark.skip(reason="Moved game creator to Django")
-def test_student_cannot_access_teacher_dashboard(student1: SchoolStudent, class1: Class):
-    """
-    Given you are logged in as a student,
-    When you try to access the teacher dashboard,
-    Then you cannot access it and are instead redirected.
-    """
-    c = Client()
-    url = reverse("student_login", kwargs={"access_code": class1.access_code})
-    data = {"username": student1.username, "password": student1.password}
-
-    c.post(url, data)
-
-    student_dashboard_url = reverse("student_aimmo_dashboard")
-
-    response_s = c.get(student_dashboard_url)
-
-    assert response_s.status_code == 200
-
-    teacher_dashboard_url = reverse("teacher_aimmo_dashboard")
-
-    response = c.get(teacher_dashboard_url)
-
-    assert response.status_code == 302
-
-
-# @pytest.mark.django_db
-# TODO: move tests to kurono microservice and fix them.
-@pytest.mark.skip(reason="Moved game creator to Django")
-def test_indep_student_cannot_access_dashboard(
-    independent_student1: IndependentStudent,
-):
-    """
-    Given you are logged in as an independent student,
-    When you try to access the student dashboard,
-    Then you can access it but the context only has the banner.
-    """
-    c = Client()
-    url = reverse("independent_student_login")
-    data = {"username": independent_student1.username, "password": independent_student1.password}
-
-    c.post(url, data)
-
-    student_dashboard_url = reverse("student_aimmo_dashboard")
-
-    response = c.get(student_dashboard_url)
-
-    assert response.status_code == 200
-    assert "BANNER" in response.context
-    assert "HERO_CARD" not in response.context
-    assert "CARD_LIST" not in response.context
-
-
-# @pytest.mark.django_db
-# TODO: move tests to kurono microservice and fix them.
-@pytest.mark.skip(reason="Moved game creator to Django")
-def test_student_aimmo_dashboard_loads(student1: SchoolStudent, class1: Class, aimmo_game1: Game):
-    """
-    Given an aimmo game is linked to a class,
-    When a student of that class goes on the Student Kurono Dashboard page,
-    Then the page loads and the context contains the hero card and card list
-    associated to the aimmo game.
-
-    Then, given that the class no longer has a game linked to it,
-    When the student goes on the same page,
-    Then the page still loads but the context no longer contains the hero card
-    or the card list elements.
-    """
-    c = Client()
-    student_login_url = reverse("student_login", kwargs={"access_code": class1.access_code})
-    data = {"username": student1.username, "password": student1.password}
-
-    c.post(student_login_url, data)
-
-    student_dashboard_url = reverse("student_aimmo_dashboard")
-    response = c.get(student_dashboard_url)
-
-    assert response.status_code == 200
-    assert "HERO_CARD" in response.context
-    assert "CARD_LIST" in response.context
-
-    aimmo_game1.delete()
-
-    url = reverse("student_aimmo_dashboard")
-    response = c.get(url)
-
-    assert response.status_code == 200
-    assert "HERO_CARD" not in response.context
-    assert "CARD_LIST" not in response.context
-
-
-# TODO: move tests to kurono microservice and fix them.
-# Selenium tests
-# class TestAimmoDashboardFrontend(BaseTest):
-#     def test_admin_permissions_actions(self):
-#         # Create admin teacher, school and class
-#         admin_email, admin_password = signup_teacher_directly()
-#         school = create_organisation_directly(admin_email)
-#         admin_class, _, admin_access_code = create_class_directly(admin_email, "class 1")
-
-#         # create another teacher and add as not admin, create a class
-#         non_admin_email, non_admin_password = signup_teacher_directly()
-#         join_teacher_to_organisation(non_admin_email, school.name, school.postcode, is_admin=False)
-#         non_admin_class, _, non_admin_access_code = create_class_directly(non_admin_email, "class 2")
-
-#         non_admin_teacher: Teacher = Teacher.objects.get(new_user__email=non_admin_email)
-#         admin_teacher: Teacher = Teacher.objects.get(new_user__email=admin_email)
-
-#         c = Client()
-#         # check if non_admin cannot create a game for the admin
-#         c.login(username=non_admin_email, password=non_admin_password)
-#         response = c.post(reverse("teacher_aimmo_dashboard"), {"game_class": admin_class.pk})
-#         assert response.status_code == 200
-#         assert Game.objects.filter(game_class__teacher__school=school).count() == 0
-
-#         # create a game by non admin and by admin, then check if admin can delete both
-#         response = c.post(reverse("teacher_aimmo_dashboard"), {"game_class": non_admin_class.pk})
-#         assert response.status_code == 302
-#         assert Game.objects.filter(game_class__teacher=non_admin_teacher).count() == 1
-#         c.logout()
-
-#         c.login(username=admin_email, password=admin_password)
-#         response = c.post(reverse("teacher_aimmo_dashboard"), {"game_class": admin_class.pk})
-#         assert response.status_code == 302
-#         assert Game.objects.filter(game_class__teacher__school=school).count() == 2
-
-#         admin_game = Game.objects.get(game_class=admin_class)
-#         non_admin_game = Game.objects.get(game_class=non_admin_class)
-
-#         # test admin deleting games
-#         c.post(reverse("game-delete-games"), {"game_ids": admin_game.id})
-#         c.post(reverse("game-delete-games"), {"game_ids": non_admin_game.id})
-#         assert Game.objects.filter(game_class__teacher__school=school, is_archived=True).count() == 2
-#         # now make check if the non admin can delete game
-#         response = c.post(reverse("teacher_aimmo_dashboard"), {"game_class": admin_class.pk})
-#         assert response.status_code == 302
-#         assert Game.objects.filter(game_class__teacher=admin_teacher, is_archived=False).count() == 1
-#         c.logout()
-
-#         c.login(username=non_admin_email, password=non_admin_password)
-#         response = c.post(reverse("game-delete-games"), {"game_ids": admin_game.id})
-#         assert response.status_code == 204
-#         assert Game.objects.filter(game_class__teacher=admin_teacher, is_archived=False).count() == 1
-
-#     def test_worksheet_dropdown_changes_worksheet(self):
-#         teacher_email, teacher_password = signup_teacher_directly()
-#         create_organisation_directly(teacher_email)
-#         klass, class_name, access_code = create_class_directly(teacher_email)
-#         student_name, student_password, _ = create_school_student_directly(access_code)
-
-#         worksheet1 = WORKSHEETS.get(1)
-#         worksheet2 = WORKSHEETS.get(2)
-
-#         self.selenium.get(self.live_server_url)
-#         page = self.go_to_homepage().go_to_teacher_login_page().login(teacher_email, teacher_password)
-#         page = page.go_to_kurono_teacher_dashboard_page().create_game(klass.id)
-
-#         game = Game.objects.get(game_class=klass)
-
-#         assert game.worksheet == worksheet1
-
-#         page.change_game_worksheet(worksheet2.id)
-
-#         game = Game.objects.get(game_class=klass)
-
-#         assert game.worksheet == worksheet2
-
-#     def test_delete_games(self):
-#         teacher_email, teacher_password = signup_teacher_directly()
-#         create_organisation_directly(teacher_email)
-
-#         klass1, _, _ = create_class_directly(teacher_email)
-#         game1 = Game(game_class=klass1)
-#         game1.save()
-
-#         klass2, _, _ = create_class_directly(teacher_email)
-#         game2 = Game(game_class=klass2)
-#         game2.save()
-
-#         assert Game.objects.count() == 2
-
-#         self.selenium.get(self.live_server_url)
-#         page = self.go_to_homepage().go_to_teacher_login_page().login(teacher_email, teacher_password)
-#         page.go_to_kurono_teacher_dashboard_page().delete_games([game1.id, game2.id])
-
-#         assert Game.objects.filter(is_archived=False).count() == 0
-#         assert Game.objects.filter(is_archived=True).count() == 2

portal/tests/utils/aimmo_games.py

@@ -1,30 +0,0 @@
-from aimmo.models import Game
-from common.models import Class
-
-
-def generate_name():
-    name = "Game %d" % generate_name.next_id
-
-    generate_name.next_id += 1
-
-    return name
-
-
-generate_name.next_id = 1
-
-
-def create_aimmo_game_directly(klass: Class, worksheet_id: int) -> Game:
-    """Generate an aimmo game with the details given.
-
-    Args:
-        klass (Class): The instance of the class.
-        worksheet_id (int): The id of the worksheet.
-
-    Returns:
-        game: Game: The game model instance.
-    """
-    name = generate_name()
-
-    game = Game.objects.create(name=name, game_class=klass, worksheet_id=worksheet_id)
-
-    return game

portal/views/aimmo/dashboard.py

@@ -1,105 +0,0 @@
-from typing import Any, Dict, List, Optional
-
-from aimmo.models import Game
-from aimmo.worksheets import WORKSHEETS, Worksheet, get_worksheets_excluding_id
-from common.models import Class
-from common.permissions import logged_in_as_student, logged_in_as_teacher
-from common.utils import LoginRequiredNoErrorMixin
-from django.contrib import messages
-from django.contrib.auth.mixins import UserPassesTestMixin
-from django.db.models import QuerySet
-from django.urls import reverse_lazy
-from django.views.generic.base import TemplateView
-from django.views.generic.edit import CreateView
-
-from portal.forms.add_game import AddGameForm
-from portal.strings.student_aimmo_dashboard import AIMMO_DASHBOARD_BANNER
-
-
-class TeacherAimmoDashboard(LoginRequiredNoErrorMixin, UserPassesTestMixin, CreateView):
-    login_url = reverse_lazy("teacher_login")
-    form_class = AddGameForm
-    template_name = "portal/teach/teacher_aimmo_dashboard.html"
-
-    def test_func(self) -> Optional[bool]:
-        return logged_in_as_teacher(self.request.user)
-
-    def get_form(self, form_class=None):
-        teacher = self.request.user.new_teacher
-        non_admin_classes = teacher.class_teacher
-        admin_classes = Class.objects.filter(teacher__school=teacher.school)
-        classes = admin_classes if teacher.is_admin else non_admin_classes
-        if form_class is None:
-            form_class = self.get_form_class()
-        return form_class(classes, **self.get_form_kwargs())
-
-    def form_valid(self, form):
-        form.instance = Game(
-            game_class=form.cleaned_data["game_class"], created_by=self.request.user.userprofile.teacher
-        )
-        return super().form_valid(form)
-
-    def form_invalid(self, form: AddGameForm):
-        messages.warning(
-            self.request,
-            ", ".join(message for errors in form.errors.values() for message in errors),
-        )
-        return super().form_invalid(form)
-
-    def get_success_url(self):
-        return reverse_lazy("teacher_aimmo_dashboard")
-
-
-class StudentAimmoDashboard(LoginRequiredNoErrorMixin, UserPassesTestMixin, TemplateView):
-    template_name = "portal/play/student_aimmo_dashboard.html"
-
-    login_url = reverse_lazy("student_login_access_code")
-
-    def test_func(self) -> Optional[bool]:
-        return logged_in_as_student(self.request.user)
-
-    def get_context_data(self, **kwargs: Any) -> Dict[str, Any]:
-        student = self.request.user.new_student
-        klass = student.class_field
-
-        if klass is None:
-            return {"BANNER": AIMMO_DASHBOARD_BANNER}
-
-        aimmo_game = klass.active_game
-        if aimmo_game:
-            active_worksheet = WORKSHEETS.get(aimmo_game.worksheet_id)
-            inactive_worksheets = get_worksheets_excluding_id(active_worksheet.id)
-
-            return {
-                "BANNER": AIMMO_DASHBOARD_BANNER,
-                "HERO_CARD": self._get_hero_card(active_worksheet, aimmo_game),
-                "CARD_LIST": {"cards": self._get_card_list(inactive_worksheets)},
-            }
-        else:
-            return {"BANNER": AIMMO_DASHBOARD_BANNER}
-
-    def _get_hero_card(self, active_worksheet: Worksheet, aimmo_game: Game) -> Dict[str, Any]:
-        return {
-            "image": active_worksheet.active_image_path,
-            "title": active_worksheet.name,
-            "description": active_worksheet.description,
-            "button1": {
-                "text": "Read challenge",
-                "url": active_worksheet.student_challenge_url,
-            },
-            "button2": {
-                "text": "Play game",
-                "url": "kurono/play",
-                "url_args": aimmo_game.id,
-            },
-        }
-
-    def _get_card_list(self, inactive_worksheets: QuerySet) -> List[Dict[str, Any]]:
-        return [
-            {
-                "image": inactive_worksheet.image_path,
-                "title": inactive_worksheet.name,
-                "description": inactive_worksheet.short_description,
-            }
-            for inactive_worksheet in inactive_worksheets
-        ]