Merge pull request #850 from GoogleChrome/notabid

navigate to about:blank before driver setup
GoogleChrome · Oct 28, 2016 · 11c6647 · 11c6647
2 parents 48a524d + 624fbdf
commit 11c6647
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lighthouse-core/gather/connections/extension.js b/lighthouse-core/gather/connections/extension.js
@@ -155,7 +155,7 @@ class ExtensionConnection extends Connection {
   }
 
   getCurrentTabId() {
-    return this.queryCurrentTab_().then(currentTab => {
+    return this._queryCurrentTab().then(currentTab => {
       return new Promise((resolve, reject) => {
         chrome.debugger.getTargets(targets => {
           const target = targets.find(target => target.tabId === currentTab.id);

diff --git a/lighthouse-core/gather/gather-runner.js b/lighthouse-core/gather/gather-runner.js
@@ -25,8 +25,9 @@ const path = require('path');
  * Execution sequence when GatherRunner.run() is called:
  *
  * 1. Setup
- *   A. driver.connect()
- *   B. GatherRunner.setupDriver()
+ *   A. navigate to about:blank
+ *   B. driver.connect()
+ *   C. GatherRunner.setupDriver()
  *     i. checkForMultipleTabsAttached
  *     ii. beginEmulation
  *     iii. cleanAndDisableBrowserCaches
@@ -46,7 +47,7 @@ const path = require('path');
  *     ii. all gatherer's afterPass()
  *
  * 3. Teardown
- *   A. driver.disconnect()
+ *   A. GatherRunner.disposeDriver()
  *   B. collect all artifacts and return them
  */
 class GatherRunner {
@@ -221,6 +222,7 @@ class GatherRunner {
     passes = this.instantiateGatherers(passes, options.config.configDir);
 
     return driver.connect()
+      .then(_ => GatherRunner.loadBlank(driver))
       .then(_ => GatherRunner.setupDriver(driver, options))
 
       // Run each pass