automation_model 1.0.11 → 1.0.13

package/bin/auto_page.js

@@ -26,9 +26,9 @@ class AutoPage {
   /**
    * init context
    */
-  static async init(navigate = true) {
+  static async init(navigate = true, headless = false) {
     const instance = new this();
-    instance.context = await getContext();
+    instance.context = await getContext(null, headless);
     instance.page = instance.context.page;
     instance.browser = instance.context.browser;
     instance.stable = instance.context.stable;

package/bin/browser_manager.js

@@ -9,7 +9,11 @@ class BrowserManager {
     this.browsers = [];
   }
   async closeBrowser(browser) {
-    if (browser !== null) {
+    if (!browser && this.browsers.length > 0) {
+      browser = this.browsers[0];
+    }
+
+    if (browser) {
       await browser.close();
       for (let i = 0; i < this.browsers.length; i++) {
         if (
@@ -24,15 +28,15 @@ class BrowserManager {
     }
   }
 
-  async createBrowser() {
+  async createBrowser(headless = false) {
     const browser = new Browser();
-    await browser.init();
+    await browser.init(headless);
     this.browsers.push(browser);
     return browser;
   }
-  async getBrowser() {
+  async getBrowser(headless = false) {
     if (this.browsers.length === 0) {
-      return await this.createBrowser();
+      return await this.createBrowser(headless);
     }
     return this.browsers[0];
   }
@@ -44,23 +48,14 @@ class Browser {
     this.page = null;
   }
 
-  async init() {
-    //let port = 9222;
+  async init(headless = false) {
     this.browser = await chromium.launch({
-      headless: false,
+      headless: headless,
       timeout: 0,
-      //args: ["--remote-debugging-port=" + port],
     });
-    // const cdpBrowser = await chromium.connectOverCDP({
-    //   endpointURL: `http://127.0.0.1:${port}/`,
-    // });
-    // //let context = await browser.newContext();
-    // const context = cdpBrowser.contexts()[0];
-    // let page = await context.newPage();
-    // page.goto("https://www.cnn.com");
+
     this.context = await this.browser.newContext();
     this.page = await this.context.newPage();
-    //console.log("browser", this.browser);
   }
 
   async close() {

package/bin/init_browser.js

@@ -7,11 +7,11 @@ import { StableBrowser } from "./stable_browser.js";
 let environment = null;
 
 // init browser create context and page, if context and page are not null
-const getContext = async function (environment = null) {
+const getContext = async function (environment = null, headless = false) {
   if (environment === null) {
     environment = initEnvoronment();
   }
-  let browser = await browserManager.getBrowser();
+  let browser = await browserManager.getBrowser(headless);
   let context = new TestContext();
   context.browser = browser.browser;
   context.playContext = browser.context;

package/bin/stable_browser.js

@@ -1,8 +1,9 @@
 import { expect } from "@playwright/test";
 class StableBrowser {
-  constructor(browser, page) {
+  constructor(browser, page, logger = console) {
     this.browser = browser;
     this.page = page;
+    this.logger = logger;
   }
 
   async goto(url) {
@@ -10,10 +11,16 @@ class StableBrowser {
       timeout: 60000,
     });
   }
-  async _fixLocator(locator) {
+  async _checkUnique(locator) {
     let count = await locator.count();
     if (count > 1) {
-      return locator.nth(0);
+      logger.error("Found more than one element for locator", JSON.stringify(locator));
+      for (let i = 0; i < count; i++) {
+        let loc = locator.nth(i);
+        if ((await loc.isVisible()) && (await loc.isEnabled())) {
+          return loc;
+        }
+      }
     }
     return locator;
   }
@@ -23,23 +30,19 @@ class StableBrowser {
         let currentScope = scope;
 
         for (let i = 0; i < selector.length; i++) {
-          currentScope = await this._fixLocator(
-            await this._locate(selector[i], currentScope)
-          );
+          currentScope = await this._locate(selector[i], currentScope);
         }
         return currentScope;
       }
       if (typeof selector === "object") {
         if (selector.css) {
-          return await this._fixLocator(scope.locator(selector.css));
+          return await this._checkUnique(scope.locator(selector.css));
         }
         if (selector.role) {
-          return await this._fixLocator(
-            scope.getByRole(selector.role[0], selector.role[1])
-          );
+          return await this._checkUnique(scope.getByRole(selector.role[0], selector.role[1]));
         }
         if (selector.text) {
-          return await this._fixLocator(scope.getByText(selector.text));
+          return await this._checkUnique(scope.getByText(selector.text));
         }
       }
       throw new Error(`Unknown locator type ${type}`);
@@ -62,9 +65,10 @@ class StableBrowser {
     await element.fill(value);
     await element.dispatchEvent("change");
   }
-  async verifyTextFoundInPage(text) {
-    const element = await page.getByText(text);
-    await expect(element !== undefined).toBeTruthy();
+  async verifyElementExistInPage(selector) {
+    const element = await this._locate(selector, this.page);
+    await expect(element).toHaveCount(1);
+    //await expect(element !== undefined).toBeTruthy();
   }
   async waitForPageLoad() {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "automation_model",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "An automation infrastructure module to be use for generative AI automation projects.",
   "main": "bin/index.js",
   "type": "module",
@@ -10,7 +10,8 @@
   "scripts": {
     "pack": "mkdir build && mkdir build/bin && cp ./src/auto_page.js ./build/bin/auto_page.js && cp ./src/environment.js ./build/bin/environment.js && cp ./src/browser_manager.js ./build/bin/browser_manager.js && cp ./src/test_context.js ./build/bin/test_context.js && cp ./src/init_browser.js ./build/bin/init_browser.js && cp ./src/stable_browser.js ./build/bin/stable_browser.js && cp ./src/index.js ./build/bin/index.js && cp ./package.json ./build/package.json",
     "clean": "rm -rf ./build",
-    "build": "npm run clean && npm run pack"
+    "build": "npm run clean && npm run pack",
+    "test": "node ./tests/launch_page.js"
   },
   "author": "",
   "license": "ISC",