From b03862592a9ecafb60e45f0c00f41a395b391840 Mon Sep 17 00:00:00 2001 From: Razvan Mahu <67904187+razvan-pro@users.noreply.github.com> Date: Sat, 4 Sep 2021 13:16:39 +0100 Subject: [PATCH] feat: Remove teacher title (#1218) * feat: remove teacher title * get portal and common from the custom branch * install portal and common as editable in ci * Revert "install portal and common as editable in ci" This reverts commit 140ef3d43bd3d1501d77a47fc26c69746e2bd887. * Revert "get portal and common from the custom branch" This reverts commit 312f72b609fff288aba8308c4b03069a8e3e4c75. * Merge branch 'master' into rebranding-remove-teacher-title --- game/tests/test_scoreboard.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/game/tests/test_scoreboard.py b/game/tests/test_scoreboard.py index 64001f187..dffff405c 100644 --- a/game/tests/test_scoreboard.py +++ b/game/tests/test_scoreboard.py @@ -294,7 +294,7 @@ def test_scoreboard_loads(self): def test_student_can_see_classes(self): """A student should be able to see the classes they are in""" mr_teacher = Teacher.objects.factory( - "Mr", "Normal", "Teacher", "normal@school.edu", "secretpa$sword" + "Normal", "Teacher", "normal@school.edu", "secretpa$sword" ) klass1, name1, access_code1 = create_class_directly( mr_teacher.user.user.email, class_name="Class 1" @@ -320,10 +320,10 @@ def test_student_can_see_classes(self): def test_admin_teacher_can_see_all_classes(self): """An admin should be able to see all classes, not just the ones they teach""" normal_teacher = Teacher.objects.factory( - "Mr", "Normal", "Teacher", "normal@school.edu", "secretpa$sword" + "Normal", "Teacher", "normal@school.edu", "secretpa$sword" ) admin_teacher = Teacher.objects.factory( - "Mrs", "Admin", "Admin", "admin@school.edu", "secretpa$sword2" + "Admin", "Admin", "admin@school.edu", "secretpa$sword2" ) admin_teacher.is_admin = True @@ -355,10 +355,10 @@ def test_admin_teacher_can_see_all_classes(self): def test_non_admin_teacher_can_only_see_their_own_classes(self): """A teacher who is not an admin should only be able to see their classes, not ones taught by others""" teacher1 = Teacher.objects.factory( - "Mr", "First", "Teacher", "normal@school.edu", "secretpa$sword" + "First", "Teacher", "normal@school.edu", "secretpa$sword" ) teacher2 = Teacher.objects.factory( - "Mrs", "Second", "Teacher", "admin@school.edu", "secretpa$sword2" + "Second", "Teacher", "admin@school.edu", "secretpa$sword2" ) klass1, name1, access_code1 = create_class_directly(