-
Notifications
You must be signed in to change notification settings - Fork 83
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* 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
1 parent
07b95c9
commit b038625
Showing
1 changed file
with
5 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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" | ||
|
@@ -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 | ||
|
@@ -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( | ||
|