mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-11 20:12:16 +00:00
Conflicts resolved
This commit is contained in:
@@ -582,7 +582,6 @@ describe("Tempus Kalender API", () => {
|
||||
endDateTime,
|
||||
)
|
||||
.then((response) => {
|
||||
console.log(response);
|
||||
expect(response.status).to.eq(200);
|
||||
expect(response.body).to.have.nested.property(
|
||||
"meta.status",
|
||||
@@ -620,7 +619,6 @@ describe("Tempus Kalender API", () => {
|
||||
endDateTime,
|
||||
)
|
||||
.then((response) => {
|
||||
console.log(response);
|
||||
expect(response.status).to.eq(500);
|
||||
expect(response.body).to.have.nested.property(
|
||||
"meta.status",
|
||||
|
||||
@@ -99,7 +99,7 @@ context("Tempus filter tests", () => {
|
||||
tempusPage.getSelectedRoomIndicator(selectedRoom).should("be.visible");
|
||||
tempusPage.getCalendarEvents().should("have.length.greaterThan", 0);
|
||||
|
||||
tempusPage.getSelectedRoomRemoveButton(selectedRoom).click();
|
||||
tempusPage.getSelectedRoomRemoveButton(selectedRoom).first().click();
|
||||
waitForOk("@fetchPlanData");
|
||||
tempusPage.waitForCalendarToFinishLoading();
|
||||
|
||||
|
||||
@@ -52,13 +52,19 @@ export const tempusApi = {
|
||||
return response.body.data;
|
||||
}),
|
||||
|
||||
getCoursesByStudyPlan: (studyPlanId, semesterShortCode) =>
|
||||
cy
|
||||
getCoursesByStudyPlan: (studyPlanId, semesterShortCode) => {
|
||||
let parsedStudyPlans = [
|
||||
{
|
||||
studiengang_kz: studyPlanId,
|
||||
},
|
||||
];
|
||||
|
||||
return cy
|
||||
.request({
|
||||
method: "GET",
|
||||
method: "POST",
|
||||
url: `/index.ci.php/api/frontend/v1/tempus/coursepicker/getByStg`,
|
||||
qs: {
|
||||
stg: studyPlanId,
|
||||
body: {
|
||||
studiengaenge: parsedStudyPlans,
|
||||
studiensemester_kurzbz: semesterShortCode,
|
||||
},
|
||||
})
|
||||
@@ -68,7 +74,8 @@ export const tempusApi = {
|
||||
expect(response.body.data).to.be.an("array");
|
||||
|
||||
return response.body.data;
|
||||
}),
|
||||
});
|
||||
},
|
||||
|
||||
getPlannerEvents: (startDate, endDate) =>
|
||||
cy
|
||||
@@ -91,11 +98,13 @@ export const tempusApi = {
|
||||
deletePlannerEventsForDay: (day) => {
|
||||
const date = getDateForDay(day);
|
||||
|
||||
return tempusApi.getPlannerEvents(date, date).then((events) =>
|
||||
cy.wrap(events).each((event) =>
|
||||
tempusApi.deleteKalenderEvent(event.kalender_id),
|
||||
),
|
||||
);
|
||||
return tempusApi
|
||||
.getPlannerEvents(date, date)
|
||||
.then((events) =>
|
||||
cy
|
||||
.wrap(events)
|
||||
.each((event) => tempusApi.deleteKalenderEvent(event.kalender_id)),
|
||||
);
|
||||
},
|
||||
|
||||
resetTempusScenario: () =>
|
||||
|
||||
Reference in New Issue
Block a user