@cuppet/core 1.3.7 → 1.3.8

package/features/app/stepDefinitions/apiSteps.js

@@ -43,7 +43,10 @@ Given('that I have a multipart request body', async function (docString) {
 Given(
     'I put {string} to {string} property of {string} element in the body',
     async function (value, property, parentObj) {
-        await apiSteps.iPutValuesInRequestBody(value, property, parentObj);
+        const checkedValue = await dataStorage.checkForSavedVariable(value);
+        const checkedProperty = await dataStorage.checkForSavedVariable(property);
+        const checkedParentObj = await dataStorage.checkForSavedVariable(parentObj);
+        await apiSteps.iPutValuesInRequestBody(checkedValue, checkedProperty, checkedParentObj);
     }
 );
 
@@ -56,5 +59,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/package.json

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

package/src/apiFunctions.js

@@ -154,11 +154,10 @@ module.exports = {
      * @returns {Promise<Object>} - returns the request body object
      */
     iPutValuesInRequestBody: async function (value, property, object) {
-        const preparedValue = await storage.checkForVariable(value);
         if (!this.request) {
             this.request = {};
         }
-        this.request[object][property] = preparedValue;
+        this.request[object][property] = value;
         return this.request;
     },
 
@@ -272,15 +271,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);
         });
     },