@cuppet/core 1.2.2 → 1.2.4

package/features/app/mqttManager.js

@@ -258,24 +258,22 @@ class MqttManager {
     async waitForSpecificMessage(topic, message, timeoutSeconds = 10) {
         const timeoutMs = timeoutSeconds * 1000;
         const startTime = Date.now();
-
+        let latestMessageString = null;
         while (Date.now() - startTime < timeoutMs) {
             const latestMessage = this.getLatestMessage(topic);
             if (latestMessage) {
-                const latestMessageString = JSON.stringify(latestMessage.message);
+                latestMessageString = JSON.stringify(latestMessage.message);
                 const expectedMessageString = JSON.stringify(message);
                 if (latestMessageString === expectedMessageString) {
                     return latestMessage;
-                } else {
-                    throw new Error(
-                        `Message: ${latestMessageString} on topic ${topic} does not match expected: ${expectedMessageString}`
-                    );
                 }
             }
             await new Promise((resolve) => setTimeout(resolve, 100));
         }
 
-        throw new Error(`Timeout waiting for message on topic: ${topic} after ${timeoutSeconds} seconds`);
+        throw new Error(
+            `Timeout waiting for message on topic: ${topic} after ${timeoutSeconds} seconds. Latest message received: ${latestMessageString}`
+        );
     }
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cuppet/core",
-    "version": "1.2.2",
+    "version": "1.2.4",
     "description": "Core testing framework components for Cuppet - BDD framework based on Cucumber and Puppeteer",
     "main": "index.js",
     "files": [

package/src/apiFunctions.js

@@ -22,8 +22,11 @@ module.exports = {
     prepareUrl: async function (url) {
         const path = await storage.checkForMultipleVariables(url);
         if (!path.startsWith('http') && config.has('api.baseApiUrl')) {
-            return config.get('api.baseApiUrl') + path;
+            // Replace placeholders in base path with variables
+            const resolveBasePath = await storage.checkForMultipleVariables(config.get('api.baseApiUrl'));
+            return resolveBasePath + path;
         }
+        // Return the path as is if it's already an absolute URL or if no base path is configured
         return path;
     },