artes 1.0.71 → 1.0.73

package/package.json

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

package/src/helper/contextManager/browserManager.js

@@ -58,9 +58,13 @@ const invokeBrowser = async () => {
   }
 
   const context = await browser.newContext(browserContextOptions);
-  return await context;
+  
+  return {
+    browser: browser,
+    context: context
+  };
 };
 
 module.exports = {
   invokeBrowser,
-};
+};

package/src/helper/stepFunctions/APIActions.js

@@ -87,10 +87,14 @@ async function requestMaker(headers, data, requestDataType) {
   return request;
 }
 
-async function responseMaker(request, response) {
+async function responseMaker(request, response, duration) {
   const responseObject = {};
 
-  response && Object.assign(responseObject, { URL: response.url() });
+  response && Object.assign(responseObject, {
+    "Response Params": `URL: ${response.url()}
+     Response Status: ${await response.status()}
+     Response Time: ${Math.round(duration)} ms`
+  });
 
   request?.headers &&
     Object.assign(responseObject, { "Request Headers": await request.headers });
@@ -113,6 +117,8 @@ async function responseMaker(request, response) {
     }
   }
 
+  Object.assign(responseObject, { "Response Time":  `${Math.round(duration)} ms`});
+
   return responseObject;
 }
 
@@ -126,9 +132,13 @@ const api = {
 
     const req = await requestMaker(payloadJSON?.headers || {});
 
+    const requestStarts = performance.now();
+
     const res = await context.request.get(resolvedURL, req);
 
-    const response = responseMaker(payloadJSON, res);
+    const duration = performance.now() - requestStarts;
+
+    const response = responseMaker(payloadJSON, res, duration);
 
     context.response = await response;
   },
@@ -136,9 +146,13 @@ const api = {
     const URL = await selector(url);
     const resolvedURL = await resolveVariable(URL);
 
+    const requestStarts = performance.now();
+
     const res = await context.request.head(resolvedURL);
 
-    const response = responseMaker(payloadJSON, res);
+    const duration = performance.now() - requestStarts;
+
+    const response = responseMaker(payloadJSON, res, duration);
 
     context.response = await response;
   },
@@ -172,9 +186,13 @@ const api = {
         );
     }
 
+    const requestStarts = performance.now();
+
     const res = await context.request.post(resolvedURL, req);
 
-    const response = await responseMaker(payloadJSON, res);
+    const duration = performance.now() - requestStarts;
+
+    const response = await responseMaker(payloadJSON, res, duration);
 
     context.response = response;
   },
@@ -209,9 +227,13 @@ const api = {
         );
     }
 
+    const requestStarts = performance.now();
+
     const res = await context.request.put(resolvedURL, req);
 
-    const response = await responseMaker(payloadJSON, res);
+    const duration = performance.now() - requestStarts;
+
+    const response = await responseMaker(payloadJSON, res, duration);
 
     context.response = response;
   },
@@ -246,9 +268,13 @@ const api = {
         );
     }
 
+    const requestStarts = performance.now();
+
     const res = await context.request.patch(resolvedURL, req);
 
-    const response = await responseMaker(payloadJSON, res);
+    const duration = performance.now() - requestStarts;
+
+    const response = await responseMaker(payloadJSON, res, duration);
 
     context.response = response;
   },
@@ -261,9 +287,13 @@ const api = {
 
     const req = await requestMaker(payloadJSON?.headers || {});
 
+    const requestStarts = performance.now();
+
     const res = await context.request.delete(resolvedURL, req);
 
-    const response = responseMaker(payloadJSON, res);
+    const duration = performance.now() - requestStarts;
+
+    const response = responseMaker(payloadJSON, res, duration);
 
     context.response = await response;
   },

package/src/helper/stepFunctions/browserActions.js

@@ -12,10 +12,10 @@ const browser = {
     }
 
     cookieData = Array.isArray(cookieData) ? cookieData : [cookieData];
-    await context.browser.addCookies(cookieData);
+    await context.browserContext.addCookies(cookieData);
   },
 };
 
 module.exports = {
   browser,
-};
+};

package/src/hooks/hooks.js

@@ -14,9 +14,6 @@ const fs = require("fs");
 const { moduleConfig } = require("artes/src/helper/imports/commons");
 const path = require("path");
 
-let browser;
-let request;
-
 setDefaultTimeout(cucumberConfig.default.timeout * 1000);
 
 BeforeAll(async function () {
@@ -25,16 +22,18 @@ BeforeAll(async function () {
 
 Before(async function () {
   context.vars = {};
-  browser = await invokeBrowser();
-  request = await invokeRequest();
 
-  context.browser = await browser;
-  context.page = await browser.newPage();
-  await context.page.setDefaultTimeout(cucumberConfig.default.timeout * 1000);
+  const { browser, context: browserContext } = await invokeBrowser();
+  const requestInstance = await invokeRequest();
 
-  context.request = await request;
+  context.browser = browser;
+  context.browserContext = browserContext;
+  context.page = await browserContext.newPage();
+  context.request = requestInstance;
 
-  await browser.tracing.start({
+  await context.page.setDefaultTimeout(cucumberConfig.default.timeout * 1000);
+
+  await context.browserContext.tracing.start({
     sources: true,
     screenshots: true,
     snapshots: true,
@@ -42,36 +41,48 @@ Before(async function () {
 });
 
 After(async function ({ pickle, result }) {
-  let img;
-
   if (result?.status != Status.PASSED) {
-    img = await context.page.screenshot({
+    let img = await context.page.screenshot({
       path: `./test-results/visualReport/${pickle.name}/${pickle.name}.png`,
       type: "png",
     });
     await this.attach(img, "image/png");
   }
 
-  await browser.tracing.stop({
+  await context.browserContext.tracing.stop({
     path: path.join(moduleConfig.projectPath, "./trace.zip"),
   });
 
   if (context.response) {
-    Object.entries(context.response).forEach(async ([key, value]) => {
-      await this.attach(
-        `${key}:\n${JSON.stringify(value, null, 2)}`,
-        "text/plain",
-      );
-    });
+    for (const [key, value] of Object.entries(context.response)) {
+      let text = `${key}:\n`;
+  
+      if (typeof value === 'object') {
+        text += JSON.stringify(value, null, 2);
+      } else {
+        text += value;
+      }
+  
+      await this.attach(text, "text/plain");
+    }
   }
 
-  await context.page.close();
-  await browser.close();
-  await context.request.dispose();
-
-  if (result?.status != Status.PASSED) {
+  await context.page?.close();
+  
+  await context.browserContext?.close();
+  
+  await context.browser?.close();
+  
+  await context.request?.dispose();
+  
+  if (result?.status != Status.PASSED && context.page.video()) {
     const videoPath = await context.page.video().path();
-    const webmBuffer = await fs.readFileSync(videoPath);
-    await this.attach(webmBuffer, "video/webm");
+    await new Promise(resolve => setTimeout(resolve, 1000));
+    
+    if (fs.existsSync(videoPath)) {
+      const webmBuffer = await fs.readFileSync(videoPath);
+      await this.attach(webmBuffer, "video/webm");
+    }
   }
-});
+
+});