@cuppet/core 1.3.2 → 1.3.4

package/features/app/stepDefinitions/helperSteps.js

@@ -63,9 +63,35 @@ When(
         await dataStorage.generateAndSaveDateWithCustomFormat(format, variable, days);
     }
 );
-When('I generate time in {string} format for now and store it in {string}', async function (format, variable) {
-    await dataStorage.generateAndSaveDateWithCustomFormat(format, variable);
-});
+/**
+ * Generate date with custom format and timezone and store it in a variable
+ * @param format - date format
+ * @param variable - variable name
+ * @param offset - UTC offset in hours (acceptable values are -12, -6, -3, 0, 3, 6, 12, etc.)
+ * @returns {Promise<void>}
+ */
+When(
+    'I generate date in {string} format for today with UTC offset {int} hours and store it in {string}',
+    async function (format, offset, variable) {
+        const utcOffset = offset * 60;
+        await dataStorage.generateAndSaveDateWithCustomFormatAndTz(format, variable, 0, utcOffset);
+    }
+);
+/**
+ * Generate date with custom format and timezone and store it in a variable
+ * @param format - date format
+ * @param variable - variable name
+ * @param days - number of days to add/subtract from the current date
+ * @param offset - UTC offset in hours (acceptable values are -12, -6, -3, 0, 3, 6, 12, etc.)
+ * @returns {Promise<void>}
+ */
+When(
+    'I generate date in {string} format for {string} days from now with UTC offset {int} hours and store it in {string}',
+    async function (format, offset, days, variable) {
+        const utcOffset = offset * 60;
+        await dataStorage.generateAndSaveDateWithCustomFormatAndTz(format, variable, days, utcOffset);
+    }
+);
 When('I create json object from {string} file and store it in {string} variable', async function (filePath, variable) {
     const checkedPath = await dataStorage.checkForSavedVariable(filePath);
     const getFileData = dataStorage.getJsonFile(checkedPath);

package/features/app/stepDefinitions/mqttSteps.js

@@ -27,7 +27,7 @@ When('I unsubscribe from MQTT topic {string}', async function (topic) {
     await mqttFunctions.unsubscribeFromTopic(this.mqttManager, topic);
 });
 
-When('I prepare MQTT message as JSON', async function (docString) {
+When('I prepare a JSON as MQTT message', async function (docString) {
     const message = JSON.stringify(docString);
     await mqttFunctions.prepareMessage(message, true);
 });

package/package.json

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

package/src/dataStorage.js

@@ -276,17 +276,34 @@ module.exports = {
     },
 
     /**
-     *
-     * @param format
-     * @param variable
-     * @param days
+     * Generate date with custom format in local timezone and store it in a variable
+     * @param format - date format
+     * @param variable - variable name
+     * @param days - number of days to add/subtract from the current date
      * @returns {Promise<void>}
      */
     generateAndSaveDateWithCustomFormat: async function (format, variable, days = 0) {
-        let date = moment()
+        const date = moment()
             .add(days >= 0 ? days : -days, 'days')
             .format(format);
 
         await this.iStoreVariableWithValueToTheJsonFile(date, variable);
     },
+
+    /**
+     * Generate date with custom format and timezone and store it in a variable
+     * THIS METHID IS NOT COMBINED WITH THE generateAndSaveDateWithCustomFormat due to ease of use in Gherkin steps.
+     * @param format - date format
+     * @param variable - variable name
+     * @param days - number of days to add/subtract from the current date
+     * @param offset - UTC offset in minutes (acceptable values are -240, -120, -60, 0, 60, 120, 240, etc.)
+     * @returns {Promise<void>}
+     */
+    generateAndSaveDateWithCustomFormatAndTz: async function (format, variable, days = 0, offset = 0) {
+        const date = moment()
+            .utcOffset(offset)
+            .add(days >= 0 ? days : -days, 'days')
+            .format(format);
+        await this.iStoreVariableWithValueToTheJsonFile(date, variable);
+    },
 };

package/src/mqttFunctions.js

@@ -7,8 +7,8 @@ const helper = require('./helperFunctions');
  * Provides core MQTT testing operations following the same pattern as Puppeteer and Appium functions
  */
 module.exports = {
-    /** @type {Object} */
-    messageObject: null,
+    /** @type {string} */
+    messageString: null,
 
     /**
      * Prepare topic by replacing variables
@@ -28,8 +28,11 @@ module.exports = {
         const resolvedMessage = await storage.checkForMultipleVariables(message);
         if (json) {
             try {
-                this.messageObject = JSON.parse(resolvedMessage);
-                return this.messageObject;
+                // Validate JSON (do not assign the value to the message object)
+                JSON.parse(resolvedMessage);
+                // Pass it as a string
+                this.messageString = resolvedMessage;
+                return this.messageString;
             } catch (error) {
                 throw new Error(`Invalid JSON message: ${error.message}`);
             }
@@ -86,9 +89,9 @@ module.exports = {
      */
     publishJsonMessage: async function (mqttManager, topic, jsonString = null, qos = 0, retain = false) {
         const resolvedTopic = await this.prepareTopic(topic);
-        const resolvedJson = jsonString ? await this.prepareMessage(jsonString, true) : this.messageObject;
+        const resolvedJson = jsonString ? await this.prepareMessage(jsonString, true) : this.messageString;
         // Delete the message object before the message is published to avoid conflicts if the request fails.
-        delete this.messageObject;
+        delete this.messageString;
         await mqttManager.publish(resolvedTopic, resolvedJson, { qos, retain });
     },