artes 1.1.5 → 1.1.6

package/package.json

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

package/src/helper/stepFunctions/APIActions.js

@@ -4,9 +4,10 @@ const {
   context,
   selector,
   resolveVariable,
-  moduleConfig,
+  moduleConfig
 } = require("../imports/commons");
 
+
 function getMimeType(filePath) {
   const ext = path.extname(filePath).toLowerCase();
   const mimeTypes = {
@@ -28,52 +29,59 @@ function getMimeType(filePath) {
   return mimeTypes[ext] || "application/octet-stream";
 }
 
-function processForm(formData, key, value) {
-  if (typeof value === "object") {
-    if (value.contentType) {
-      const content =
-        typeof value.data === "object"
-          ? JSON.stringify(value.data)
-          : String(value.data);
-
-      formData[key] = {
-        name: value.filename || key,
-        mimeType: value.contentType,
-        buffer: Buffer.from(content, "utf8"),
-      };
-      return;
-    } else {
-      formData[key] = JSON.stringify(value);
-      return;
-    }
-  }
-
-  if (
-    typeof value === "string" &&
-    (value.endsWith(".pdf") ||
-      value.endsWith(".jpg") ||
-      value.endsWith(".png") ||
-      value.endsWith(".txt") ||
-      value.endsWith(".doc") ||
-      value.endsWith(".docx") ||
-      value.includes("/"))
-  ) {
-    try {
-      const filePath = path.join(moduleConfig.projectPath, value);
-      if (fs.existsSync(filePath)) {
-        formData[key] = {
-          name: path.basename(filePath),
-          mimeType: getMimeType(filePath),
-          buffer: fs.readFileSync(filePath),
-        };
-        return;
+function processForm( requestBody) {
+  for (const [key, value] of Object.entries(requestBody)) {
+
+      for (const item of value) {
+        if (typeof value === "object") {
+          if (value.contentType) {
+            const content =
+              typeof value.data === "object"
+                ? JSON.stringify(value.data)
+                : String(value.data);
+      
+            formData[key] = {
+              name: value.filename || key,
+              mimeType: value.contentType,
+              buffer: Buffer.from(content, "utf8"),
+            };
+            return;
+          } else {
+            formData[key] = JSON.stringify(value);
+            return;
+          }
+        }
+      
+        if (
+          typeof value === "string" &&
+          (value.endsWith(".pdf") ||
+            value.endsWith(".jpg") ||
+            value.endsWith(".png") ||
+            value.endsWith(".txt") ||
+            value.endsWith(".doc") ||
+            value.endsWith(".docx") ||
+            value.includes("/"))
+        ) {
+          try {
+            const filePath = path.join(moduleConfig.projectPath, value);
+            if (fs.existsSync(filePath)) {
+              formData[key] = {
+                name: path.basename(filePath),
+                mimeType: getMimeType(filePath),
+                buffer: fs.readFileSync(filePath),
+              };
+              return;
+            }
+          } catch (error) {
+            console.log(error);
+          }
+        }
+      
+        formData[key] = value;
+      
       }
-    } catch (error) {
-      console.log(error);
     }
-  }
-
-  formData[key] = value;
+    return formData;
 }
 
 async function requestMaker(headers, data, requestDataType) {
@@ -124,14 +132,12 @@ async function responseMaker(request, response, duration) {
   }
 
 
-
   return responseObject;
 }
 
 const api = {
   get: async (url, payload) => {
     const URL = await selector(url);
-    const resolvedURL = await resolveVariable(URL);
 
     const resolvedPayload = (await payload) && resolveVariable(payload);
     const payloadJSON = (await resolvedPayload) && JSON.parse(resolvedPayload);
@@ -140,7 +146,7 @@ const api = {
 
     const requestStarts = performance.now();
 
-    const res = await context.request.get(resolvedURL, req);
+    const res = await context.request.get(URL[0], req);
 
     const duration = performance.now() - requestStarts;
 
@@ -150,11 +156,10 @@ const api = {
   },
   head: async (url) => {
     const URL = await selector(url);
-    const resolvedURL = await resolveVariable(URL);
 
     const requestStarts = performance.now();
 
-    const res = await context.request.head(resolvedURL);
+    const res = await context.request.head(URL[0]);
 
     const duration = performance.now() - requestStarts;
 
@@ -164,7 +169,6 @@ const api = {
   },
   post: async (url, payload, requestDataType) => {
     const URL = await selector(url);
-    const resolvedURL = await resolveVariable(URL);
 
     const resolvedPayload = (await payload) && resolveVariable(payload);
     const payloadJSON = (await resolvedPayload) && JSON.parse(resolvedPayload);
@@ -173,15 +177,12 @@ const api = {
 
     switch (requestDataType) {
       case "multipart":
-        let formData = {};
 
-        for (const [key, value] of Object.entries(payloadJSON?.body)) {
-          processForm(formData, key, value);
-        }
+       const formRequest =  processForm( payloadJSON?.body || {});
 
         req = await requestMaker(
           payloadJSON?.headers || {},
-          formData || {},
+          formRequest || {},
           requestDataType,
         );
         break;
@@ -194,7 +195,7 @@ const api = {
 
     const requestStarts = performance.now();
 
-    const res = await context.request.post(resolvedURL, req);
+    const res = await context.request.post(URL[0], req);
 
     const duration = performance.now() - requestStarts;
 
@@ -204,7 +205,6 @@ const api = {
   },
   put: async (url, payload, requestDataType) => {
     const URL = await selector(url);
-    const resolvedURL = await resolveVariable(URL);
 
     const resolvedPayload = (await payload) && resolveVariable(payload);
     const payloadJSON = (await resolvedPayload) && JSON.parse(resolvedPayload);
@@ -213,15 +213,14 @@ const api = {
 
     switch (requestDataType) {
       case "multipart":
-        let formData = {};
 
-        for (const [key, value] of Object.entries(payloadJSON?.body)) {
-          processForm(formData, key, value);
-        }
+        const formRequest =  processForm( payloadJSON?.body || {});
+
+
 
         req = await requestMaker(
           payloadJSON?.headers || {},
-          formData || {},
+          formRequest || {},
           requestDataType,
         );
 
@@ -235,7 +234,7 @@ const api = {
 
     const requestStarts = performance.now();
 
-    const res = await context.request.put(resolvedURL, req);
+    const res = await context.request.put(URL[0], req);
 
     const duration = performance.now() - requestStarts;
 
@@ -245,7 +244,6 @@ const api = {
   },
   patch: async (url, payload, requestDataType) => {
     const URL = await selector(url);
-    const resolvedURL = await resolveVariable(URL);
 
     const resolvedPayload = (await payload) && resolveVariable(payload);
     const payloadJSON = (await resolvedPayload) && JSON.parse(resolvedPayload);
@@ -256,13 +254,12 @@ const api = {
       case "multipart":
         let formData = {};
 
-        for (const [key, value] of Object.entries(payloadJSON?.body)) {
-          processForm(formData, key, value);
-        }
+        const formRequest =  processForm( payloadJSON?.body || {});
+
 
         req = await requestMaker(
           payloadJSON?.headers || {},
-          formData || {},
+          formRequest || {},
           requestDataType,
         );
 
@@ -276,7 +273,7 @@ const api = {
 
     const requestStarts = performance.now();
 
-    const res = await context.request.patch(resolvedURL, req);
+    const res = await context.request.patch(URL[0], req);
 
     const duration = performance.now() - requestStarts;
 
@@ -286,7 +283,6 @@ const api = {
   },
   delete: async (url, payload) => {
     const URL = await selector(url);
-    const resolvedURL = await resolveVariable(URL);
 
     const resolvedPayload = (await payload) && resolveVariable(payload);
     const payloadJSON = (await resolvedPayload) && JSON.parse(resolvedPayload);
@@ -297,7 +293,7 @@ const api = {
 
     const requestStarts = performance.now();
 
-    const res = await context.request.delete(resolvedURL, req);
+    const res = await context.request.delete(URL[0], req);
 
     const duration = performance.now() - requestStarts;