From 145a67c6d0cfc13bb8fc2d6ee6706ab5cfad93ba Mon Sep 17 00:00:00 2001 From: Bob Owen Date: Wed, 23 Nov 2016 13:36:58 +0000 Subject: [PATCH] Bug 1147911 Part 4: Fix test to allow for separate file content process. r=ochameau --- .../test/browser_webconsole_bug_595223_file_uri.js | 5 +++-- devtools/client/webconsole/test/head.js | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_595223_file_uri.js b/devtools/client/webconsole/test/browser_webconsole_bug_595223_file_uri.js index d57d724cafbd..20aafba730c1 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_595223_file_uri.js +++ b/devtools/client/webconsole/test/browser_webconsole_bug_595223_file_uri.js @@ -7,7 +7,6 @@ const PREF = "devtools.webconsole.persistlog"; const TEST_FILE = "test-network.html"; -const TEST_URI = "data:text/html;charset=utf8,

test file URI"; var hud; @@ -22,7 +21,9 @@ add_task(function* () { dir.append(TEST_FILE); let uri = Services.io.newFileURI(dir); - let { browser } = yield loadTab(TEST_URI); + // We need a file remote type to make sure we don't switch processes when we + // load the file:// URI. + let { browser } = yield loadTab("about:blank", "file"); hud = yield openConsole(); hud.jsterm.clearOutput(); diff --git a/devtools/client/webconsole/test/head.js b/devtools/client/webconsole/test/head.js index 519cb78b05b4..ae8079c6714e 100644 --- a/devtools/client/webconsole/test/head.js +++ b/devtools/client/webconsole/test/head.js @@ -46,10 +46,10 @@ const DOCS_GA_PARAMS = "?utm_source=mozilla" + flags.testing = true; -function loadTab(url) { +function loadTab(url, preferredRemoteType) { let deferred = promise.defer(); - let tab = gBrowser.selectedTab = gBrowser.addTab(url); + let tab = gBrowser.selectedTab = gBrowser.addTab(url, { preferredRemoteType }); let browser = gBrowser.getBrowserForTab(tab); browser.addEventListener("load", function onLoad() {