@cuppet/core 1.3.1 → 1.3.2

package/features/app/stepDefinitions/mqttSteps.js

@@ -28,7 +28,8 @@ When('I unsubscribe from MQTT topic {string}', async function (topic) {
 });
 
 When('I prepare MQTT message as JSON', async function (docString) {
-    await mqttFunctions.prepareMessage(docString, true);
+    const message = JSON.stringify(docString);
+    await mqttFunctions.prepareMessage(message, true);
 });
 
 /**
@@ -57,7 +58,15 @@ When(
  * @example When I publish JSON '{"temperature": 25, "humidity": 60}' to MQTT topic "sensors/room1"
  */
 When('I publish JSON {string} to MQTT topic {string}', async function (jsonMessage, topic) {
-    await mqttFunctions.publishJsonMessage(this.mqttManager, jsonMessage, topic, 0, false);
+    await mqttFunctions.publishJsonMessage(this.mqttManager, topic, jsonMessage);
+});
+
+/**
+ * Publish an already prepared JSON message to an MQTT topic
+ * @example When I publish the prepared JSON message to MQTT topic "sensors/room1"
+ */
+When('I publish the prepared JSON message to MQTT topic {string}', async function (topic) {
+    await mqttFunctions.publishJsonMessage(this.mqttManager, topic);
 });
 
 /**

package/package.json

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

package/src/dataStorage.js

@@ -126,6 +126,9 @@ module.exports = {
         const regex = /%([^%]+)%/g;
         const allVariables = this.getJsonFile();
         // The convention dictates if function argument is not used, it can be replaced by "_".
+        if (typeof text !== 'string') {
+            throw new Error(`The value passed to checkForMultipleVariables is not a string: ${text}`);
+        }
         const result = text.replace(regex, (_, group) => {
             return allVariables[group];
         });

package/src/mqttFunctions.js

@@ -71,33 +71,25 @@ module.exports = {
      */
     publishMessage: async function (mqttManager, message, topic, qos = 0, retain = false) {
         const resolvedTopic = await this.prepareTopic(topic);
-        const resolvedMessage = this.messageObject || (await this.prepareMessage(message));
+        const resolvedMessage = await this.prepareMessage(message);
         await mqttManager.publish(resolvedTopic, resolvedMessage, { qos, retain });
-        delete this.messageObject;
     },
 
     /**
      * Publish a JSON message to a topic
      * @param {object} mqttManager - MQTT manager instance
-     * @param {string} jsonString - JSON string to publish
      * @param {string} topic - Topic to publish to
+     * @param {string} jsonString - JSON string to publish
      * @param {number} qos - Quality of Service level
      * @param {boolean} retain - Whether to retain the message
      * @returns {Promise<void>}
      */
-    publishJsonMessage: async function (mqttManager, jsonString, topic, qos = 0, retain = false) {
+    publishJsonMessage: async function (mqttManager, topic, jsonString = null, qos = 0, retain = false) {
         const resolvedTopic = await this.prepareTopic(topic);
-        const resolvedJson = this.messageObject || (await this.prepareMessage(jsonString));
-
-        // Validate JSON
-        try {
-            JSON.parse(resolvedJson);
-        } catch (error) {
-            throw new Error(`Invalid JSON message: ${error.message}`);
-        }
-
-        await mqttManager.publish(resolvedTopic, resolvedJson, { qos, retain });
+        const resolvedJson = jsonString ? await this.prepareMessage(jsonString, true) : this.messageObject;
+        // Delete the message object before the message is published to avoid conflicts if the request fails.
         delete this.messageObject;
+        await mqttManager.publish(resolvedTopic, resolvedJson, { qos, retain });
     },
 
     /**