Merge pull request #9 from OriginTrail/test-ui-fixes

Test UI fixes

Author: Bojan131

apps/agent/package.json

@@ -19,9 +19,9 @@
     "script:setup": "node dist/scripts/setup.js",
     "script:createUser": "node dist/scripts/createUser.js",
     "script:createToken": "node dist/scripts/createToken.js",
-    "test": "PLAYWRIGHT_JUNIT_OUTPUT_NAME=DKG_Node_UI_Tests.xml playwright test spec/testUI.spec.js --grep '@gh_actions' --reporter=list,html,junit",
-    "test:e2e": "PLAYWRIGHT_JUNIT_OUTPUT_NAME=DKG_Node_UI_Tests.xml playwright test spec/testUI.spec.js --reporter=list,junit",
-    "test:install": "playwright install",
+    "test": "PLAYWRIGHT_JUNIT_OUTPUT_NAME=DKG_Node_UI_Tests.xml npx playwright test spec/testUI.spec.js --grep '@gh_actions' --reporter=list,html,junit",
+    "test:e2e": "PLAYWRIGHT_JUNIT_OUTPUT_NAME=DKG_Node_UI_Tests.xml npx playwright test spec/testUI.spec.js --reporter=list,html,junit",
+    "test:install": "npx playwright install",
     "test:integration": "NODE_OPTIONS='--import tsx' mocha 'tests/integration/**/*.spec.ts' --require tests/integration/setup/global-setup.ts",
     "test:ragas": "NODE_OPTIONS='--import tsx' tsx tests/ragas/evaluate.ts",
     "test:ragas:results": "NODE_OPTIONS='--import tsx' tsx tests/ragas/show-results.ts",

apps/agent/tests/e2e/pages/chatbotPage.js

@@ -134,7 +134,7 @@ class ChatbotPage {
           document.querySelectorAll('[data-testid="chat-message-text"]'),
         );
         const successPattern =
-          /((Knowledge Asset|KA).*(created|published|generated|added|stored|uploaded)|(created|published|generated|added|stored|uploaded).*(Knowledge Asset|KA)|successfully.*(created|published)|UAL.*did:|Here.*UAL|Asset.*DKG|DKG.*Asset)/i;
+          /(?!.*unable)(?!.*failed)(?!.*error)(?!.*cannot)(?!.*can't)((Knowledge Asset|KA).*(created|published|generated|added|stored|uploaded)|(created|published|generated|added|stored|uploaded).*(Knowledge Asset|KA)|successfully.*(created|published)|UAL.*did:|Here.*UAL)/i;
         return messages.some((msg) =>
           successPattern.test(msg.textContent || ""),
         );
@@ -145,7 +145,7 @@ class ChatbotPage {
 
     // Find the success message and extract UAL from it
     const successMessageRegex =
-      /(Knowledge Asset.*(?:created|published|generated|added|stored|uploaded)|(?:created|published|generated|added|stored|uploaded).*Knowledge Asset|successfully.*(?:created|published)|UAL.*did:|Here.*UAL|Asset.*DKG|DKG.*Asset|KA.*(?:created|published)|(?:created|published).*KA)/i;
+      /(?!.*unable)(?!.*failed)(?!.*error)(?!.*cannot)(?!.*can't)(Knowledge Asset.*(?:created|published|generated|added|stored|uploaded)|(?:created|published|generated|added|stored|uploaded).*Knowledge Asset|successfully.*(?:created|published)|UAL.*did:|Here.*UAL|KA.*(?:created|published)|(?:created|published).*KA)/i;
 
     // Get all messages and find the one with success content
     const allMessages = await this.page.getByTestId("chat-message-text").all();

apps/agent/tests/ragas/run-ragas.sh

@@ -11,15 +11,24 @@ cd ../../
 # Function to cleanup on exit
 cleanup() {
     echo "🧹 Cleaning up..."
+    
+    # In CI, use force kill (-9) to prevent hanging
+    if [ -n "$CI" ] || [ -n "$JENKINS_URL" ] || [ -n "$GITHUB_ACTIONS" ] || [ -n "$GITLAB_CI" ]; then
+        KILL_SIGNAL="-9"
+        echo "🤖 CI environment detected - using force kill"
+    else
+        KILL_SIGNAL=""
+    fi
+    
     if [ ! -z "$FRONTEND_PID" ] && kill -0 $FRONTEND_PID 2>/dev/null; then
         echo "🔴 Stopping frontend server (PID: $FRONTEND_PID)..."
-        kill $FRONTEND_PID
-        wait $FRONTEND_PID 2>/dev/null
+        kill $KILL_SIGNAL $FRONTEND_PID 2>/dev/null || true
+        sleep 1
     fi
     if [ ! -z "$BACKEND_PID" ] && kill -0 $BACKEND_PID 2>/dev/null; then
         echo "🔴 Stopping backend server (PID: $BACKEND_PID)..."
-        kill $BACKEND_PID
-        wait $BACKEND_PID 2>/dev/null
+        kill $KILL_SIGNAL $BACKEND_PID 2>/dev/null || true
+        sleep 1
     fi
     # Note: Dashboard process (DASHBOARD_PID) is intentionally NOT killed
     # to allow continued access to results after evaluation completes
@@ -139,15 +148,15 @@ if [ $? -eq 0 ]; then
         # Stop the evaluation servers but keep dashboard running
         if [ "$FRONTEND_ALREADY_RUNNING" = false ] && [ ! -z "$FRONTEND_PID" ] && kill -0 $FRONTEND_PID 2>/dev/null; then
             echo "🔴 Stopping frontend server (evaluation complete)..."
-            kill $FRONTEND_PID
-            wait $FRONTEND_PID 2>/dev/null
+            kill $FRONTEND_PID 2>/dev/null || true
+            sleep 1
             FRONTEND_PID=""
         fi
 
         if [ "$BACKEND_ALREADY_RUNNING" = false ] && [ ! -z "$BACKEND_PID" ] && kill -0 $BACKEND_PID 2>/dev/null; then
             echo "🔴 Stopping backend server (evaluation complete)..."
-            kill $BACKEND_PID
-            wait $BACKEND_PID 2>/dev/null
+            kill $BACKEND_PID 2>/dev/null || true
+            sleep 1
             BACKEND_PID=""
         fi
 

package-lock.json

@@ -25,9 +25,11 @@ export const serializeSourceKAContent = (
   [${k.ual}](${getExplorerUrl(k.ual)})`,
       )
       .join("\n"),
+  _meta: {
   description:
     "This section provides a list of source knowledge assets used in the creation of this content." +
     "This data should be included in the final output.",
+  },
 });
 
 export const parseSourceKAContent = (