fix: login improvements

forsti0506 · Jan 24, 2021 · 8007276 · 8007276
1 parent c1ed243
commit 8007276
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 24 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/lib/a11y-sitechecker.ts b/lib/a11y-sitechecker.ts
@@ -167,12 +167,13 @@ async function analyzeSite(url: string, axeSpecs: Spec, page: Page, config: Conf
                         await analyzeSite(page.url(), axeSpecs, page, config);
                     } catch (e) {
                         log('seems like click was no navigation. Analyze and do it. ' + e);
+                        await waitForHTML(page);
                         if (page.url() !== url && !alreadyVisited.includes(url)) {
                             await analyzeSite(page.url(), axeSpecs, page, config);
                             await page.goto(url, { waitUntil: 'load' });
                             await waitForHTML(page);
                         } else if (config.analyzeClicksWithoutNavigation) {
-                            debug('Experimintal feature! Please check if there are to much clicks!');
+                            debug('Experimintal feature! Please check if there are to many clicks!');
                             const axe = await new AxePuppeteer(page);
                             axe.configure(axeSpecs);
                             const axeResults = await axe.analyze();

diff --git a/lib/utils/login.ts b/lib/utils/login.ts
@@ -7,10 +7,15 @@ export async function executeLogin(url: string, page: Page, config: Config): Pro
     if (!config.login) {
         return;
     }
-    await page.goto(url, { waitUntil: 'networkidle2' });
-    await waitForHTML(page);
-    await saveScreenshot(page, config.imagesPath, 'loginSite.png', config.saveImages);
-    await page.screenshot({ path: 'images/yeah.png' });
+    try {
+        await page.goto(url, { waitUntil: 'networkidle2' });
+        await page.waitForNavigation({ waitUntil: 'networkidle2' });
+        await waitForHTML(page);
+        await saveScreenshot(page, config.imagesPath, 'loginSite.png', config.saveImages);
+    } catch (e) {
+        await waitForHTML(page);
+        await saveScreenshot(page, config.imagesPath, 'loginSite.png', config.saveImages);
+    }
     for (const step of config.login) {
         for (const input of step.input) {
             await page.waitForSelector(input.selector);