Bug 1304003 - Part 5: Rewrite browser_console_iframe_messages.js. r=bgrins

linclark · linclark · commit 7d6a5c0c8f4e · 2016-10-06T10:59:38.000-04:00
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
@@ -7,10 +7,15 @@ support-files =
   test-console-table.html
   test-console.html
   test-console-filters.html
+  test-iframes.html
+  test-iframe1.html
+  test-iframe2.html
+  test-iframe3.html
 
 [browser_webconsole_console_table.js]
 [browser_webconsole_filters.js]
 [browser_webconsole_init.js]
+[browser_webconsole_iframe_messages.js]
 [browser_webconsole_input_focus.js]
 [browser_webconsole_keyboard_accessibility.js]
 [browser_webconsole_observer_notifications.js]
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_iframe_messages.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_iframe_messages.js
@@ -0,0 +1,42 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Check that cached messages from nested iframes are displayed in the
+// Web Console.
+
+"use strict";
+
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
+                 "new-console-output/test/mochitest/test-iframes.html";
+
+add_task(function* () {
+  // On e10s, the exception is triggered in child process
+  // and is ignored by test harness
+  if (!Services.appinfo.browserTabsRemoteAutostart) {
+    expectUncaughtException();
+  }
+
+  let hud = yield openNewTabAndConsole(TEST_URI);
+  ok(hud, "web console opened");
+
+  yield waitFor(() => (
+    findMessage(hud, "main file")
+    && findMessage(hud, "blah")
+    && findMessage(hud, "iframe 1")
+    && findMessage(hud, "iframe 2")
+    && findMessage(hud, "iframe 3")
+  ));
+  ok(true, "Messages from iframes were displayed in console.");
+
+  // "iframe 1" console messages can be coalesced into one if they follow each
+  // other in the sequence of messages (depending on timing). If they do not, then
+  // they will be displayed in the console output independently, as separate
+  // messages. This is why we need to check multiple possibilities.
+  yield waitFor(() => (
+    findMessages(hud, "iframe 1").length == 2
+    || findMessage(hud, "iframe 1").querySelector(".message-repeats").textContent == 2
+  ));
+  ok(true, "Messages from nested iframes were displayed in console.");
+});
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe1.html b/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe1.html
@@ -0,0 +1,10 @@
+<html>
+<head>
+  <script>
+  console.log("iframe 1");
+  </script>
+</head>
+<body>
+<h1>iframe 1</h1>
+</body>
+</html>
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe2.html b/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe2.html
@@ -0,0 +1,11 @@
+<html>
+<head>
+  <script>
+  console.log("iframe 2");
+  blah;
+  </script>
+</head>
+<body>
+<h1>iframe 2</h1>
+</body>
+</html>
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe3.html b/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe3.html
@@ -0,0 +1,11 @@
+<html>
+<head>
+  <script>
+  console.log("iframe 3");
+  </script>
+</head>
+<body>
+<h1>iframe 3</h1>
+<iframe src="test-iframe1.html"></iframe>
+</body>
+</html>
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-iframes.html b/devtools/client/webconsole/new-console-output/test/mochitest/test-iframes.html
@@ -0,0 +1,13 @@
+<html>
+<head>
+  <script>
+  console.log("main file");
+  </script>
+</head>
+<body>
+<h1>iframe console test</h1>
+<iframe src="test-iframe1.html"></iframe>
+<iframe src="test-iframe2.html"></iframe>
+<iframe src="test-iframe3.html"></iframe>
+</body>
+</html>
