Refactor error throwing from assertPageLoaded (#2785)

GoogleChrome · Jul 29, 2017 · 07817f9 · 07817f9
1 parent 4b9cbb5
commit 07817f9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/lighthouse-core/gather/gather-runner.js b/lighthouse-core/gather/gather-runner.js
@@ -140,14 +140,23 @@ class GatherRunner {
    * @param {!Array<WebInspector.NetworkRequest>} networkRecords
    */
   static assertPageLoaded(url, driver, networkRecords) {
+    if (!driver.online) return;
+
     const mainRecord = networkRecords.find(record => {
       // record.url is actual request url, so needs to be compared without any URL fragment.
       return URL.equalWithExcludedFragments(record.url, url);
     });
-    if (driver.online && (!mainRecord || mainRecord.failed)) {
-      const message = mainRecord ? mainRecord.localizedFailDescription : 'timeout reached';
-      log.error('GatherRunner', message);
-      const error = new Error(`Unable to load the page: ${message}`);
+
+    let errorMessage;
+    if (!mainRecord) {
+      errorMessage = 'no document request found';
+    } else if (mainRecord.failed) {
+      errorMessage = `failed document request (${mainRecord.localizedFailDescription})`;
+    }
+
+    if (errorMessage) {
+      log.error('GatherRunner', errorMessage, url);
+      const error = new Error(`Unable to load page: ${errorMessage}`);
       error.code = 'PAGE_LOAD_ERROR';
       throw error;
     }

diff --git a/lighthouse-core/test/gather/gather-runner-test.js b/lighthouse-core/test/gather/gather-runner-test.js
@@ -647,7 +647,7 @@ describe('GatherRunner', function() {
       const records = [];
       assert.throws(() => {
         GatherRunner.assertPageLoaded(url, {online: true}, records);
-      }, /Unable.*timeout/);
+      }, /Unable.*no document request/);
     });
   });