From b26bfe45766b5a6e9c2be54f36b14dae07bebf49 Mon Sep 17 00:00:00 2001
From: Ivymaster <ivan.ivusic.983@gmail.com>
Date: Thu, 9 Jul 2026 16:24:02 +0200
Subject: [PATCH] Conflicts resolved

---
 .../specs/api/tempus/tempus.collisions.cy.js  |  2 --
 .../e2e/specs/ui/tempus/tempus.filters.cy.js  |  2 +-
 .../cypress/cypress/support/api/tempusApi.js  | 31 ++++++++++++-------
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/tests/cypress/cypress/e2e/specs/api/tempus/tempus.collisions.cy.js b/tests/cypress/cypress/e2e/specs/api/tempus/tempus.collisions.cy.js
index bc997a90a..5104c8a28 100644
--- a/tests/cypress/cypress/e2e/specs/api/tempus/tempus.collisions.cy.js
+++ b/tests/cypress/cypress/e2e/specs/api/tempus/tempus.collisions.cy.js
@@ -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",
diff --git a/tests/cypress/cypress/e2e/specs/ui/tempus/tempus.filters.cy.js b/tests/cypress/cypress/e2e/specs/ui/tempus/tempus.filters.cy.js
index 4ce68fd79..380c6fc28 100644
--- a/tests/cypress/cypress/e2e/specs/ui/tempus/tempus.filters.cy.js
+++ b/tests/cypress/cypress/e2e/specs/ui/tempus/tempus.filters.cy.js
@@ -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();
 
diff --git a/tests/cypress/cypress/support/api/tempusApi.js b/tests/cypress/cypress/support/api/tempusApi.js
index 20e1cc884..6769e9849 100644
--- a/tests/cypress/cypress/support/api/tempusApi.js
+++ b/tests/cypress/cypress/support/api/tempusApi.js
@@ -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: () =>