handleJavascriptDialogs (#1939) (#2106)

GoogleChrome · May 1, 2017 · 283af87 · 283af87
1 parent 9706837
commit 283af87
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 0 deletions.
diff --git a/lighthouse-core/gather/driver.js b/lighthouse-core/gather/driver.js
@@ -833,6 +833,23 @@ class Driver {
     const promiseArr = urlPatterns.map(url => this.sendCommand('Network.addBlockedURL', {url}));
     return Promise.all(promiseArr);
   }
+
+  /**
+   * Dismiss JavaScript dialogs (alert, confirm, prompt), providing a
+   * generic promptText in case the dialog is a prompt.
+   * @return {!Promise}
+   */
+  dismissJavaScriptDialogs() {
+    return this.sendCommand('Page.enable').then(_ => {
+      this.once('Page.javascriptDialogOpening', _ => {
+        // rejection intentionally unhandled
+        this.sendCommand('Page.handleJavaScriptDialog', {
+          accept: true,
+          promptText: 'Lighthouse prompt response',
+        });
+      });
+    });
+  }
 }
 
 /**

diff --git a/lighthouse-core/gather/gather-runner.js b/lighthouse-core/gather/gather-runner.js
@@ -109,6 +109,7 @@ class GatherRunner {
       .then(_ => driver.beginEmulation(options.flags))
       .then(_ => driver.enableRuntimeEvents())
       .then(_ => driver.cacheNatives())
+      .then(_ => driver.dismissJavaScriptDialogs())
       .then(_ => resetStorage && driver.cleanAndDisableBrowserCaches())
       .then(_ => resetStorage && driver.clearDataForOrigin(options.url))
       .then(_ => driver.blockUrlPatterns(options.flags.blockedUrlPatterns || []))

diff --git a/lighthouse-core/test/gather/fake-driver.js b/lighthouse-core/test/gather/fake-driver.js
@@ -37,6 +37,9 @@ module.exports = {
   setThrottling() {
     return Promise.resolve();
   },
+  dismissJavaScriptDialogs() {
+    return Promise.resolve();
+  },
   assertNoSameOriginServiceWorkerClients() {
     return Promise.resolve();
   },

diff --git a/lighthouse-core/test/gather/gather-runner-test.js b/lighthouse-core/test/gather/gather-runner-test.js
@@ -255,6 +255,7 @@ describe('GatherRunner', function() {
       assertNoSameOriginServiceWorkerClients: asyncFunc,
       beginEmulation: asyncFunc,
       setThrottling: asyncFunc,
+      dismissJavaScriptDialogs: asyncFunc,
       enableRuntimeEvents: asyncFunc,
       cacheNatives: asyncFunc,
       cleanAndDisableBrowserCaches: createCheck('calledDisableNetworkCache'),
@@ -283,6 +284,7 @@ describe('GatherRunner', function() {
       assertNoSameOriginServiceWorkerClients: asyncFunc,
       beginEmulation: asyncFunc,
       setThrottling: asyncFunc,
+      dismissJavaScriptDialogs: asyncFunc,
       enableRuntimeEvents: asyncFunc,
       cacheNatives: asyncFunc,
       cleanAndDisableBrowserCaches: createCheck('calledDisableNetworkCache'),