Skip to content

Commit

Permalink
feat: Remove teacher title (#1218)
Browse files Browse the repository at this point in the history
* 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 140ef3d.

* Revert "get portal and common from the custom branch"

This reverts commit 312f72b.

* Merge branch 'master' into rebranding-remove-teacher-title
  • Loading branch information
razvan-pro authored Sep 4, 2021
1 parent 07b95c9 commit b038625
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions game/tests/test_scoreboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -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", "[email protected]", "secretpa$sword"
"Normal", "Teacher", "[email protected]", "secretpa$sword"
)
klass1, name1, access_code1 = create_class_directly(
mr_teacher.user.user.email, class_name="Class 1"
Expand All @@ -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", "[email protected]", "secretpa$sword"
"Normal", "Teacher", "[email protected]", "secretpa$sword"
)
admin_teacher = Teacher.objects.factory(
"Mrs", "Admin", "Admin", "[email protected]", "secretpa$sword2"
"Admin", "Admin", "[email protected]", "secretpa$sword2"
)

admin_teacher.is_admin = True
Expand Down Expand Up @@ -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", "[email protected]", "secretpa$sword"
"First", "Teacher", "[email protected]", "secretpa$sword"
)
teacher2 = Teacher.objects.factory(
"Mrs", "Second", "Teacher", "[email protected]", "secretpa$sword2"
"Second", "Teacher", "[email protected]", "secretpa$sword2"
)

klass1, name1, access_code1 = create_class_directly(
Expand Down

0 comments on commit b038625

Please sign in to comment.