From 59241dd5d22cc72fe0cfbf5ff93a10aeea011122 Mon Sep 17 00:00:00 2001
From: Julian Descottes <jdescottes@mozilla.com>
Date: Wed, 29 Nov 2017 16:56:18 +0100
Subject: [PATCH] Bug 1401942 - Rename and enable
 browser_bug664688_sandbox_update_after_navigation.js;r=nchevobbe

MozReview-Commit-ID: FbR1FoUp3qo

--HG--
extra : rebase_source : 77972dde83380bda72bd04e8b168ddf7af91fd82
---
 .../test/mochitest/browser.ini                |  1 -
 ...console_sandbox_update_after_navigation.js | 95 +++++++++----------
 2 files changed, 43 insertions(+), 53 deletions(-)

diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
index 5d83c6a4f1d5..4403ebdbe633 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
@@ -384,7 +384,6 @@ skip-if = true #	Bug 1401953
 [browser_webconsole_repeated_messages_accuracy.js]
 skip-if = true #	Bug 1403450
 [browser_webconsole_sandbox_update_after_navigation.js]
-skip-if = true #	Bug 1401942
 [browser_webconsole_script_errordoc_urls.js]
 skip-if = true #	Bug 1403454
 # old console skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sandbox_update_after_navigation.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sandbox_update_after_navigation.js
index 163b6cbf3d6a..cc88d9b3eaf9 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sandbox_update_after_navigation.js
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sandbox_update_after_navigation.js
@@ -9,68 +9,50 @@
 
 "use strict";
 
-add_task(function* () {
-  const TEST_URI1 = "http://example.com/browser/devtools/client/webconsole/" +
-                    "test/test-console.html";
-  const TEST_URI2 = "http://example.org/browser/devtools/client/webconsole/" +
-                    "test/test-console.html";
+const BASE_URI = "browser/devtools/client/webconsole/" +
+                 "new-console-output/test/mochitest/test-console.html";
+const TEST_URI1 = "http://example.com/" + BASE_URI;
+const TEST_URI2 = "http://example.org/" + BASE_URI;
 
-  yield loadTab(TEST_URI1);
-  let hud = yield openConsole();
+add_task(async function () {
+  pushPref("devtools.webconsole.persistlog", false);
+
+  let hud = await openNewTabAndConsole(TEST_URI1);
+
+  let onMessages = waitForMessages({
+    hud,
+    messages: [
+      { text: "window.location.href" },
+      { text: TEST_URI1 },
+    ],
+  });
 
-  hud.jsterm.clearOutput();
   hud.jsterm.execute("window.location.href");
 
   info("wait for window.location.href");
-
-  let msgForLocation1 = {
-    webconsole: hud,
-    messages: [
-      {
-        name: "window.location.href jsterm input",
-        text: "window.location.href",
-        category: CATEGORY_INPUT,
-      },
-      {
-        name: "window.location.href result is displayed",
-        text: TEST_URI1,
-        category: CATEGORY_OUTPUT,
-      },
-    ],
-  };
-
-  yield waitForMessages(msgForLocation1);
+  await onMessages;
 
   // load second url
   BrowserTestUtils.loadURI(gBrowser.selectedBrowser, TEST_URI2);
-  yield loadBrowser(gBrowser.selectedBrowser);
+  await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
 
-  is(hud.outputNode.textContent.indexOf("Permission denied"), -1,
-     "no permission denied errors");
+  ok(!findMessage(hud, "Permission denied"), "no permission denied errors");
+
+  onMessages = waitForMessages({
+    hud,
+    messages: [
+      { text: "window.location.href" },
+      { text: TEST_URI2 },
+    ],
+  });
 
   hud.jsterm.clearOutput();
   hud.jsterm.execute("window.location.href");
 
   info("wait for window.location.href after page navigation");
+  await onMessages;
 
-  yield waitForMessages({
-    webconsole: hud,
-    messages: [
-      {
-        name: "window.location.href jsterm input",
-        text: "window.location.href",
-        category: CATEGORY_INPUT,
-      },
-      {
-        name: "window.location.href result is displayed",
-        text: TEST_URI2,
-        category: CATEGORY_OUTPUT,
-      },
-    ],
-  });
-
-  is(hud.outputNode.textContent.indexOf("Permission denied"), -1,
-     "no permission denied errors");
+  ok(!findMessage(hud, "Permission denied"), "no permission denied errors");
 
   // Navigation clears messages. Wait for that clear to happen before
   // continuing the test or it might destroy messages we wait later on (Bug
@@ -79,14 +61,23 @@ add_task(function* () {
 
   gBrowser.goBack();
 
-  info("Waiting for messages to be cleared due to navigation");
-  yield cleared;
+  info("Waiting for messages-cleared event due to navigation");
+  await cleared;
 
   info("Messages cleared after navigation; checking location");
+
+  onMessages = waitForMessages({
+    hud,
+    messages: [
+      { text: "window.location.href" },
+      { text: TEST_URI1 },
+    ],
+  });
+
   hud.jsterm.execute("window.location.href");
 
   info("wait for window.location.href after goBack()");
-  yield waitForMessages(msgForLocation1);
-  is(hud.outputNode.textContent.indexOf("Permission denied"), -1,
-     "no permission denied errors");
+  await onMessages;
+
+  ok(!findMessage(hud, "Permission denied"), "no permission denied errors");
 });