@auxcode/auxta 0.1.11 → 0.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@auxcode/auxta",
-  "version": "0.1.11",
+  "version": "0.2.0",
   "description": "",
   "main": "src/AuxTA.ts",
   "scripts": {

package/src/AuxTA.ts

@@ -24,12 +24,6 @@ class AuxTA extends FunctionHelper {
             while (true) {
                 file = path.join(__dirname, currentDir, "auxta.json");
                 if (!fs.existsSync(file)) {
-                    console.log("Current dir: ", file)
-                    console.log("Files: ")
-                    const files = fs.readdirSync(path.join(__dirname, currentDir));
-                    files.forEach(file => {
-                        console.log("- " + file);
-                    });
                     currentDir += "../"
                     if (currentDir.length >= 30) {
                         console.log("auxta.json file not found!")

package/src/auxta/configs/config.ts

@@ -26,7 +26,7 @@ export let config = {
     netlifyPath: "",
     digitalProduct: "",
     token: "",
-    timeout: 1000,
+    timeout: 10000,
     suitesList: [],
     auxtaCredentials: {
         email: "",

package/src/macros/helpers/code.helper.ts

@@ -1,9 +1,10 @@
 import log from "../../auxta/services/log.service";
 import puppeteer from "../../puppeteer/puppeteer";
 import { StepStatusEnum } from "../../auxta/enums/step-status.enum";
+import { config } from "../../auxta/configs/config";
 
 export class FunctionHelper {
-    public readonly defaultTimeout: number = Number(process.env.AUXTA_TIMEOUT);
+    public readonly defaultTimeout: number = config.timeout;
 
     public log(keyword: string, name: string, status: StepStatusEnum){
         log.push(keyword, name, status)
@@ -22,35 +23,38 @@ export class FunctionHelper {
         await page.waitForTimeout(this.defaultTimeout);
         const [linkHandlers] = await page.$x(`//${selector}[. = ${this.getEscapedText(text)}]`);
 
+        const message = `I click on the ${text} ${selector}`;
         if (linkHandlers) {
-            log.push('And', `I click on the ${text} ${selector}`, StepStatusEnum.PASSED);
+            log.push('Then', message, StepStatusEnum.PASSED);
             await linkHandlers.click();
         } else {
-            log.push('And', `I click on the ${text} ${selector}`, StepStatusEnum.FAILED);
+            log.push('Then', message, StepStatusEnum.FAILED);
             throw new Error(`Link not found: ${text}`);
         }
     }
 
     public async waitForSelectorWithText(selector: string, text: string) {
         const linkHandlers = await puppeteer.defaultPage.$x(`//${selector}[. = ${this.getEscapedText(text)}]`);
+        const message = `I check for ${text}`;
         if (linkHandlers.length > 0) {
-            log.push('And', `I checked for ${text} and found it.`, StepStatusEnum.PASSED);
+            log.push('And', message, StepStatusEnum.PASSED);
             return true;
         } else {
-            log.push('And', `I checked for ${text} and found it.`, StepStatusEnum.FAILED);
+            log.push('And', message, StepStatusEnum.FAILED);
             throw new Error(`Link not found: ${text}`);
         }
     }
 
     public async goto(page: string) {
         await puppeteer.defaultPage.goto(page);
-        log.push('And', `I go to the ${page} page`, StepStatusEnum.PASSED);
+        log.push('Then', `I go to the ${page} page`, StepStatusEnum.PASSED);
     }
 
     public async type(field: string, value: string) {
         await puppeteer.defaultPage.type(field, value);
-        const elementName = await puppeteer.defaultPage.$eval(field, (e) => e.textContent);
-        log.push('And', `I type '${value}' into the ${elementName} field`, StepStatusEnum.PASSED);
+        let elementName = await puppeteer.defaultPage.$eval(field, (e) => e.textContent);
+        if (!elementName || elementName === ' ') elementName = field;
+        log.push('Then', `I type '${value}' into the ${elementName} field`, StepStatusEnum.PASSED);
     }
 
     public async waitForNetwork() {
@@ -72,26 +76,35 @@ export class FunctionHelper {
      */
 
     public async waitForSelector(option: string, selector: string, time: number = this.defaultTimeout, page = puppeteer.defaultPage) {
-        await page.waitForSelector(selector, {
-            [option]: true,
-            timeout: time
-        });
+        const message = `I check for the ${selector} element to be ${option}`;
+        try{
+            await page.waitForSelector(selector, {
+                [option]: true,
+                timeout: time
+            });
+        } catch (e){
+            log.push('And', message, StepStatusEnum.FAILED);
+            throw new Error(message)
+        }
+        log.push('And', message, StepStatusEnum.PASSED);
     }
 
     public async click(className: string, page = puppeteer.defaultPage) {
         await page.waitForTimeout(this.defaultTimeout);
-        const elementName = await puppeteer.defaultPage.$eval(className, (e) => e.textContent);
+        let elementName = await puppeteer.defaultPage.$eval(className, (e) => e.textContent);
+        if (!elementName || elementName === ' ') elementName = className;
         await page.click(className);
         log.push('Then', `I click on ${elementName}`, StepStatusEnum.PASSED);
     }
 
     public async urlContains(selector: string) {
         const url = puppeteer.defaultPage.url();
+        let message = `I am on the ${selector} page`
         if (!url.includes(selector)) {
-            log.push('And', `I am on the ${selector} page`, StepStatusEnum.FAILED);
+            log.push('And', message, StepStatusEnum.FAILED);
             throw new Error(`I am not at the ${selector} page`)
         }
-        log.push('And', `I am on the ${selector} page`, StepStatusEnum.PASSED);
+        log.push('And', message, StepStatusEnum.PASSED);
     }
 
 }