@cuppet/core 1.3.7 → 2.0.0

package/features/app/stepDefinitions/apiSteps.js

@@ -40,12 +40,10 @@ Given('that I have a multipart request body', async function (docString) {
     const body = JSON.parse(docString);
     await apiSteps.buildMultipartFormData(body);
 });
-Given(
-    'I put {string} to {string} property of {string} element in the body',
-    async function (value, property, parentObj) {
-        await apiSteps.iPutValuesInRequestBody(value, property, parentObj);
-    }
-);
+Given('I put {string} to {string} property in the request body', async function (value, objectPath) {
+    const checkedValue = await dataStorage.checkForSavedVariable(value);
+    await apiSteps.iPutValuesInRequestBody(checkedValue, objectPath);
+});
 
 Given('I create json object from {string} file', async function (filePath) {
     const checkedPath = await dataStorage.checkForSavedVariable(filePath);
@@ -56,5 +54,7 @@ Given('I validate that the page is a valid XML', async function () {
     await apiSteps.validateXMLEndpoint(currentPath);
 });
 Then('the response header {string} should be {string}', async function (header, value) {
-    await apiSteps.validateResponseHeader(header, value);
+    const checkedHeader = await dataStorage.checkForSavedVariable(header);
+    const checkedValue = await dataStorage.checkForSavedVariable(value);
+    await apiSteps.validateResponseHeader(checkedHeader, checkedValue);
 });

package/features/tests/example.feature

@@ -14,4 +14,4 @@ Feature: Open DEMO QA (as base site) and use the elements section
      And I wait for element with "#output" selector to appear within "2" seconds
      And I should see the element with selector "#name"
      And I should see the element with selector "#email"
-     And I should see the element with selector "p#currentAddress"
+     And I should see the element with selector "p#currentAddress"

package/package.json

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

package/src/apiFunctions.js

@@ -148,17 +148,28 @@ module.exports = {
      * }
      * @async
      * @function prepareRequestBody
-     * @param value - the value of the new property
-     * @param property - the name of the property
-     * @param object - parent object name
+     * @param value - the value to set
+     * @param objectPath - the path in dot notation (e.g., "home.user.firstName")
      * @returns {Promise<Object>} - returns the request body object
      */
-    iPutValuesInRequestBody: async function (value, property, object) {
-        const preparedValue = await storage.checkForVariable(value);
+    iPutValuesInRequestBody: async function (value, objectPath) {
         if (!this.request) {
             this.request = {};
         }
-        this.request[object][property] = preparedValue;
+
+        const keys = objectPath.split('.');
+        let current = this.request;
+
+        // Navigate/create the path, stopping before the last key
+        for (let i = 0; i < keys.length - 1; i++) {
+            if (!current[keys[i]]) {
+                current[keys[i]] = {};
+            }
+            current = current[keys[i]];
+        }
+
+        // Set the final value
+        current[keys[keys.length - 1]] = value;
         return this.request;
     },
 
@@ -272,15 +283,9 @@ module.exports = {
     validateResponseHeader: async function (header, value) {
         // Resolve header and value from variables or user input.
         // The header is checked directly for faster execution as it is less likely to contain variables.
-        const resolveHeader = await storage.checkForVariable(header);
-        const resolveValue = await storage.checkForSavedVariable(value);
-        const actualValue = this.response.headers[resolveHeader.toLowerCase()];
-        assert.isDefined(actualValue, `The response header "${resolveHeader}" is not found!`);
-        assert.strictEqual(
-            actualValue,
-            resolveValue,
-            `The response header "${resolveHeader}" does not have the expected value`
-        );
+        const actualValue = this.response.headers[header.toLowerCase()];
+        assert.isDefined(actualValue, `The response header "${header}" is not found!`);
+        assert.strictEqual(actualValue, value, `The response header "${header}" does not have the expected value`);
     },
 
     /**

package/src/dataStorage.js

@@ -94,7 +94,7 @@ module.exports = {
 
     /**
      * Check for variable existence or return the inputted value.
-     * To be used in steps which can work both with JSON vars and direct user input
+     * Do not use separately in step definitions, use checkForSavedVariable instead.
      * @param variable
      * @returns {*}
      */
@@ -110,7 +110,11 @@ module.exports = {
      * @returns {Promise<*>}
      */
     checkForSavedVariable: async function (data) {
-        return data.replace(/%([a-zA-Z_-]+)%/g, (match, p1) => {
+        // First check if the whole variable is stored
+        const resolvedData = this.checkForVariable(data);
+
+        // Then check for %% pattern replacements
+        return resolvedData.replace(/%([a-zA-Z_-]+)%/g, (match, p1) => {
             return this.checkForVariable(p1);
         });
     },