ramon
/
vbv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tests

This commit is contained in:
Daniel Egger 2023-09-14 18:11:28 +02:00
parent b4638e372f
commit b5e9b9e355
9 changed files with 67 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cypress/e2e/competence.cy.js
View File

@ -4,7 +4,7 @@ describe("competence.cy.js", () => {
beforeEach(() => {
cy.manageCommand("cypress_reset");
login("admin", "test");
login("test-student1@example.com", "test");
// test-lehrgang-lp-circle-reisen-lu-reisen ist eine Selbstevaluation
// mit mehreren Schritten

2
cypress/e2e/notifications.cy.js
View File

@ -7,7 +7,7 @@ describe("notification list page", () => {
});
it("can paginate notifications", () => {
login("admin", "test");
login("test-student1@example.com", "test");
cy.visit("/notifications");
cy.get('[data-cy="no-notifications"]').should("not.exist");

22
server/vbv_lernwelt/competence/create_uk_competence_profile.py
View File

@ -1,9 +1,9 @@
from vbv_lernwelt.competence.factories import (
CompetencePageFactory,
CompetenceProfilePageFactory,
ActionCompetenceFactory,
ActionCompetenceListPageFactory,
PerformanceCriteriaFactory,
)
from vbv_lernwelt.competence.models import ActionCompetence
from vbv_lernwelt.competence.models import ActionCompetence, CompetenceNaviPage
from vbv_lernwelt.course.consts import COURSE_UK, COURSE_UK_FR, COURSE_UK_IT
from vbv_lernwelt.course.models import CoursePage
from vbv_lernwelt.learnpath.models import LearningPath, LearningUnit
@ -13,9 +13,9 @@ def create_uk_competence_profile(course_id=COURSE_UK):
course_page = CoursePage.objects.get(course_id=course_id)
slug_prefix = course_page.get_children().exact_type(LearningPath).first().slug
competence_profile_page = CompetenceProfilePageFactory(
title="KompetenzNavi",
parent=course_page,
competence_profile_page = ActionCompetenceListPageFactory(
title="Handlungskompetenzen",
parent=course_page.get_descendants().exact_type(CompetenceNaviPage).first(),
)
competences = [
@ -52,7 +52,7 @@ def create_uk_competence_profile(course_id=COURSE_UK):
]
for c in competences:
CompetencePageFactory(
ActionCompetenceFactory(
parent=competence_profile_page,
competence_id=c["competence_id"],
title=c["title"],
@ -227,7 +227,7 @@ def create_uk_fr_competence_profile(course_id=COURSE_UK_FR):
course_page = CoursePage.objects.get(course_id=course_id)
slug_prefix = course_page.get_children().exact_type(LearningPath).first().slug
competence_profile_page = CompetenceProfilePageFactory(
competence_profile_page = ActionCompetenceListPageFactory(
title="KompetenzNavi",
parent=course_page,
)
@ -266,7 +266,7 @@ def create_uk_fr_competence_profile(course_id=COURSE_UK_FR):
]
for c in competences:
CompetencePageFactory(
ActionCompetenceFactory(
parent=competence_profile_page,
competence_id=c["competence_id"],
title=c["title"],
@ -380,7 +380,7 @@ def create_uk_it_competence_profile(course_id=COURSE_UK_IT):
course_page = CoursePage.objects.get(course_id=course_id)
slug_prefix = course_page.get_children().exact_type(LearningPath).first().slug
competence_profile_page = CompetenceProfilePageFactory(
competence_profile_page = ActionCompetenceListPageFactory(
title="KompetenzNavi",
parent=course_page,
)
@ -419,7 +419,7 @@ def create_uk_it_competence_profile(course_id=COURSE_UK_IT):
]
for c in competences:
CompetencePageFactory(
ActionCompetenceFactory(
parent=competence_profile_page,
competence_id=c["competence_id"],
title=c["title"],

16
server/vbv_lernwelt/competence/create_uk_training_competence_profile.py
View File

@ -1,6 +1,6 @@
from vbv_lernwelt.competence.factories import (
CompetencePageFactory,
CompetenceProfilePageFactory,
ActionCompetenceFactory,
ActionCompetenceListPageFactory,
PerformanceCriteriaFactory,
)
from vbv_lernwelt.competence.models import ActionCompetence
@ -13,7 +13,7 @@ def create_uk_training_competence_profile(course_id=COURSE_UK):
course_page = CoursePage.objects.get(course_id=course_id)
slug_prefix = course_page.get_children().exact_type(LearningPath).first().slug
competence_profile_page = CompetenceProfilePageFactory(
competence_profile_page = ActionCompetenceListPageFactory(
title="KompetenzNavi",
parent=course_page,
)
@ -53,7 +53,7 @@ def create_uk_training_competence_profile(course_id=COURSE_UK):
for c in competences:
print(c["title"])
CompetencePageFactory(
ActionCompetenceFactory(
parent=competence_profile_page,
competence_id=c["competence_id"],
title=c["title"],
@ -166,7 +166,7 @@ def create_uk_fr_training_competence_profile(course_id=COURSE_UK):
course_page = CoursePage.objects.get(course_id=course_id)
slug_prefix = course_page.get_children().exact_type(LearningPath).first().slug
competence_profile_page = CompetenceProfilePageFactory(
competence_profile_page = ActionCompetenceListPageFactory(
title="KompetenzNavi",
parent=course_page,
)
@ -206,7 +206,7 @@ def create_uk_fr_training_competence_profile(course_id=COURSE_UK):
for c in competences:
print(c["title"])
CompetencePageFactory(
ActionCompetenceFactory(
parent=competence_profile_page,
competence_id=c["competence_id"],
title=c["title"],
@ -319,7 +319,7 @@ def create_uk_it_training_competence_profile(course_id=COURSE_UK):
course_page = CoursePage.objects.get(course_id=course_id)
slug_prefix = course_page.get_children().exact_type(LearningPath).first().slug
competence_profile_page = CompetenceProfilePageFactory(
competence_profile_page = ActionCompetenceListPageFactory(
title="KompetenzNavi",
parent=course_page,
)
@ -359,7 +359,7 @@ def create_uk_it_training_competence_profile(course_id=COURSE_UK):
for c in competences:
print(c["title"])
CompetencePageFactory(
ActionCompetenceFactory(
parent=competence_profile_page,
competence_id=c["competence_id"],
title=c["title"],

8
server/vbv_lernwelt/competence/create_vv_competence_profile.py
View File

@ -1,6 +1,6 @@
from vbv_lernwelt.competence.factories import (
CompetencePageFactory,
CompetenceProfilePageFactory,
ActionCompetenceFactory,
ActionCompetenceListPageFactory,
PerformanceCriteriaFactory,
)
from vbv_lernwelt.competence.models import ActionCompetence
@ -12,7 +12,7 @@ def create_vv_competence_profile(course_id):
course_page = CoursePage.objects.get(course_id=course_id)
slug_prefix = course_page.get_children().exact_type(LearningPath).first().slug
competence_profile_page = CompetenceProfilePageFactory(
competence_profile_page = ActionCompetenceListPageFactory(
title="KompetenzNavi",
parent=course_page,
)
@ -122,7 +122,7 @@ def create_vv_competence_profile(course_id):
]
for c in competences:
CompetencePageFactory(
ActionCompetenceFactory(
parent=competence_profile_page,
competence_id=c["competence_id"],
title=c["title"],

14
server/vbv_lernwelt/competence/create_vv_new_competence_profile.py
View File

@ -1,6 +1,7 @@
from vbv_lernwelt.competence.factories import (
CompetencePageFactory,
CompetenceProfilePageFactory,
ActionCompetenceFactory,
ActionCompetenceListPageFactory,
CompetenceNaviPageFactory,
)
from vbv_lernwelt.course.consts import COURSE_VERSICHERUNGSVERMITTLERIN_ID
from vbv_lernwelt.course.models import CoursePage
@ -9,11 +10,16 @@ from vbv_lernwelt.course.models import CoursePage
def create_vv_new_competence_profile(course_id=COURSE_VERSICHERUNGSVERMITTLERIN_ID):
course_page = CoursePage.objects.get(course_id=course_id)
competence_profile_page = CompetenceProfilePageFactory(
competence_navi_page = CompetenceNaviPageFactory(
title="KompetenzNavi",
parent=course_page,
)
competence_profile_page = ActionCompetenceListPageFactory(
title="Handlungskompetenzen",
parent=competence_navi_page,
)
competences = [
{
"competence_id": "V1",
@ -38,7 +44,7 @@ def create_vv_new_competence_profile(course_id=COURSE_VERSICHERUNGSVERMITTLERIN_
]
for c in competences:
CompetencePageFactory(
ActionCompetenceFactory(
parent=competence_profile_page,
competence_id=c["competence_id"],
title=c["title"],

6
server/vbv_lernwelt/competence/factories.py
View File

@ -31,14 +31,14 @@ class CompetenceCertificateFactory(wagtail_factories.PageFactory):
model = CompetenceCertificate
class CompetenceProfilePageFactory(wagtail_factories.PageFactory):
title = "KompetenzNavi"
class ActionCompetenceListPageFactory(wagtail_factories.PageFactory):
title = "Handlungskompetenzen"
class Meta:
model = ActionCompetenceListPage
class CompetencePageFactory(wagtail_factories.PageFactory):
class ActionCompetenceFactory(wagtail_factories.PageFactory):
competence_id = "A1"
title = "Weiterempfehlung für Neukunden generieren"

9
server/vbv_lernwelt/competence/migrations/0005_move_action_competence.py
View File

@ -5,6 +5,7 @@ from django.db.models import Q
from vbv_lernwelt.assignment.models import Assignment
from vbv_lernwelt.competence.models import (
ActionCompetence,
ActionCompetenceListPage,
CompetenceCertificate,
CompetenceCertificateList,
@ -34,7 +35,7 @@ def refactor_competence_wagtail_tree(apps=None, schema_editor=None):
course_page.add_child(instance=competence_navi_page)
acl = course_page.get_descendants().exact_type(ActionCompetenceListPage).first()
acl.title = "Kompetenzprofil"
acl.title = "Handlungskompetenzen"
acl.save()
acl.specific.save_revision().publish()
@ -107,6 +108,12 @@ def refactor_competence_wagtail_tree(apps=None, schema_editor=None):
learning_content_edoniq.content_assignment = edoniq_test
learning_content_edoniq.save()
for competence in ActionCompetence.objects.all():
if competence.competence_id.endswith(":"):
# remove trailing colon
competence.competence_id = competence.competence_id[:-1]
competence.save()
class Migration(migrations.Migration):
dependencies = [

49
server/vbv_lernwelt/course/creators/test_course.py
View File

@ -23,11 +23,11 @@ from vbv_lernwelt.assignment.tests.assignment_factories import (
EvaluationTaskBlockFactory,
)
from vbv_lernwelt.competence.factories import (
ActionCompetenceFactory,
ActionCompetenceListPageFactory,
CompetenceCertificateFactory,
CompetenceCertificateListFactory,
CompetenceNaviPageFactory,
CompetencePageFactory,
CompetenceProfilePageFactory,
PerformanceCriteriaFactory,
)
from vbv_lernwelt.competence.models import ActionCompetence
@ -82,10 +82,8 @@ from vbv_lernwelt.media_library.tests.media_library_factories import (
def create_test_course(include_uk=True, include_vv=True, with_sessions=False):
# create_locales_for_wagtail()
course = create_test_course_with_categories()
create_test_competence_profile()
competence_certificate = create_test_competence_navi()
if include_uk:
competence_certificate = create_test_competence_navi()
# assignments create assignments parent page
course_page = CoursePage.objects.get(course_id=COURSE_TEST_ID)
_assignment_list_page = AssignmentListPageFactory(
@ -518,15 +516,29 @@ def create_test_circle_reisen(lp):
)
def create_test_competence_profile():
_course = Course.objects.get(id=COURSE_TEST_ID)
def create_test_competence_navi():
course_page = CoursePage.objects.get(course_id=COURSE_TEST_ID)
competence_profile_page = CompetenceProfilePageFactory(
competence_navi_page = CompetenceNaviPageFactory(
title="KompetenzNavi",
parent=course_page,
)
competence_certificate_list = CompetenceCertificateListFactory(
title="Kompetenznachweise",
parent=competence_navi_page,
)
competence_certificate = CompetenceCertificateFactory(
title="Kompetenznachweis 1",
parent=competence_certificate_list,
)
competence_profile_page = ActionCompetenceListPageFactory(
title="Handlungskompetenzen",
parent=competence_navi_page,
)
competences = [
{
"competence_id": "X1",
@ -556,32 +568,13 @@ def create_test_competence_profile():
]
for c in competences:
CompetencePageFactory(
ActionCompetenceFactory(
parent=competence_profile_page,
competence_id=c["competence_id"],
title=c["title"],
items=[("item", i) for i in c["items"]],
)
def create_test_competence_navi():
course_page = CoursePage.objects.get(course_id=COURSE_TEST_ID)
competence_navi_page = CompetenceNaviPageFactory(
title="KompetenzNavi",
parent=course_page,
)
competence_certificate_list = CompetenceCertificateListFactory(
title="Kompetenznachweise",
parent=competence_navi_page,
)
competence_certificate = CompetenceCertificateFactory(
title="Kompetenznachweis 1",
parent=competence_certificate_list,
)
return competence_certificate