@auxcode/auxta 0.1.5 → 0.1.9

package/package.json

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

package/src/AuxTA.ts

@@ -1,5 +1,5 @@
 import puppeteer, { Puppeteer } from "./puppeteer/puppeteer";
-import f, { FunctionHelper } from "./macros/helpers/code.helper";
+import { FunctionHelper } from "./macros/helpers/code.helper";
 import path from "path";
 import fs from "fs";
 import StepStatusEnum from "./auxta/enums/step-status.enum";
@@ -11,25 +11,33 @@ import { createEmptyReport } from "./auxta/services/report.service";
 
 dotenv.config();
 
-class AuxTA {
+class AuxTA extends FunctionHelper {
     public puppeteer: Puppeteer = puppeteer;
-    public functions: FunctionHelper = f;
 
     private readonly uploadModel: UploadModel;
 
     constructor() {
+        super();
         let file;
         try {
             //todo find a better way to load the file
-            let currentDir = "../"
+            let currentDir = ""
             while (true) {
                 file = path.join(__dirname, currentDir, "auxta.json");
                 try {
                     fs.accessSync(file, fs.constants.R_OK | fs.constants.W_OK)
                     break;
                 } catch {
+                    console.log("Current dir: ", file)
+                    console.log("Files: ")
+                    fs.readdir(path.join(__dirname, currentDir), (err, files) => {
+                        files.forEach(file => {
+                            console.log("- " + file);
+                        });
+                    });
                     currentDir += "../"
-                    if (currentDir.length >= 30) {
+                    if (currentDir.length >= 50) {
+                        console.log("auxta.json file not found!")
                         process.exit(1);
                         return;
                     }
@@ -43,7 +51,7 @@ class AuxTA {
             }
             this.uploadModel = new UploadModel(jsonConfig.organization, jsonConfig.baseURL, jsonConfig.digitalProduct);
         } catch (e: any) {
-            console.log("Missing or corrupted config: suitesList.json. Searching in location:", file)
+            console.log("Missing or corrupted config: auxta.json. Searching in location:", file)
             console.log(e);
             process.exit(1);
         }
@@ -72,7 +80,4 @@ export const StepStatus = StepStatusEnum;
 
 const auxta: AuxTA = new AuxTA();
 
-export const auxtaRun = auxta.run;
-export const auxtaFunc = auxta.functions;
-
 export default auxta;

package/src/auxta/services/report.service.ts

@@ -36,16 +36,20 @@ function headers(token: string) {
 }
 
 async function auth() {
-    //todo what happens if credentials are invalid?
-    return (await axios.post(
+    return axios.post(
         config.auxtaURL + 'login',
         config.auxtaCredentials,
         {
             headers: {
                 'Content-Type': 'application/json',
             }
-        }
-    )).data.token;
+        })
+        .then(({data}) => {
+            return data.token
+        })
+        .catch(() => {
+            throw new Error("Invalid login credentials")
+        });
 }
 
 export async function createEmptyReport(body: any): Promise<string> {

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

@@ -3,7 +3,7 @@ import puppeteer from "../../puppeteer/puppeteer";
 import { StepStatusEnum } from "../../auxta/enums/step-status.enum";
 
 export class FunctionHelper {
-    public readonly timeout: number = Number(process.env.AUXTA_TIMEOUT);
+    public readonly defaultTimeout: number = Number(process.env.AUXTA_TIMEOUT);
 
     public log(keyword: string, name: string, status: StepStatusEnum){
         log.push(keyword, name, status)
@@ -12,26 +12,27 @@ export class FunctionHelper {
     public suggest(name: string){
         log.addSuggestion(name)
     }
+
+    private getEscapedText(text: string){
+        const splitedQuotes = text.replace(/'/g, `', "'", '`)
+        return `concat('${splitedQuotes}', '')`;
+    }
     
     public async clickByText(selector: string, text: string, page = puppeteer.defaultPage) {
-        await page.waitForTimeout(this.timeout);
-        const splitedQuotes = text.replace(/'/g, `', "'", '`)
-        const escapedText = `concat('${splitedQuotes}', '')`;
-        const [linkHandlers] = await page.$x(`//${selector}[. = ${escapedText}]`);
+        await page.waitForTimeout(this.defaultTimeout);
+        const [linkHandlers] = await page.$x(`//${selector}[. = ${this.getEscapedText(text)}]`);
 
         if (linkHandlers) {
-            log.push('And', `I click ${selector} with text ${text}`, StepStatusEnum.PASSED);
+            log.push('And', `I click on the ${text} ${selector}`, StepStatusEnum.PASSED);
             await linkHandlers.click();
         } else {
-            log.push('And', `I click ${selector} with text ${text}`, StepStatusEnum.FAILED);
+            log.push('And', `I click on the ${text} ${selector}`, StepStatusEnum.FAILED);
             throw new Error(`Link not found: ${text}`);
         }
     }
 
     public async waitForSelectorWithText(selector: string, text: string) {
-        const splitedQuotes = text.replace(/'/g, `', "'", '`)
-        const escapedText = `concat('${splitedQuotes}', '')`;
-        const linkHandlers = await puppeteer.defaultPage.$x(`//${selector}[. = ${escapedText}]`);
+        const linkHandlers = await puppeteer.defaultPage.$x(`//${selector}[. = ${this.getEscapedText(text)}]`);
         if (linkHandlers.length > 0) {
             log.push('And', `I checked for ${text} and found it.`, StepStatusEnum.PASSED);
             return true;
@@ -43,16 +44,23 @@ export class FunctionHelper {
 
     public async goto(page: string) {
         await puppeteer.defaultPage.goto(page);
+        log.push('And', `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);
     }
 
     public async waitForNetwork() {
         await puppeteer.defaultPage.waitForNetworkIdle();
     }
 
+    public async timeout(timeout = this.defaultTimeout) {
+        await puppeteer.defaultPage.waitForTimeout(timeout);
+    }
+
     /**
      * Waiting for selector with timeout 60000
      *
@@ -63,7 +71,7 @@ export class FunctionHelper {
      * @param page
      */
 
-    public async waitForSelector(option: string, selector: string, time: number = this.timeout, page = puppeteer.defaultPage) {
+    public async waitForSelector(option: string, selector: string, time: number = this.defaultTimeout, page = puppeteer.defaultPage) {
         await page.waitForSelector(selector, {
             [option]: true,
             timeout: time
@@ -71,17 +79,19 @@ export class FunctionHelper {
     }
 
     public async click(className: string, page = puppeteer.defaultPage) {
-        await page.waitForTimeout(this.timeout);
+        await page.waitForTimeout(this.defaultTimeout);
+        const elementName = await puppeteer.defaultPage.$eval(className, (e) => e.textContent);
         await page.click(className);
+        log.push('Then', `I click on ${elementName}`, StepStatusEnum.PASSED);
     }
 
     public async urlContains(selector: string) {
         const url = puppeteer.defaultPage.url();
         if (!url.includes(selector)) {
-            await log.push('And', `I am on the ${selector} page`, StepStatusEnum.FAILED);
+            log.push('And', `I am on the ${selector} page`, StepStatusEnum.FAILED);
             throw new Error(`I am not at the ${selector} page`)
         }
-        await log.push('And', `I am on the ${selector} page`, StepStatusEnum.PASSED);
+        log.push('And', `I am on the ${selector} page`, StepStatusEnum.PASSED);
     }
 
 }