codeforlife-portal 5.32.2__py2.py3-none-any.whl → 8.9.9__py2.py3-none-any.whl

portal/tests/pageObjects/portal/teach/onboarding_student_list_page.py

@@ -1,5 +1,7 @@
 from __future__ import absolute_import
 
+from selenium.webdriver.common.by import By
+
 from . import class_page, dashboard_page
 from .teach_base_page import TeachBasePage
 
@@ -11,25 +13,18 @@ class OnboardingStudentListPage(TeachBasePage):
         assert self.on_correct_page("onboarding_student_list_page")
 
     def student_exists(self, name):
-        return name in self.browser.find_element_by_id("student_table").text
+        return name in self.browser.find_element(By.ID, "student_table").text
 
     def is_student_password(self, password):
-        return (
-            password
-            in self.browser.find_element_by_xpath(
-                "//table[@id='student_table']/tbody/tr[4]/td[2]"
-            ).text
-        )
+        return password in self.browser.find_element(By.XPATH, "//table[@id='student_table']/tbody/tr[4]/td[2]").text
 
     def go_back_to_class(self):
-        self.browser.find_element_by_id("back_to_class_button").click()
+        self.browser.find_element(By.ID, "back_to_class_button").click()
         return class_page.TeachClassPage(self.browser)
 
     def get_first_login_url(self):
-        return self.browser.find_element_by_xpath(
-            "//table[@id='student_table']/tbody/tr[4]/td[4]/div/div[1]"
-        ).text
+        return self.browser.find_element(By.XPATH, "//table[@id='student_table']/tbody/tr[4]/td[4]/div/div[1]").text
 
     def complete_setup(self):
-        self.browser.find_element_by_id("complete_setup_button").click()
+        self.browser.find_element(By.ID, "complete_setup_button").click()
         return dashboard_page.TeachDashboardPage(self.browser)

portal/tests/pageObjects/portal/teach/onboarding_students_page.py

@@ -1,5 +1,7 @@
 from __future__ import absolute_import
 
+from selenium.webdriver.common.by import By
+
 from . import onboarding_student_list_page
 from .teach_base_page import TeachBasePage
 
@@ -26,33 +28,8 @@ class OnboardingStudentsPage(TeachBasePage):
         return self
 
     def _click_create_students(self):
-        self.browser.find_element_by_name("new_students").click()
-
-    def adding_students_failed(self):
-        if not self.element_exists_by_css(".errorlist"):
-            return False
-
-        error_list = self.browser.find_element_by_id(
-            "form-create-students"
-        ).find_element_by_class_name("errorlist")
-
-        if error_list.text:
-            return True
-        else:
-            return False
-
-    def duplicate_students(self, name):
-        if not self.element_exists_by_css(".errorlist"):
-            return False
-
-        errors = (
-            self.browser.find_element_by_id("form-create-students")
-            .find_element_by_class_name("errorlist")
-            .text
-        )
-        error = "You cannot add more than one student called '{0}'".format(name)
-        return error in errors
+        self.browser.find_element(By.NAME, "new_students").click()
 
     def type_student_name(self, name):
-        self.browser.find_element_by_id("id_names").send_keys(name + "\n")
+        self.browser.find_element(By.ID, "id_names").send_keys(name + "\n")
         return self

portal/tests/pageObjects/portal/teach/teach_base_page.py

@@ -1,5 +1,7 @@
 from pathlib import Path
 
+from selenium.webdriver.common.by import By
+
 from portal.tests.pageObjects.portal.base_page import BasePage
 
 
@@ -8,9 +10,9 @@ class TeachBasePage(BasePage):
         super(TeachBasePage, self).__init__(browser)
 
     def logout(self):
-        self.browser.find_element_by_id("logout_menu").click()
+        self.browser.find_element(By.ID, "logout_menu").click()
 
-        self.browser.find_element_by_id("logout_button").click()
+        self.browser.find_element(By.ID, "logout_button").click()
         from portal.tests.pageObjects.portal.home_page import HomePage
 
         return HomePage(self.browser)
@@ -27,11 +29,11 @@ class TeachBasePage(BasePage):
             })
         """
         )
-        self.browser.find_element_by_xpath("/html/body/input").send_keys(
+        self.browser.find_element(By.XPATH, "/html/body/input").send_keys(
             str((Path(__file__).parents[3] / "data" / filename).resolve())
         )
 
         return self
 
     def get_students_input_value(self):
-        return self.browser.find_element_by_id("id_names").get_attribute("value")
+        return self.browser.find_element(By.ID, "id_names").get_attribute("value")

portal/tests/pageObjects/portal/teacher_login_page.py

@@ -1,10 +1,8 @@
-import time
+from selenium.webdriver.common.by import By
 
 from .base_page import BasePage
+from .password_reset_page import PasswordResetPage
 from .teach import dashboard_page as teach_dashboard_page
-from .teach import onboarding_classes_page
-from .teach import onboarding_students_page
-from .teacher_password_reset_form_page import TeacherPasswordResetFormPage
 
 
 class TeacherLoginPage(BasePage):
@@ -18,9 +16,9 @@ class TeacherLoginPage(BasePage):
         return teach_dashboard_page.TeachDashboardPage(self.browser)
 
     def _login(self, email, password):
-        self.browser.find_element_by_id("id_auth-username").send_keys(email)
-        self.browser.find_element_by_id("id_auth-password").send_keys(password)
-        self.browser.find_element_by_name("login_view").click()
+        self.browser.find_element(By.ID, "id_auth-username").send_keys(email)
+        self.browser.find_element(By.ID, "id_auth-password").send_keys(password)
+        self.browser.find_element(By.NAME, "login_view").click()
 
     def login_no_school(self, email, password):
         self._login(email, password)
@@ -31,25 +29,21 @@ class TeacherLoginPage(BasePage):
     def login_no_class(self, email, password):
         self._login(email, password)
 
-        return onboarding_classes_page.OnboardingClassesPage(self.browser)
+        return teach_dashboard_page.TeachDashboardPage(self.browser)
 
     def login_no_students(self, email, password):
         self._login(email, password)
 
-        return onboarding_students_page.OnboardingStudentsPage(self.browser)
+        return teach_dashboard_page.TeachDashboardPage(self.browser)
 
     def login_failure(self, email, password):
         self._login(email, password)
         return self
 
     def has_login_failed(self, form_id, error):
-        errors = (
-            self.browser.find_element_by_id(form_id)
-            .find_element_by_class_name("errorlist")
-            .text
-        )
+        errors = self.browser.find_element(By.ID, form_id).find_element(By.CLASS_NAME, "errorlist").text
         return error in errors
 
     def go_to_teacher_forgotten_password_page(self):
-        self.browser.find_element_by_id("teacher_forgotten_password_button").click()
-        return TeacherPasswordResetFormPage(self.browser)
+        self.browser.find_element(By.ID, "teacher_forgotten_password_button").click()
+        return PasswordResetPage(self.browser)

portal/tests/selenium_test_case.py

@@ -1,52 +1,12 @@
 """
-This SeleniumTestCase is copied over from django-selenium-clean==0.2.1
+Patch SeleniumTestCase from django-selenium-clean package.
 
 Instead of inheriting from StaticLiveServerTestCase, we inherit from LiveServerTestCase.
 This solves a bug introduced when upgrading to Django 1.11,
 see more information here: https://github.com/jazzband/django-pipeline/issues/593
 """
 
-from django.conf import settings
-from django.contrib.sites.models import Site
 from django.contrib.staticfiles.testing import LiveServerTestCase
-from django_selenium_clean import SeleniumWrapper, PageElement
+from django_selenium_clean import SeleniumTestCase
 
-
-class SeleniumTestCase(LiveServerTestCase):
-    @classmethod
-    def setUpClass(cls):
-        super(SeleniumTestCase, cls).setUpClass()
-        cls.selenium = SeleniumWrapper()
-        PageElement.selenium = cls.selenium
-
-        # Normally we would just do something like
-        #     selenium.live_server_url = self.live_server_url
-        # However, there is no "self" at this time, so we
-        # essentially duplicate the code from the definition of
-        # the LiveServerTestCase.live_server_url property.
-        cls.selenium.live_server_url = "http://%s:%s" % (
-            cls.server_thread.host,
-            cls.server_thread.port,
-        )
-
-    @classmethod
-    def tearDownClass(cls):
-        cls.selenium.quit()
-        PageElement.selenium = None
-        super(SeleniumTestCase, cls).tearDownClass()
-
-    def __call__(self, result=None):
-        self._set_site_to_local_domain()
-        if hasattr(self, "selenium"):
-            for width in getattr(settings, "SELENIUM_WIDTHS", [1624]):
-                self.selenium.set_window_size(width, 1024)
-        return super(SeleniumTestCase, self).__call__(result)
-
-    def _set_site_to_local_domain(self):
-        """
-        Sets the Site Django object to the local domain (locally, localhost:8000).
-        Needed to generate valid registration and password reset links in tests.
-        """
-        current_site = Site.objects.get_current()
-        current_site.domain = f"{self.server_thread.host}:{self.server_thread.port}"
-        current_site.save()
+SeleniumTestCase.__bases__ = (LiveServerTestCase,)

portal/tests/snapshots/snap_test_partials.py

@@ -7,9 +7,7 @@ from snapshottest import Snapshot
 
 snapshots = Snapshot()
 
-snapshots[
-    "test_banner 1"
-] = """<div class="banner banner--teacher">
+snapshots['test_banner 1'] = '''<div class="banner banner--teacher">
     <div class="container">
         <div class="row">
             <div class="col-sm-12 d-flex">
@@ -21,12 +19,16 @@ snapshots[
                     
                         <p>Test text</p>
                     
-                    
+                    <div class="button-group">
+                        
+                        
+                    </div>
                 </div>
                 <div>
                     <div class="banner--picture">
                         <div class="banner--picture__inside1">
                             <div class="banner--picture__inside2 test--image--class"
+                                 
                                  >
                             </div>
                         </div>
@@ -36,11 +38,9 @@ snapshots[
         </div>
     </div>
 </div>
-"""
+'''
 
-snapshots[
-    "test_benefits 1"
-] = """
+snapshots['test_benefits 1'] = '''
 
 <div class="grid-benefits col-sm-8 col-center">
     
@@ -80,164 +80,10 @@ snapshots[
         </div>
     
 </div>
-"""
-
-snapshots[
-    "test_card_list 1"
-] = """
-
+'''
 
-<div class="grid grid-worksheets grid__fit">
-    
-        <div class="card">
-            <div class="card__images">
-                <img class="card__image" src="https://storage.googleapis.com/codeforlife-assets/images/worksheets/future2.jpg">
-                
-                    <img class="card__thumbnail" src="https://storage.googleapis.com/codeforlife-assets/images/worksheets/lock.png">
-                
-            </div>
-            <div class="card__text">
-                <h5 class="card__title">Test card 1</h5>
-                
-                    <p>Test description 1</p>
-                
-            </div>
-        </div>
-    
-        <div class="card">
-            <div class="card__images">
-                <img class="card__image" src="https://storage.googleapis.com/codeforlife-assets/images/worksheets/ancient.jpg">
-                
-                    <h3 class="card__thumbnail">Coming Soon</h3>
-                
-            </div>
-            <div class="card__text">
-                <h5 class="card__title">Test card 2</h5>
-                
-                    <p>Test description 2</p>
-                
-            </div>
-        </div>
-    
-        <div class="card">
-            <div class="card__images">
-                <img class="card__image" src="https://storage.googleapis.com/codeforlife-assets/images/worksheets/modern_day.jpg">
-                
-                    <h3 class="card__thumbnail">Coming Soon</h3>
-                
-            </div>
-            <div class="card__text">
-                <h5 class="card__title">Test card 3</h5>
-                
-                    <p>Test description 3</p>
-                
-            </div>
-        </div>
-    
-        <div class="card">
-            <div class="card__images">
-                <img class="card__image" src="https://storage.googleapis.com/codeforlife-assets/images/worksheets/prehistory.jpg">
-                
-                    <h3 class="card__thumbnail">Coming Soon</h3>
-                
-            </div>
-            <div class="card__text">
-                <h5 class="card__title">Test card 4</h5>
-                
-                    <p>Test description 4</p>
-                
-            </div>
-        </div>
-    
-        <div class="card">
-            <div class="card__images">
-                <img class="card__image" src="https://storage.googleapis.com/codeforlife-assets/images/worksheets/broken_future.jpg">
-                
-                    <h3 class="card__thumbnail">Coming Soon</h3>
-                
-            </div>
-            <div class="card__text">
-                <h5 class="card__title">Test card 5</h5>
-                
-                    <p>Test description 5</p>
-                
-            </div>
-        </div>
-    
-        <div class="card">
-            <div class="card__images">
-                <img class="card__image" src="https://storage.googleapis.com/codeforlife-assets/images/worksheets/kurono_logo.svg">
-                
-            </div>
-            <div class="card__text">
-                <h5 class="card__title">Test card 6</h5>
-                
-                    <div class="button-group button-group__icon">
-                        <a target="_blank" href="home" class="button button--primary button-right-arrow">
-                            Test button
-                        </a>
-                    </div>
-                
-            </div>
-        </div>
-    
-</div>
-"""
-
-snapshots[
-    "test_character_list 1"
-] = """
-
-
-<div class="grid grid-characters grid__fit">
-    
-        <div class="card">
-            <h5 class="card__title">Xian</h5>
-            <img class="card__image" src="https://storage.googleapis.com/codeforlife-assets/images/aimmo_characters/Xian.png">
-            <p class="card__text">Fun, active, will dance to just about anything that produces a beat. Has great memory, always a joke at hand, might try to introduce memes in Ancient Greece. Scored gold in a track race once and will take any opportunity to bring that up.</p>
-        </div>
-    
-        <div class="card">
-            <h5 class="card__title">Jools</h5>
-            <img class="card__image" src="https://storage.googleapis.com/codeforlife-assets/images/aimmo_characters/Jools.png">
-            <p class="card__text">A quick-witted kid who wasn’t expecting to embark in a time-warping journey but can’t say no to a challenge. Someone has to keep the rest of the group in check, after all!</p>
-        </div>
-    
-        <div class="card">
-            <h5 class="card__title">Zayed</h5>
-            <img class="card__image" src="https://storage.googleapis.com/codeforlife-assets/images/aimmo_characters/Zayed.png">
-            <p class="card__text">A pretty chill, curious soul that prefers practice to theory. Always ready to jump into an adventure if it looks interesting enough; not so much otherwise. Probably the one who accidentally turned the time machine on in first place.</p>
-        </div>
-    
-</div>
-"""
-
-snapshots[
-    "test_headline 1"
-] = """<section>
+snapshots['test_headline 1'] = '''<section>
     <h4>Test title</h4>
 </section>
 <p class="container">Test description</p>
-"""
-
-snapshots[
-    "test_hero_card 1"
-] = """
-
-
-<div class="card">
-    <img class="card__image" src="https://storage.googleapis.com/codeforlife-assets/images/worksheets/future_active.png">
-    <div class="card__text">
-        <h4 class="card__title">Test title</h4>
-        <p>Test description</p>
-        <div class="button-group button-group__icon">
-            <a target="_blank" href="https://www.codeforlife.education" class="button button--primary button--icon">
-                Test button 1<span class="iconify" data-icon="mdi:open-in-new"></span>
-            </a>
-            <a href="/kurono/play/1/" class="button button--primary button-right-arrow">
-                Test button 2
-            </a>
-        </div>
-    </div>
-</div>
-"""
+'''

portal/tests/test_2FA.py

@@ -6,10 +6,11 @@ from django.contrib.auth.models import User
 from django.test import Client, TestCase
 from django.test.utils import override_settings
 from django.conf import settings
+from django.urls import reverse
 
 from django_otp.util import random_hex
 from django_otp.oath import totp
-from django_otp import DEVICE_ID_SESSION_KEY
+from django_otp import DEVICE_ID_SESSION_KEY, user_has_device
 
 
 class Test2FA(TestCase):
@@ -43,34 +44,19 @@ class Test2FA(TestCase):
 
         # In production tolerance value is 1 by default, which means it will accept any of three
         # tokens: the current one, the previous one, and the next one.
-        device = user.totpdevice_set.create(
-            name="default", key=random_hex(), tolerance=0
-        )
+        device = user.totpdevice_set.create(name="default", key=random_hex(), tolerance=0)
 
         # For us the authentication is done in 2 steps. First step is 'auth'.
         response = _post(
-            {
-                "auth-username": self.email,
-                "auth-password": self.password,
-                "teacher_login_view-current_step": "auth",
-            }
+            {"auth-username": self.email, "auth-password": self.password, "teacher_login_view-current_step": "auth"}
         )
         self.assertContains(response, "Token:")
 
         # Second step is 'token'. There's a time window when these 2 steps must be done.
         #
         # Test 1: test random token
-        response = _post(
-            {
-                "token-otp_token": "123456",
-                "teacher_login_view-current_step": "token",
-            },
-        )
-        INVALID_ERR = {
-            "__all__": [
-                "Invalid token. Please make sure you have entered it correctly."
-            ]
-        }
+        response = _post({"token-otp_token": "123456", "teacher_login_view-current_step": "token"})
+        INVALID_ERR = {"__all__": ["Invalid token. Please make sure you have entered it correctly."]}
         assert response.context_data["wizard"]["form"].errors == INVALID_ERR
 
         # reset throttle to allow us to continue after failure
@@ -79,10 +65,7 @@ class Test2FA(TestCase):
         # Test 2: test with 1 token before (drift = -1 which would fail with tolerance = 0)
         # In production, drift of [-1, 0, 1] should work with tolerance = 1
         response = _post(
-            {
-                "token-otp_token": totp(device.bin_key, drift=-1),
-                "teacher_login_view-current_step": "token",
-            }
+            {"token-otp_token": totp(device.bin_key, drift=-1), "teacher_login_view-current_step": "token"}
         )
         assert response.context_data["wizard"]["form"].errors == INVALID_ERR
 
@@ -90,15 +73,14 @@ class Test2FA(TestCase):
         device.throttle_reset()
 
         # Test 3: test with valid current token (drift = 0)
-        response = _post(
-            {
-                "token-otp_token": totp(device.bin_key, drift=0),
-                "teacher_login_view-current_step": "token",
-            }
-        )
+        response = _post({"token-otp_token": totp(device.bin_key, drift=0), "teacher_login_view-current_step": "token"})
 
-        self.assertRedirects(
-            response, settings.LOGIN_REDIRECT_URL, fetch_redirect_response=False
-        )
+        self.assertRedirects(response, settings.LOGIN_REDIRECT_URL, fetch_redirect_response=False)
 
         assert device.persistent_id == self.client.session.get(DEVICE_ID_SESSION_KEY)
+
+        # test delete 2FA
+        url = reverse("teacher_disable_2FA", kwargs={"pk": user.new_teacher.id})
+        self.client.post(url)
+
+        assert not user_has_device(user)

portal/tests/test_admin.py

@@ -1,15 +1,9 @@
-from common.tests.utils.classes import create_class_directly
-from common.tests.utils.organisation import create_organisation_directly
-from common.tests.utils.student import create_school_student_directly
-from common.tests.utils.teacher import signup_teacher_directly
-from django.contrib.auth.models import User, Permission
+from django.test import Client
 from django.urls import reverse
-
 from portal.tests.base_test import BaseTest
-from portal.tests.pageObjects.portal.admin.admin_data_page import AdminDataPage
-from portal.tests.pageObjects.portal.admin.admin_map_page import AdminMapPage
 from portal.tests.pageObjects.portal.teacher_login_page import TeacherLoginPage
 from portal.views import admin
+import pytest
 
 
 class TestAdmin(BaseTest):
@@ -24,101 +18,25 @@ class TestAdmin(BaseTest):
         self.selenium.get(url)
         return TeacherLoginPage(self.selenium)
 
-    def navigate_to_admin_data_not_logged_in(self):
-        url = self.live_server_url + reverse("aggregated_data")
-        self.selenium.get(url)
-        # gets redirected to login page when not logged in
-        return TeacherLoginPage(self.selenium)
-
-    def navigate_to_admin_map_not_logged_in(self):
-        url = self.live_server_url + reverse("map")
-        self.selenium.get(url)
-        # gets redirected to login page when not logged in
-        return TeacherLoginPage(self.selenium)
-
-    def navigate_to_admin_data_logged_in(self):
-        url = self.live_server_url + reverse("aggregated_data")
-        self.selenium.get(url)
-        # gets redirected to login page when not logged in
-        return AdminDataPage(self.selenium, self.live_server_url)
-
-    def navigate_to_admin_map_logged_in(self):
-        url = self.live_server_url + reverse("map")
-        self.selenium.get(url)
-        # gets redirected to login page when not logged in
-        return AdminMapPage(self.selenium, self.live_server_url)
-
-    def navigate_to_admin_data(self):
-        url = self.live_server_url + reverse("aggregated_data")
-        self.selenium.get(url)
-        # gets redirected to login page when not logged in
-        return AdminDataPage(self.selenium, self.live_server_url)
-
-    def navigate_to_admin_map(self):
-        url = self.live_server_url + reverse("map")
-        self.selenium.get(url)
-        # gets redirected to login page when not logged in
-        return AdminMapPage(self.selenium, self.live_server_url)
-
     # Checks all admin pages goes to admin_login when user is not logged in
     def test_navigate_to_admin_login(self):
         self.navigate_to_admin_login()
 
-    def test_navigate_to_admin_data(self):
-        self.navigate_to_admin_data_not_logged_in()
-
-    def test_navigate_to_admin_map(self):
-        self.navigate_to_admin_map_not_logged_in()
-
-    # Check superuser access to each admin pages
-    def test_superuser_access(self):
-        email, password = signup_teacher_directly()
-        create_organisation_directly(email)
-        _, _, access_code = create_class_directly(email)
-        create_school_student_directly(access_code)
-
-        user = User.objects.get(username=email)
-        user.is_superuser = True
-        user.save()
-
-        self.go_to_homepage().go_to_teacher_login_page().login(email, password)
-        page = self.navigate_to_admin_data_logged_in()
-        assert page.is_on_admin_data_page()
-        page = page.go_to_admin_map_page()
-        assert page.is_on_admin_map_page()
-
-    # Check user with view_map_data permission can access to /admin/map but not /admin/data
-    def test_view_map_data_permission_access(self):
-        email, password = signup_teacher_directly()
-        create_organisation_directly(email)
-        _, _, access_code = create_class_directly(email)
-        create_school_student_directly(access_code)
 
-        user = User.objects.get(username=email)
-        permission = Permission.objects.get(codename="view_map_data")
-        user.user_permissions.add(permission)
-        user.save()
+@pytest.mark.django_db
+def test_export_user_data():
+    admin_username = "codeforlife-portal@ocado.com"
+    admin_password = "abc123"
+    expected_data = ["indianajones@codeforlife.com", "Indiana", "Jones", "indianajones@codeforlife.com"]
 
-        self.go_to_homepage().go_to_teacher_login_page().login(email, password)
-        page = self.navigate_to_admin_map_logged_in()
-        assert page.is_on_admin_map_page()
-        page = page.go_to_admin_data_page_failure()
-        assert page.is_on_403_forbidden()
+    c = Client()
+    c.login(username=admin_username, password=admin_password)
 
-    # Check user with view_aggregated_data permission can access to /admin/data but not /admin/map
-    def test_view_aggregated_data_permission_access(self):
-        email, password = signup_teacher_directly()
-        create_organisation_directly(email)
-        _, _, access_code = create_class_directly(email)
-        create_school_student_directly(access_code)
+    url = reverse("admin:auth_user_changelist")
+    data = {"action": "export_as_csv", "select_across": 0, "index": 0, "_selected_action": 11}
 
-        user = User.objects.get(username=email)
-        permission = Permission.objects.get(codename="view_aggregated_data")
-        user.user_permissions.add(permission)
-        user.save()
+    response = c.post(url, data)
+    csv_data = response.getvalue().decode("utf-8").split(",")
 
-        self.go_to_homepage().go_to_teacher_login_page().login(email, password)
-        page = self.navigate_to_admin_data_logged_in()
-        assert page.is_on_admin_data_page()
-        page = page.go_to_admin_map_page_failure()
-        assert page.is_on_403_forbidden()
+    assert any(item in expected_data for item in csv_data)
+    assert "password" not in csv_data