artes 1.0.18 → 1.0.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "artes",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "description": "The package provide step definitions and user writes feature files, and the package handles automation, with optional POM files and custom step definitions.",
   "main": "index.js",
   "scripts": {

package/src/helper/pomController/elementController.js

@@ -11,10 +11,42 @@ class Elements {
     if (!context.page) {
       throw new Error("Page context is not initialized.");
     }
+
+    const selectorType =
+      this.elements?.[element]?.selector?.split("=")[0] ||
+      this.elements?.[element]?.split("=")[0] ||
+      element?.split("=")[0];
     const selector =
-      this.elements?.[element]?.selector || this.elements?.[element] || element;
+      this.elements?.[element]?.selector?.split("=")[1] ||
+      this.elements?.[element]?.split("=")[1] ||
+      element?.split("=")[1];
+
+    const locator = [selectorType, selector];
+    
     const waitTime = this.elements[element]?.waitTime * 1000 || 0;
-    return context.page.locator(selector);
+
+    switch (locator[0]) {
+      case "xpath":
+        return context.page.locator(`xpath=${locator[1]}`);
+      case "name":
+        return context.page.locator(`[name=${locator[1]}]`);
+      case "placeholder":
+        return context.page.getByPlaceholder(locator[1]);
+      case "text":
+        return context.page.getByText(locator[1]);
+      case "label":
+        return context.page.getByLabel(locator[1]);
+      case "role":
+        return context.page.getByRole(locator[1]);
+      case "alt":
+        return context.page.getByAltText(locator[1]);
+      case "title":
+        return context.page.getByTitle(locator[1]);
+      case "testid":
+        return context.page.getByTestId(locator[1]);
+      default:
+        return context.page.locator(locator[0]);
+    }
   }
 
   static getSelector(element) {

package/src/hooks/hooks.js

@@ -20,12 +20,6 @@ setDefaultTimeout(cucumberConfig.default.cucumberTimeout * 1000);
 
 BeforeAll(async function () {
   pomCollector();
-
-  //  browser.tracing.start({
-  //   sources: true,
-  //   screenshots: true,
-  //   snapshots: true,
-  // });
 });
 
 Before(async function () {
@@ -33,6 +27,11 @@ Before(async function () {
   request = await invokeRequest();
   context.page = await browser.newPage();
   context.request = await request;
+  await browser.tracing.start({
+    sources: true,
+    screenshots: true,
+    snapshots: true,
+  });
 });
 
 After(async function ({ pickle, result }) {
@@ -46,10 +45,10 @@ After(async function ({ pickle, result }) {
     await this.attach(img, "image/png");
   }
 
+  await browser.tracing.stop({ path: "./trace.zip" });
   await context.page.close();
   await browser.close();
 
-  // await browser.tracing.stop({ path: 'trace.zip' });
   if (result?.status != Status.PASSED) {
     const videoPath = await context.page.video().path();
     const webmBuffer = await fs.readFileSync(videoPath);

package/src/stepDefinitions/assertions.steps.js

@@ -1,4 +1,4 @@
-const { Then } = require("../helper/imports/commons");
+const { Then, selector } = require("../helper/imports/commons");
 const { assert } = require("../helper/stepFunctions/exporter");
 
 // Check if a selector should be attached
@@ -181,7 +181,8 @@ Then(
 
 // Check if the page should have a specific URL
 Then("User expects to be in {string} page", async function (url) {
-  await assert.shouldPageHaveURL(url);
+  const URL = await selector(url);
+  await assert.shouldPageHaveURL(URL);
 });
 
 // Check if the response should be OK