From 0094d249b7d6a429363366c5ee80bc70694b22ac Mon Sep 17 00:00:00 2001
From: Waldemar Mazurek <waldemar.mazurek@sap.com>
Date: Mon, 23 Dec 2024 13:33:28 +0100
Subject: [PATCH] Test compatibility fix (#4092)

---
 .../compound/wc-compound-container.cy.js      | 22 +++++++++----------
 container/test-app/assets/panelHeader.js      |  4 ----
 .../test-app/compound/compoundClientAPI.html  |  2 +-
 scripts/testCompatibility.sh                  | 16 +++++++-------
 4 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/container/cypress/e2e/test-app/compound/wc-compound-container.cy.js b/container/cypress/e2e/test-app/compound/wc-compound-container.cy.js
index 0cc5b469cc..0422b11f71 100644
--- a/container/cypress/e2e/test-app/compound/wc-compound-container.cy.js
+++ b/container/cypress/e2e/test-app/compound/wc-compound-container.cy.js
@@ -1,13 +1,16 @@
 describe('Compound Container Tests', () => {
   describe('LuigiClient API - LuigiCompoundContainer', () => {
     const containerSelector = '[data-test-id="luigi-client-api-test-compound-01"]';
+    let consoleLog;
     let stub;
 
     beforeEach(() => {
       cy.visit('http://localhost:8080/compound/compoundClientAPI.html', {
         onBeforeLoad(win) {
           // Set up a spy on console.log
-          cy.stub(win.console, 'log').as('consoleLogSpy');
+          cy.stub(win.console, 'log', (value) => {
+            consoleLog = value;
+          });
         }
       });
       stub = cy.stub();
@@ -283,17 +286,12 @@ describe('Compound Container Tests', () => {
     it('LuigiClient API publishEvent', () => {
       cy.on('window:alert', stub);
 
-      cy.get(containerSelector)
-        .shadow()
-        .contains('Publish event')
-        .click()
-        .then(() => {
-          expect(stub.getCall(0)).to.be.calledWith('sendInput');
-          cy.get('@consoleLogSpy').should(
-            'be.calledWith',
-            'dataConverter(): Received Custom Message from "input1" MF My own event data'
-          );
-        });
+      cy.get(containerSelector).shadow().contains('Publish event').click();
+
+      cy.should(() => {
+        expect(stub.getCall(0)).to.be.calledWith('custom-message: sendInput');
+        expect(consoleLog).to.equal('dataConverter(): Received Custom Message from "input1" MF My own event data');
+      });
     });
 
     it('LuigiClient API uxManagerChainRequests', () => {
diff --git a/container/test-app/assets/panelHeader.js b/container/test-app/assets/panelHeader.js
index 27f2197444..d8d2a6e897 100644
--- a/container/test-app/assets/panelHeader.js
+++ b/container/test-app/assets/panelHeader.js
@@ -169,10 +169,6 @@ class panelHeader extends LuigiElement {
     });
   }
 
-  afterInit(ctx) {
-    console.debug('after init', ctx);
-  }
-
   render(ctx) {
     return html`
       <style>
diff --git a/container/test-app/compound/compoundClientAPI.html b/container/test-app/compound/compoundClientAPI.html
index 016fbafffc..b84d661c0c 100644
--- a/container/test-app/compound/compoundClientAPI.html
+++ b/container/test-app/compound/compoundClientAPI.html
@@ -201,7 +201,7 @@ <h3>
       );
       compoundContainer.addEventListener(MFEventID.CUSTOM_MESSAGE, (event) => {
         if (event.detail.id !== 'timer') {
-          alert(event.detail.id);
+          alert(MFEventID.CUSTOM_MESSAGE + ': ' + event.detail.id);
         }
       });
 
diff --git a/scripts/testCompatibility.sh b/scripts/testCompatibility.sh
index ab343908d4..69e93addf5 100755
--- a/scripts/testCompatibility.sh
+++ b/scripts/testCompatibility.sh
@@ -53,10 +53,10 @@ cd $BASE_DIR/../
 source $BASE_DIR/shared/bashHelpers.sh
 
 declare -a APP_FOLDERS=(
-  "/test/e2e-client-api-test-app"
-  "/test/e2e-test-application"
-  "/test/e2e-js-test-application"
-  "/test/e2e-test-application/externalMf"
+  "test/e2e-client-api-test-app"
+  "test/e2e-test-application"
+  "test/e2e-js-test-application"
+  "test/e2e-test-application/externalMf"
 )
 
 # Used for setting up webserver and killing them
@@ -183,7 +183,7 @@ checkoutLuigiToTestfolder() {
   echoe "Checking out selected release tag $TAG"
   git checkout tags/$TAG
   for FOLDER in "${APP_FOLDERS[@]}"; do
-    echoe "Installing app $FOLDER"
+    echoe "Installing app $FOLDER in $LUIGI_DIR_TESTING"
     cd $LUIGI_DIR_TESTING/$FOLDER
     npm i
   done
@@ -256,12 +256,12 @@ verifyAndStartWebserver() {
   for i in "${!APP_FOLDERS[@]}"; do
     echoe "Run app webserver on ${APP_PORTS[$i]}"
     cd $LUIGI_DIR_TESTING/${APP_FOLDERS[$i]}
-    if [ "${APP_FOLDERS[$i]}" == "/test/e2e-test-application/externalMf" ]; then
+    if [ "${APP_FOLDERS[$i]}" == "test/e2e-test-application/externalMf" ]; then
       # required for starting externalMF, otherwise webserver tries to start on /test/e2e-test-application/externalMf/externalMf
       echoe "Stepping out"
       cd ..
     fi
-    if [ "${APP_FOLDERS[$i]}" != "/test/e2e-client-api-test-app" ] && [ "${APP_FOLDERS[$i]}" != "/test/e2e-js-test-application" ]; then
+    if [ "${APP_FOLDERS[$i]}" != "test/e2e-client-api-test-app" ] && [ "${APP_FOLDERS[$i]}" != "test/e2e-js-test-application" ]; then
       runWebserver ${APP_PORTS[$i]} ${APP_PUBLIC_FOLDERS[$i]} ${APP_PATH_CHECK[$i]}
     else
       npm run dev &
@@ -271,7 +271,7 @@ verifyAndStartWebserver() {
 
 startE2eTestrunner() {
   echoe "Starting e2e test headless"
-  cd $LUIGI_DIR_TESTING/${APP_FOLDERS[0]}
+  cd $LUIGI_DIR_TESTING/${APP_FOLDERS[1]}
 
   if [ "$USE_CYPRESS_DASHBOARD" == "true" ]; then
     echo "Running compatibility tests with recording"