Bug 1404853 - Enable browser_webconsole_highlighter_console_helper.js in new console frontend; r=Honza.
This changes the code of the test since it was relying on direct access to the content page.
In order to be able to interact with the element picker, the test-actor and test-actor-registery
files are loaded by head.js.
MozReview-Commit-ID: FyebIiyF31j
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
@@ -160,16 +160,19 @@ support-files =
test-subresource-security-error.js
test-subresource-security-error.js^headers^
test-trackingprotection-securityerrors.html
test-webconsole-error-observer.html
testscript.js
!/devtools/client/netmonitor/test/sjs_cors-test-server.sjs
!/image/test/mochitest/blue.png
!/devtools/client/framework/test/shared-head.js
+ !/devtools/client/shared/test/test-actor.js
+ !/devtools/client/shared/test/test-actor-registry.js
+
[browser_console.js]
skip-if = true # Bug 1406060
[browser_console_addonsdk_loader_exception.js]
skip-if = true # Bug 1406060
[browser_console_clear_method.js]
skip-if = true # Bug 1406060
[browser_console_consolejsm_output.js]
skip-if = true # Bug 1406060
@@ -279,18 +282,16 @@ skip-if = true # Bug 1405333
[browser_webconsole_external_script_errors.js]
[browser_webconsole_file_uri.js]
skip-if = true # Bug 1404382
[browser_webconsole_filter_scroll.js]
skip-if = true # Bug 1404392
[browser_webconsole_filters.js]
[browser_webconsole_filters_persist.js]
[browser_webconsole_highlighter_console_helper.js]
-skip-if = true # Bug 1404853
-# old console skip-if = true # Requires direct access to content nodes
[browser_webconsole_history_arrow_keys.js]
[browser_webconsole_hpkp_invalid-headers.js]
skip-if = true # Bug 1405340
# old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
[browser_webconsole_hsts_invalid-headers.js]
skip-if = true # Bug 1405341
# old console skip-if = e10s # Bug 1042253 - webconsole e10s tests
[browser_webconsole_iframe_wrong_hud.js]
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_highlighter_console_helper.js
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_highlighter_console_helper.js
@@ -1,108 +1,79 @@
-/* -*- 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/ */
// Tests that the $0 console helper works as intended. See Bug 653531.
"use strict";
-var inspector, h1, outputNode;
+const TEST_URI = `data:text/html;charset=utf-8,
+<head>
+ <title>Inspector Tree Selection Test</title>
+</head>
+<body>
+ <div>
+ <h1>Inspector Tree Selection Test</h1>
+ <p>This is some example text</p>
+ <p>${loremIpsum()}</p>
+ </div>
+ <div>
+ <p>${loremIpsum()}</p>
+ </div>
+</body>`.replace("\n", "");
-function createDocument() {
- let doc = content.document;
- let div = doc.createElement("div");
- h1 = doc.createElement("h1");
- let p1 = doc.createElement("p");
- let p2 = doc.createElement("p");
- let div2 = doc.createElement("div");
- let p3 = doc.createElement("p");
- doc.title = "Inspector Tree Selection Test";
- h1.textContent = "Inspector Tree Selection Test";
- p1.textContent = "This is some example text";
- p2.textContent = "Lorem ipsum dolor sit amet, consectetur adipisicing " +
- "elit, sed do eiusmod tempor incididunt ut labore et dolore magna " +
- "aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco " +
- "laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure " +
- "dolor in reprehenderit in voluptate velit esse cillum dolore eu " +
- "fugiat nulla pariatur. Excepteur sint occaecat cupidatat non " +
- "proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
- p3.textContent = "Lorem ipsum dolor sit amet, consectetur adipisicing " +
- "elit, sed do eiusmod tempor incididunt ut labore et dolore magna " +
- "aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco " +
- "laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure " +
- "dolor in reprehenderit in voluptate velit esse cillum dolore eu " +
- "fugiat nulla pariatur. Excepteur sint occaecat cupidatat non " +
- "proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
- div.appendChild(h1);
- div.appendChild(p1);
- div.appendChild(p2);
- div2.appendChild(p3);
- doc.body.appendChild(div);
- doc.body.appendChild(div2);
- setupHighlighterTests();
-}
+add_task(async function () {
+ const toolbox = await openNewTabAndToolbox(TEST_URI, "inspector");
+ const inspector = toolbox.getPanel("inspector");
-function setupHighlighterTests() {
- ok(h1, "we have the header node");
- openInspector().then(runSelectionTests);
-}
-
-var runSelectionTests = Task.async(function* (aInspector) {
- inspector = aInspector;
+ await registerTestActor(toolbox.target.client);
+ let testActor = await getTestActor(toolbox);
let onPickerStarted = inspector.toolbox.once("picker-started");
inspector.toolbox.highlighterUtils.startPicker();
- yield onPickerStarted;
+ await onPickerStarted;
- info("Picker mode started, now clicking on H1 to select that node");
- h1.scrollIntoView();
- let onPickerStopped = inspector.toolbox.once("picker-stopped");
+ info("Picker mode started, now clicking on <h1> to select that node");
+ let onPickerStopped = toolbox.once("picker-stopped");
let onInspectorUpdated = inspector.once("inspector-updated");
- EventUtils.synthesizeMouseAtCenter(h1, {}, content);
- yield onPickerStopped;
- yield onInspectorUpdated;
- info("Picker mode stopped, H1 selected, now switching to the console");
- let hud = yield openConsole(gBrowser.selectedTab);
+ testActor.synthesizeMouse({
+ selector: "h1",
+ center: true,
+ options: {}
+ });
- performWebConsoleTests(hud);
-});
+ await onPickerStopped;
+ await onInspectorUpdated;
-function performWebConsoleTests(hud) {
- let jsterm = hud.jsterm;
- outputNode = hud.outputNode;
+ info("Picker mode stopped, <h1> selected, now switching to the console");
+ const hud = await openConsole();
+ const {jsterm} = hud;
jsterm.clearOutput();
- jsterm.execute("$0", onNodeOutput);
- function onNodeOutput(node) {
- isnot(node.textContent.indexOf("<h1>"), -1, "correct output for $0");
+ let onEvaluationResult = waitForMessage(hud, "<h1>");
+ jsterm.execute("$0");
+ await onEvaluationResult;
+ ok(true, "correct output for $0");
- jsterm.clearOutput();
- jsterm.execute("$0.textContent = 'bug653531'", onNodeUpdate);
- }
+ jsterm.clearOutput();
- function onNodeUpdate(node) {
- isnot(node.textContent.indexOf("bug653531"), -1,
- "correct output for $0.textContent");
- is(inspector.selection.node.textContent, "bug653531",
- "node successfully updated");
+ const newH1Content = "newH1Content";
+ let onAssignmentResult = waitForMessage(hud, "<h1>");
+ jsterm.execute(`$0.textContent = "${newH1Content}";$0`);
+ await onAssignmentResult;
- inspector = h1 = outputNode = null;
- gBrowser.removeCurrentTab();
- finishTest();
- }
-}
-
-function test() {
- waitForExplicitFinish();
+ ok(true, "correct output for $0 after setting $0.textContent");
+ const {textContent} = await testActor.getNodeInfo("h1");
+ is(textContent, newH1Content, "node successfully updated");
+});
- gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser);
- gBrowser.selectedBrowser.addEventListener("load", function () {
- waitForFocus(createDocument, content);
- }, {capture: true, once: true});
-
- BrowserTestUtils.loadURI(gBrowser.selectedBrowser,
- "data:text/html;charset=utf-8,test for highlighter helper in web console");
+function loremIpsum() {
+ return `Lorem ipsum dolor sit amet, consectetur adipisicing
+elit, sed do eiusmod tempor incididunt ut labore et dolore magna
+aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco
+laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure
+dolor in reprehenderit in voluptate velit esse cillum dolore eu
+fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.`
+ .replace("\n", "");
}
--- a/devtools/client/webconsole/new-console-output/test/mochitest/head.js
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/head.js
@@ -2,16 +2,21 @@
/* 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/ */
/* import-globals-from ../../../../framework/test/shared-head.js */
/* eslint no-unused-vars: [2, {"vars": "local"}] */
"use strict";
+// Import helpers registering the test-actor in remote targets
+Services.scriptloader.loadSubScript(
+ "chrome://mochitests/content/browser/devtools/client/shared/test/test-actor-registry.js",
+ this);
+
// shared-head.js handles imports, constants, and utility functions
// Load the shared-head file first.
Services.scriptloader.loadSubScript(
"chrome://mochitests/content/browser/devtools/client/framework/test/shared-head.js",
this);
var {HUDService} = require("devtools/client/webconsole/hudservice");
var WCUL10n = require("devtools/client/webconsole/webconsole-l10n");