improved structure of views

lib/analyze.js

@@ -145,40 +145,59 @@ const views = async (url) => {
         puppeteer.devices['iPhone 5']
     ];
     try {
+
         const page = await browser.newPage(); // Create a new page
 
         await page.setBypassCSP(true);
         page.setDefaultNavigationTimeout(0);
-        const navigationPromise = page.waitForNavigation();  // Set a promise awaiting page navigation
 
         cliReporter(pageCol('Page: ' + url));
-        await page.goto(url, { waitUntil: 'domcontentloaded' }); // Load the page you want to test
-        await navigationPromise; // Wait for the page to load
-        const builder = new AxePuppeteer(page); // Create instance of AxePuppeteer
-        builder.withTags(['wcag2a', 'wcag2aa']);
 
         for (let device of devices) {
 
-            cliReporter(viewportCol(device.name));
-            await page.emulate(device);
-            var results = await builder.analyze(); // Check accessibility of page, returning axe results object
-            var title = await page.title();
-            results.title = title || url;
-            logResults(results);
-            myResults.push(results);
+            try {
+                await page.emulate(device);
+                cliReporter(viewportCol(device.name));
+
+                await page.goto(url); // Load the page you want to test
+                const builder = new AxePuppeteer(page); // Create instance of AxePuppeteer
+                builder.withTags(['wcag2a', 'wcag2aa']);
+
+                var results = await builder.analyze(); // Check accessibility of page, returning axe results object
+                var title = await page.title();
+                results.title = title || url;
+                logResults(results);
+                myResults.push(results);
+            } catch (err) {
+                cliReporter(error('SOMETHING WENT WRONG WHILE LOOPING THROUGH DEVICES'));
+                myResults.push({
+                    ERROR: {
+                        name: err.name,
+                        message: err.message,
+                        stack: err.stack
+                    },
+                    url: url,
+                    device: device
+                });
+            }
         }
 
-        await page.close();
 
     } catch (err) {
+        cliReporter(error('SOMETHING WENT WRONG WHILE TESTING THE PAGE'));
+        myResults.push({
+            ERROR: {
+                name: err.name,
+                message: err.message,
+                stack: err.stack
+            },
+            url: url
+        });
+    } finally {
+        await page.close();
         await browser.close();
-        console.error(err);
-        return {
-            error: err
-        };
+        return myResults;
     }
-    await browser.close();
-    return myResults;
 }
 const site = async (urls) => {
     let myResults = [];