GoogleChrome · brendankenny · Feb 6, 2017 · Feb 4, 2017 · Feb 4, 2017 · Feb 4, 2017
diff --git a/lighthouse-core/audits/dobetterweb/appcache-manifest.js b/lighthouse-core/audits/dobetterweb/appcache-manifest.js
@@ -43,13 +43,6 @@ class AppCacheManifestAttr extends Audit {
    * @return {!AuditResult}
    */
   static audit(artifacts) {
-    if (artifacts.AppCacheManifest === -1) {
-      return AppCacheManifestAttr.generateAuditResult({
-        rawValue: false,
-        debugString: 'Unable to determine if you\'re using AppCache.'
-      });
-    }
-
     const usingAppcache = artifacts.AppCacheManifest !== null;
     const debugString = usingAppcache ?
         `Found <html manifest="${artifacts.AppCacheManifest}">.` : '';

diff --git a/lighthouse-core/audits/dobetterweb/external-anchors-use-rel-noopener.js b/lighthouse-core/audits/dobetterweb/external-anchors-use-rel-noopener.js
@@ -42,20 +42,13 @@ class ExternalAnchorsUseRelNoopenerAudit extends Audit {
    * @return {!AuditResult}
    */
   static audit(artifacts) {
-    if (artifacts.AnchorsWithNoRelNoopener === -1) {
-      return ExternalAnchorsUseRelNoopenerAudit.generateAuditResult({
-        rawValue: -1,
-        debugString: 'Unknown error with the AnchorsWithNoRelNoopener gatherer.'
-      });
-    }
-
     let debugString;
     const pageHost = new URL(artifacts.URL.finalUrl).host;
     // Filter usages to exclude anchors that are same origin
     // TODO: better extendedInfo for anchors with no href attribute:
     // https://github.com/GoogleChrome/lighthouse/issues/1233
     // https://github.com/GoogleChrome/lighthouse/issues/1345
-    const failingAnchors = artifacts.AnchorsWithNoRelNoopener.usages
+    const failingAnchors = artifacts.AnchorsWithNoRelNoopener
       .filter(anchor => {
         try {
           return anchor.href === '' || new URL(anchor.href).host !== pageHost;

diff --git a/lighthouse-core/audits/dobetterweb/geolocation-on-start.js b/lighthouse-core/audits/dobetterweb/geolocation-on-start.js
@@ -46,19 +46,7 @@ class GeolocationOnStart extends Audit {
    * @return {!AuditResult}
    */
   static audit(artifacts) {
-    if (artifacts.GeolocationOnStart.value === -1) {
-      let debugString = 'Unknown error with the GeolocationOnStart gatherer';
-      if (artifacts.GeolocationOnStart.debugString) {
-        debugString = artifacts.GeolocationOnStart.debugString;
-      }
-
-      return GeolocationOnStart.generateAuditResult({
-        rawValue: -1,
-        debugString
-      });
-    }
-
-    const results = artifacts.GeolocationOnStart.usage.map(err => {
+    const results = artifacts.GeolocationOnStart.map(err => {
       return Object.assign({
         label: `line: ${err.line}, col: ${err.col}`
       }, err);

diff --git a/lighthouse-core/audits/dobetterweb/link-blocking-first-paint.js b/lighthouse-core/audits/dobetterweb/link-blocking-first-paint.js
@@ -49,12 +49,6 @@ class LinkBlockingFirstPaintAudit extends Audit {
    */
   static computeAuditResultForTags(artifacts, tagFilter) {
     const artifact = artifacts.TagsBlockingFirstPaint;
-    if (artifact.value === -1) {
-      return {
-        rawValue: -1,
-        debugString: artifact.debugString
-      };
-    }
 
     const filtered = artifact.filter(item => item.tag.tagName === tagFilter);
 

diff --git a/lighthouse-core/audits/dobetterweb/no-console-time.js b/lighthouse-core/audits/dobetterweb/no-console-time.js
@@ -48,21 +48,9 @@ class NoConsoleTimeAudit extends Audit {
    * @return {!AuditResult}
    */
   static audit(artifacts) {
-    if (artifacts.ConsoleTimeUsage.value === -1) {
-      let debugString = 'Unknown error with the ConsoleTimeUsage gatherer';
-      if (artifacts.ConsoleTimeUsage.debugString) {
-        debugString = artifacts.ConsoleTimeUsage.debugString;
-      }
-
-      return NoConsoleTimeAudit.generateAuditResult({
-        rawValue: -1,
-        debugString
-      });
-    }
-
     let debugString;
     // Filter usage from other hosts and keep eval'd code.
-    const results = artifacts.ConsoleTimeUsage.usage.filter(err => {
+    const results = artifacts.ConsoleTimeUsage.filter(err => {
       if (err.isEval) {
         return !!err.url;
       }

diff --git a/lighthouse-core/audits/dobetterweb/no-datenow.js b/lighthouse-core/audits/dobetterweb/no-datenow.js
@@ -48,21 +48,9 @@ class NoDateNowAudit extends Audit {
    * @return {!AuditResult}
    */
   static audit(artifacts) {
-    if (artifacts.DateNowUse.value === -1) {
-      let debugString = 'Unknown error with the DateNowUse gatherer';
-      if (artifacts.DateNowUse.debugString) {
-        debugString = artifacts.DateNowUse.debugString;
-      }
-
-      return NoDateNowAudit.generateAuditResult({
-        rawValue: -1,
-        debugString
-      });
-    }
-
     let debugString;
     // Filter usage from other hosts and keep eval'd code.
-    const results = artifacts.DateNowUse.usage.filter(err => {
+    const results = artifacts.DateNowUse.filter(err => {
       if (err.isEval) {
         return !!err.url;
       }

diff --git a/lighthouse-core/audits/dobetterweb/no-document-write.js b/lighthouse-core/audits/dobetterweb/no-document-write.js
@@ -46,19 +46,7 @@ class NoDocWriteAudit extends Audit {
    * @return {!AuditResult}
    */
   static audit(artifacts) {
-    if (artifacts.DocWriteUse.value === -1) {
-      let debugString = 'Unknown error with the DocWriteUse gatherer';
-      if (artifacts.DocWriteUse.debugString) {
-        debugString = artifacts.DocWriteUse.debugString;
-      }
-
-      return NoDocWriteAudit.generateAuditResult({
-        rawValue: -1,
-        debugString
-      });
-    }
-
-    const results = artifacts.DocWriteUse.usage.map(err => {
+    const results = artifacts.DocWriteUse.map(err => {
       return Object.assign({
         label: `line: ${err.line}, col: ${err.col}`
       }, err);

diff --git a/lighthouse-core/audits/dobetterweb/no-websql.js b/lighthouse-core/audits/dobetterweb/no-websql.js
@@ -45,16 +45,9 @@ class NoWebSQLAudit extends Audit {
    * @return {!AuditResult}
    */
   static audit(artifacts) {
-    if (artifacts.WebSQL.database === -1) {
-      return NoWebSQLAudit.generateAuditResult({
-        rawValue: -1,
-        debugString: artifacts.WebSQL.debugString
-      });
-    }
-
-    const db = artifacts.WebSQL.database;
-    const debugString = (db && db.database ?
-        `Found database "${db.database.name}", version: ${db.database.version}.` : '');
+    const db = artifacts.WebSQL;
+    const debugString = (db ?
+        `Found database "${db.name}", version: ${db.version}.` : '');
 
     return NoWebSQLAudit.generateAuditResult({
       rawValue: !db,

diff --git a/lighthouse-core/audits/dobetterweb/notification-on-start.js b/lighthouse-core/audits/dobetterweb/notification-on-start.js
@@ -46,19 +46,7 @@ class NotificationOnStart extends Audit {
    * @return {!AuditResult}
    */
   static audit(artifacts) {
-    if (artifacts.NotificationOnStart.value === -1) {
-      let debugString = 'Unknown error with the NotificationOnStart gatherer';
-      if (artifacts.NotificationOnStart.debugString) {
-        debugString = artifacts.NotificationOnStart.debugString;
-      }
-
-      return NotificationOnStart.generateAuditResult({
-        rawValue: -1,
-        debugString
-      });
-    }
-
-    const results = artifacts.NotificationOnStart.usage.map(err => {
+    const results = artifacts.NotificationOnStart.map(err => {
       return Object.assign({
         label: `line: ${err.line}, col: ${err.col}`
       }, err);

diff --git a/lighthouse-core/audits/dobetterweb/uses-optimized-images.js b/lighthouse-core/audits/dobetterweb/uses-optimized-images.js
@@ -81,10 +81,6 @@ class UsesOptimizedImages extends Audit {
   static audit_(artifacts, networkThroughput) {
     const images = artifacts.OptimizedImages;
 
-    if (images.rawValue === -1) {
-      return UsesOptimizedImages.generateAuditResult(images);
-    }
-
     const failedImages = [];
     let totalWastedBytes = 0;
     let hasAllEfficientImages = true;

diff --git a/lighthouse-core/gather/driver.js b/lighthouse-core/gather/driver.js
@@ -533,7 +533,7 @@ class Driver {
 
   /**
    * @param {string} selector Selector to find in the DOM
-   * @return {!Promise<Element[]>} The found elements, or [], resolved in a promise
+   * @return {!Promise<!Array<!Element>>} The found elements, or [], resolved in a promise
    */
   querySelectorAll(selector) {
     return this.sendCommand('DOM.getDocument')

diff --git a/lighthouse-core/gather/gatherers/dobetterweb/anchors-with-no-rel-noopener.js b/lighthouse-core/gather/gatherers/dobetterweb/anchors-with-no-rel-noopener.js
@@ -19,7 +19,10 @@
 const Gatherer = require('../gatherer');
 
 class AnchorsWithNoRelNoopener extends Gatherer {
-
+  /**
+   * @param {!Object} options
+   * @return {!Promise<!Array<{href: string, rel: string, target: string}>>}
+   */
   afterPass(options) {
     const driver = options.driver;
     return driver.querySelectorAll('a[target="_blank"]:not([rel~="noopener"])')
@@ -34,18 +37,13 @@ class AnchorsWithNoRelNoopener extends Gatherer {
         return Promise.all(failingNodes);
       })
       .then(failingNodes => {
-        return {
-          usages: failingNodes.map(node => {
-            return {
-              href: node[0],
-              rel: node[1],
-              target: node[2]
-            };
-          })
-        };
-      })
-      .catch(_ => {
-        return -1;
+        return failingNodes.map(node => {
+          return {
+            href: node[0],
+            rel: node[1],
+            target: node[2]
+          };
+        });
       });
   }
 }

diff --git a/lighthouse-core/gather/gatherers/dobetterweb/appcache.js b/lighthouse-core/gather/gatherers/dobetterweb/appcache.js
@@ -20,15 +20,17 @@
 const Gatherer = require('../gatherer');
 
 class AppCacheManifest extends Gatherer {
-
+  /**
+   * Retrurns the value of the html element's manifest attribute or null if it
+   * is not defined.
+   * @param {!Object} options
+   * @return {!Promise<?string>}
+   */
   afterPass(options) {
     const driver = options.driver;
 
     return driver.querySelector('html')
-      .then(node => node && node.getAttribute('manifest'))
-      .catch(_ => {
-        return -1;
-      });
+      .then(node => node && node.getAttribute('manifest'));
   }
 }
 

diff --git a/lighthouse-core/gather/gatherers/dobetterweb/console-time-usage.js b/lighthouse-core/gather/gatherers/dobetterweb/console-time-usage.js
@@ -29,17 +29,11 @@ class ConsoleTimeUsage extends Gatherer {
     this.collectUsage = options.driver.captureFunctionCallSites('console.time');
   }
 
+  /**
+   * @return {!Promise<!Array<{url: string, line: number, col: number}>>}
+   */
   afterPass() {
-    return this.collectUsage().then(consoleTimeUsage => {
-      return {
-        usage: consoleTimeUsage
-      };
-    }, e => {
-      return {
-        value: -1,
-        debugString: e.message
-      };
-    });
+    return this.collectUsage();
   }
 }
 

diff --git a/lighthouse-core/gather/gatherers/dobetterweb/datenow.js b/lighthouse-core/gather/gatherers/dobetterweb/datenow.js
@@ -29,17 +29,11 @@ class DateNowUse extends Gatherer {
     this.collectUsage = options.driver.captureFunctionCallSites('Date.now');
   }
 
+  /**
+   * @return {!Promise<!Array<{url: string, line: number, col: number}>>}
+   */
   afterPass() {
-    return this.collectUsage().then(dateNowUses => {
-      return {
-        usage: dateNowUses
-      };
-    }, e => {
-      return {
-        value: -1,
-        debugString: e.message
-      };
-    });
+    return this.collectUsage();
   }
 }
 

diff --git a/lighthouse-core/gather/gatherers/dobetterweb/document-write.js b/lighthouse-core/gather/gatherers/dobetterweb/document-write.js
@@ -29,17 +29,11 @@ class DocWriteUse extends Gatherer {
     this.collectUsage = options.driver.captureFunctionCallSites('document.write');
   }
 
+  /**
+   * @return {!Promise<!Array<{url: string, line: number, col: number}>>}
+   */
   afterPass() {
-    return this.collectUsage().then(DocWriteUses => {
-      return {
-        usage: DocWriteUses
-      };
-    }, e => {
-      return {
-        value: -1,
-        debugString: e.message
-      };
-    });
+    return this.collectUsage();
   }
 }
 

diff --git a/lighthouse-core/gather/gatherers/dobetterweb/geolocation-on-start.js b/lighthouse-core/gather/gatherers/dobetterweb/geolocation-on-start.js
@@ -32,31 +32,23 @@ class GeolocationOnStart extends Gatherer {
         'navigator.geolocation.watchPosition');
   }
 
+  /**
+   * @param {!Object} options
+   * @return {!Promise<!Array<{url: string, line: number, col: number}>>}
+   */
   afterPass(options) {
     return options.driver.queryPermissionState('geolocation')
-        .then(state => {
-          if (state === 'granted' || state === 'denied') {
-            return {
-              value: -1,
-              debugString: 'Unable to determine if this permission was requested ' +
-                           'on page load because it had already been set. ' +
-                           'Try resetting the permission and run Lighthouse again.'
-            };
-          }
-
-          return this.collectCurrentPosUsage().then(results => {
-            return this.collectWatchPosUsage().then(results2 => results.concat(results2));
-          }).then(results => {
-            return {
-              usage: results
-            };
-          });
-        }).catch(e => {
-          return {
-            value: -1,
-            debugString: e && e.message
-          };
+      .then(state => {
+        if (state === 'granted' || state === 'denied') {
+          throw new Error('Unable to determine if this permission was requested on page load ' +
+              'because it had already been set. Try resetting the permission and running ' +
+              'Lighthouse again.');
+        }
+
+        return this.collectCurrentPosUsage().then(results => {
+          return this.collectWatchPosUsage().then(results2 => results.concat(results2));
         });
+      });
   }
 }