artes 1.4.7 → 1.4.8

package/executer.js

@@ -445,12 +445,11 @@ if (fs.existsSync(path.join(process.cwd(), "node_modules", "artes" , "@rerun.txt
     artesConfig.report
   ){
     const executor = getExecutor();
-
-fs.writeFileSync(
-  path.join(process.cwd(), "node_modules", "artes",'allure-result',"executor.json"),
-  JSON.stringify(executor, null, 2)
-);
-generateReport();
+      fs.writeFileSync(
+        path.join(process.cwd(), "node_modules", "artes",'allure-result',"executor.json"),
+        JSON.stringify(executor, null, 2)
+      );
+      generateReport();
   }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "artes",
-  "version": "1.4.7",
+  "version": "1.4.8",
   "description": "The simplest way to automate UI and API tests using Cucumber-style steps.",
   "main": "index.js",
   "scripts": {

package/src/helper/controller/elementController.js

@@ -94,12 +94,13 @@ function getElement(element) {
   return locator;
 }
 
-function extractVarsFromResponse(responseBody, vars, customVarName) {
+function extractVarsFromResponse(responseBody, vars, customVarNames) {
+
   function getValueByPath(obj, path) {
     const keys = path.split(".");
     let current = obj;
 
-    if (typeof obj == "string") return obj;
+    if (typeof obj === "string") return obj;
 
     for (const key of keys) {
       if (current && typeof current === "object" && key in current) {
@@ -112,11 +113,28 @@ function extractVarsFromResponse(responseBody, vars, customVarName) {
     return current;
   }
 
-  vars.split(",").forEach((v) => {
-    const path = v.trim();
+
+  const varPaths = vars.split(",").map(v => v.trim());
+  let customNames = [];
+
+  if (typeof customVarNames === "string") {
+    customNames = customVarNames.split(",").map(n => n.trim());
+  } else if (Array.isArray(customVarNames)) {
+    customNames = customVarNames;
+  } else {
+    throw new Error("customVarNames must be a string or an array");
+  }
+
+
+  if (customNames.length !== varPaths.length) {
+    customNames = varPaths;
+  }
+
+
+  varPaths.forEach((path, index) => {
     const value = getValueByPath(responseBody, path);
     if (value !== undefined) {
-      saveVar(value, customVarName, path);
+      saveVar(value, customNames[index], path);
     }
   });
 }
@@ -136,43 +154,43 @@ function saveVar(value, customName, path) {
   }
 }
 
-function resolveVariable(template) {
-  if (typeof template === "string") {
-    return template.replace(/{{\s*(\w+)\s*}}/g, (_, varName) => {
-      let value = context.vars[varName];
-
-      if (value !== undefined) {
-        if (typeof value !== "string") {
-          try {
-            value = JSON.stringify(value);
-          } catch {
-            value = String(value);
-          }
-        }
-
-        return value
-          .replace(/\n/g, "\\n")
-          .replace(/\r/g, "\\r")
-          .replace(/\t/g, "\\t");
+function extractVarsFromResponse(responseBody, vars, customVarName) {
+  function getValueByPath(obj, path) {
+    const keys = path.split(".");
+    let current = obj;
+
+    if (typeof obj == "string") return obj;
+
+    for (const key of keys) {
+      if (current && typeof current === "object" && key in current) {
+        current = current[key];
+      } else {
+        return undefined;
       }
+    }
 
-      return `{{${varName}}}`;
-    });
+    return current;
   }
 
-  if (Array.isArray(template)) {
-    return template.map((item) => resolveVariable(item));
-  }
+  const varList = vars.split(",").map((v) => v.trim());
+  const customVarNames = customVarName
+    ? customVarName.split(",").map((n) => n.trim())
+    : [];
 
-  if (template && typeof template === "object") {
-    const result = {};
-    for (const key in template) {
-      result[key] = resolveVariable(template[key]);
+  varList.forEach((path, index) => {
+    const value = getValueByPath(responseBody, path);
+    if (value !== undefined) {
+      let resolvedName;
+      if (customVarNames.length === 0) {
+        resolvedName = undefined;          
+      } else if (customVarNames.length === 1) {
+        resolvedName = customVarNames[0]; 
+      } else {
+        resolvedName = customVarNames[index] ?? path; 
+      }
+      saveVar(value, resolvedName, path);
     }
-    return result;
-  }
-
-  return template;
+  });
 }
 
 module.exports = {

package/src/hooks/hooks.js

@@ -21,7 +21,6 @@ const { moduleConfig, saveVar } = require("artes/src/helper/imports/commons");
 require("allure-cucumberjs");
 const allure = require("allure-js-commons");
 
-const statusDir = path.join(process.cwd(), "testsStatus");
 const HTTP_METHODS = ["GET", "HEAD", "POST", "PUT", "PATCH", "DELETE"];
 
 /* ------------------- Helpers ------------------- */
@@ -58,6 +57,23 @@ if (fs.existsSync(projectHooksPath)) {
   projectHooks = {};
 }
 
+// const mergedParams = {};
+
+// function mergeObjects(target, source) {
+//   for (const key in source) {
+//       if (
+//           source[key] &&
+//           typeof source[key] === 'object' &&
+//           !Array.isArray(source[key])
+//       ) {
+//           if (!target[key]) target[key] = {};
+//           mergeObjects(target[key], source[key]);
+//       } else {
+//           target[key] = source[key];
+//       }
+//   }
+// }
+
 /* ------------------- Hooks ------------------- */
 
 BeforeAll(async () => {
@@ -126,6 +142,12 @@ BeforeStep(async ({ pickleStep }) => {
     context.response = {};
   }
 
+//   if (pickleStep.argument?.docString?.content) {
+//     const resolvedParams = (await pickleStep.argument.docString.content) && resolveVariable(pickleStep.argument.docString.content)
+//     const parsedParams = JSON.parse(resolvedParams);
+//     mergeObjects(mergedParams, parsedParams);
+// }
+
   if (typeof projectHooks.BeforeStep === "function") {
     await projectHooks.BeforeStep();
   }
@@ -146,7 +168,6 @@ After(async function ({result, pickle}) {
     await projectHooks.After();
   }
 
-  await attachResponse(allure.attachment);
   context.response = await {};
   allure.attachment('Variables', JSON.stringify(context.vars, null, 2), 'application/json')