@auxcode/auxta 1.3.82 → 1.3.84

package/build/macros/helpers/code.helper.d.ts

@@ -15,6 +15,7 @@ export declare class FunctionHelper extends ExtendDefaultPage {
     emulate(phone_name: string, page?: import("puppeteer").Page): Promise<void>;
     restartBrowser(): Promise<void>;
     clickAndWaitForPageToBeCreated(selector: string, page: import("puppeteer").Page | undefined, newPage: boolean): Promise<void>;
+    waitForResponse(name: string, wait?: boolean, page?: import("puppeteer").Page): Promise<void>;
     closeLastPage(page?: import("puppeteer").Page): Promise<void>;
     microsoftLogin(button: string, email: string, password: string, page?: import("puppeteer").Page, newPage?: boolean): Promise<void>;
     private getEscapedText;

package/build/macros/helpers/code.helper.js

@@ -178,6 +178,14 @@ class FunctionHelper extends extend_default_page_1.ExtendDefaultPage {
             }
         });
     }
+    waitForResponse(name, wait = true, page = puppeteer_1.default.defaultPage) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (wait) {
+                yield page.waitForResponse(response => response.url().includes(name));
+                this.log('Then', `I wait for response with name: ${name}`, status_of_step_1.StatusOfStep.PASSED);
+            }
+        });
+    }
     closeLastPage(page = puppeteer_1.default.defaultPage) {
         return __awaiter(this, void 0, void 0, function* () {
             const pages = yield page.browser().pages();
@@ -189,44 +197,20 @@ class FunctionHelper extends extend_default_page_1.ExtendDefaultPage {
         return __awaiter(this, void 0, void 0, function* () {
             const email_input = 'input[type="email"]';
             const password_input = 'input[type="password"]';
-            const next_button = 'input[value="Next"]';
-            const sign_in_button = 'input[value="Sign in"]';
-            const no_button = 'input.ext-secondary';
             yield this.clickAndWaitForPageToBeCreated(button, page, newPage);
             const pages = yield page.browser().pages();
             const loginPage = pages[pages.length - 1];
             yield this.extend_page_functions(loginPage);
-            yield loginPage.waitForNetworkIdle();
-            try {
-                yield loginPage.waitForSelector(next_button, { visible: true, timeout: 60000 });
-            }
-            catch (e) {
-            }
-            this.log('Then', `I checked for the '${next_button}' element to be visible`, AuxTA_1.StepStatus.PASSED);
+            yield this.waitForResponse('signin-options', true, loginPage);
             yield loginPage.type(email_input, email, { delay: 0 });
             yield loginPage.keyboard.press('Enter');
-            yield this.timeout(4000);
+            yield this.waitForResponse('microsoft_logo', true, loginPage);
             let isWorkOrPersonalVisible = yield page.$('div.table');
             if (!!isWorkOrPersonalVisible) {
                 yield (yield page.$$('div.table'))[0].click();
                 console.log('Then', 'I clicked Work or school account', AuxTA_1.StepStatus.PASSED);
-                yield this.timeout(4000);
-            }
-            else {
-                yield this.timeout(4000);
-            }
-            try {
-                yield loginPage.waitForSelector(sign_in_button, { visible: true, timeout: 60000 });
-            }
-            catch (e) {
+                yield this.waitForResponse('microsoft_logo', true, loginPage);
             }
-            this.log('Then', `I checked for the '${sign_in_button}' element to be visible`, AuxTA_1.StepStatus.PASSED);
-            try {
-                yield loginPage.waitForSelector(password_input, { visible: true, timeout: 60000 });
-            }
-            catch (e) {
-            }
-            this.log('Then', `I checked for the '${password_input}' element to be visible`, AuxTA_1.StepStatus.PASSED);
             try {
                 (_a = (yield loginPage.$(password_input))) === null || _a === void 0 ? void 0 : _a.type(password);
                 yield this.log('Then', `I type password into the ${password_input}`, AuxTA_1.StepStatus.PASSED);
@@ -235,14 +219,10 @@ class FunctionHelper extends extend_default_page_1.ExtendDefaultPage {
                 yield this.log('Then', `I type password into the ${password_input}`, AuxTA_1.StepStatus.FAILED);
                 throw new Error(`I type password into the ${password_input}`);
             }
-            yield this.timeout(4000);
+            yield this.timeout(1000);
             yield loginPage.keyboard.press('Enter');
-            try {
-                yield loginPage.waitForSelector(no_button, { visible: true, timeout: 60000 });
-            }
-            catch (e) {
-            }
-            this.log('Then', `I checked for the '${no_button}' element to be visible`, AuxTA_1.StepStatus.PASSED);
+            yield this.waitForResponse('2_bc3d32a696895f78c19d', true, loginPage);
+            yield this.timeout(1000);
             yield loginPage.keyboard.press('Enter');
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@auxcode/auxta",
-  "version": "1.3.82",
+  "version": "1.3.84",
   "description": "",
   "main": "./build/AuxTA.js",
   "types": "./build/AuxTA.d.ts",