Bug 1595636 - Rename xul->xhtml for tests in DevTools r=jdescottes
authorBrian Grinstead <bgrinstead@mozilla.com>
Wed, 13 Nov 2019 23:44:09 +0000
changeset 501857 7a990e278ddca87a74a3caf4cc3b633bfcd74deb
parent 501856 fd2d5ef280f4501b8fe79c66f9011d6a73a10115
child 501858 17f51f671e5f4c239f996047bebd0f8e59ebbda5
push id114172
push userdluca@mozilla.com
push dateTue, 19 Nov 2019 11:31:10 +0000
treeherdermozilla-inbound@b5c5ba07d3db [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjdescottes
bugs1595636
milestone72.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1595636 - Rename xul->xhtml for tests in DevTools r=jdescottes Differential Revision: https://phabricator.services.mozilla.com/D52710
devtools/client/inspector/markup/test/browser.ini
devtools/client/inspector/markup/test/browser_markup_remove_xul_attributes.js
devtools/client/inspector/markup/test/doc_markup_xul.xhtml
devtools/client/inspector/markup/test/doc_markup_xul.xul
devtools/client/inspector/shared/test/browser.ini
devtools/client/inspector/shared/test/browser_styleinspector_csslogic-content-stylesheets.js
devtools/client/inspector/shared/test/doc_content_stylesheet.xhtml
devtools/client/inspector/shared/test/doc_content_stylesheet.xul
devtools/client/inspector/test/browser.ini
devtools/client/inspector/test/browser_inspector_reload_xul.js
devtools/client/inspector/test/doc_inspector_reload_xul.xhtml
devtools/client/inspector/test/doc_inspector_reload_xul.xul
devtools/client/shared/sourceeditor/test/browser.ini
devtools/client/shared/sourceeditor/test/head.js
devtools/client/shared/sourceeditor/test/head.xhtml
devtools/client/shared/sourceeditor/test/head.xul
devtools/client/shared/test/browser.ini
devtools/client/shared/test/browser_html_tooltip-01.js
devtools/client/shared/test/browser_html_tooltip-02.js
devtools/client/shared/test/browser_html_tooltip-03.js
devtools/client/shared/test/browser_html_tooltip-04.js
devtools/client/shared/test/browser_html_tooltip-05.js
devtools/client/shared/test/browser_html_tooltip_arrow-01.js
devtools/client/shared/test/browser_html_tooltip_arrow-02.js
devtools/client/shared/test/browser_html_tooltip_consecutive-show.js
devtools/client/shared/test/browser_html_tooltip_doorhanger-01.js
devtools/client/shared/test/browser_html_tooltip_doorhanger-02.js
devtools/client/shared/test/browser_html_tooltip_height-auto.js
devtools/client/shared/test/browser_html_tooltip_hover.js
devtools/client/shared/test/browser_html_tooltip_offset.js
devtools/client/shared/test/browser_html_tooltip_resize.js
devtools/client/shared/test/browser_html_tooltip_rtl.js
devtools/client/shared/test/browser_html_tooltip_screen_edge.js
devtools/client/shared/test/browser_html_tooltip_variable-height.js
devtools/client/shared/test/browser_html_tooltip_width-auto.js
devtools/client/shared/test/browser_html_tooltip_xul-wrapper.js
devtools/client/shared/test/browser_html_tooltip_zoom.js
devtools/client/shared/test/browser_inplace-editor_autocomplete_offset.js
devtools/client/shared/test/browser_tableWidget_keyboard_interaction.js
devtools/client/shared/test/browser_tableWidget_mouse_interaction.js
devtools/client/shared/test/doc_html_tooltip-02.xhtml
devtools/client/shared/test/doc_html_tooltip-02.xul
devtools/client/shared/test/doc_html_tooltip-03.xhtml
devtools/client/shared/test/doc_html_tooltip-03.xul
devtools/client/shared/test/doc_html_tooltip-04.xhtml
devtools/client/shared/test/doc_html_tooltip-04.xul
devtools/client/shared/test/doc_html_tooltip-05.xhtml
devtools/client/shared/test/doc_html_tooltip-05.xul
devtools/client/shared/test/doc_html_tooltip.xhtml
devtools/client/shared/test/doc_html_tooltip.xul
devtools/client/shared/test/doc_html_tooltip_arrow-01.xhtml
devtools/client/shared/test/doc_html_tooltip_arrow-01.xul
devtools/client/shared/test/doc_html_tooltip_arrow-02.xhtml
devtools/client/shared/test/doc_html_tooltip_arrow-02.xul
devtools/client/shared/test/doc_html_tooltip_doorhanger-01.xhtml
devtools/client/shared/test/doc_html_tooltip_doorhanger-01.xul
devtools/client/shared/test/doc_html_tooltip_doorhanger-02.xhtml
devtools/client/shared/test/doc_html_tooltip_doorhanger-02.xul
devtools/client/shared/test/doc_html_tooltip_hover.xhtml
devtools/client/shared/test/doc_html_tooltip_hover.xul
devtools/client/shared/test/doc_html_tooltip_rtl.xhtml
devtools/client/shared/test/doc_html_tooltip_rtl.xul
devtools/client/shared/test/doc_inplace-editor_autocomplete_offset.xhtml
devtools/client/shared/test/doc_inplace-editor_autocomplete_offset.xul
devtools/client/shared/test/doc_options-view.xhtml
devtools/client/shared/test/doc_options-view.xul
devtools/client/shared/test/doc_tableWidget_keyboard_interaction.xhtml
devtools/client/shared/test/doc_tableWidget_keyboard_interaction.xul
devtools/client/shared/test/doc_tableWidget_mouse_interaction.xhtml
devtools/client/shared/test/doc_tableWidget_mouse_interaction.xul
devtools/client/shared/test/head.js
devtools/client/styleeditor/test/browser.ini
devtools/client/styleeditor/test/browser_styleeditor_xul.js
devtools/client/styleeditor/test/doc_xulpage.xhtml
devtools/client/styleeditor/test/doc_xulpage.xul
devtools/server/tests/mochitest/chrome.ini
devtools/server/tests/mochitest/doc_Debugger.Source.prototype.introductionType.xhtml
devtools/server/tests/mochitest/doc_Debugger.Source.prototype.introductionType.xul
devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionType.html
--- a/devtools/client/inspector/markup/test/browser.ini
+++ b/devtools/client/inspector/markup/test/browser.ini
@@ -41,17 +41,17 @@ support-files =
   doc_markup_search.html
   doc_markup_subgrid.html
   doc_markup_svg_attributes.html
   doc_markup_toggle.html
   doc_markup_tooltip.png
   doc_markup_void_elements.html
   doc_markup_void_elements.xhtml
   doc_markup_whitespace.html
-  doc_markup_xul.xul
+  doc_markup_xul.xhtml
   doc_markup_update-on-navigtion_1.html
   doc_markup_update-on-navigtion_2.html
   doc_markup_view-original-source.html
   events_bundle.js
   events_bundle.js.map
   events_original.js
   head.js
   helper_attributes_test_runner.js
--- a/devtools/client/inspector/markup/test/browser_markup_remove_xul_attributes.js
+++ b/devtools/client/inspector/markup/test/browser_markup_remove_xul_attributes.js
@@ -1,17 +1,17 @@
 /* Any copyright is dedicated to the Public Domain.
  http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
 // Test confirms that XUL attributes don't show up as empty
 // attributes after being deleted
 
-const TEST_URL = URL_ROOT + "doc_markup_xul.xul";
+const TEST_URL = URL_ROOT + "doc_markup_xul.xhtml";
 
 add_task(async function() {
   const { inspector, testActor } = await openInspectorForURL(TEST_URL);
 
   const panelFront = await getNodeFront("#test", inspector);
   ok(
     panelFront.hasAttribute("id"),
     "panelFront has id attribute in the beginning"
rename from devtools/client/inspector/markup/test/doc_markup_xul.xul
rename to devtools/client/inspector/markup/test/doc_markup_xul.xhtml
--- a/devtools/client/inspector/shared/test/browser.ini
+++ b/devtools/client/inspector/shared/test/browser.ini
@@ -1,16 +1,16 @@
 [DEFAULT]
 tags = devtools
 subsuite = devtools
 support-files =
   doc_author-sheet.html
   doc_content_style_changes.html
   doc_content_stylesheet.html
-  doc_content_stylesheet.xul
+  doc_content_stylesheet.xhtml
   doc_content_stylesheet_imported.css
   doc_content_stylesheet_imported2.css
   doc_content_stylesheet_linked.css
   doc_content_stylesheet_script.css
   doc_content_stylesheet_xul.css
   doc_frame_script.js
   head.js
   !/devtools/client/inspector/test/head.js
--- a/devtools/client/inspector/shared/test/browser_styleinspector_csslogic-content-stylesheets.js
+++ b/devtools/client/inspector/shared/test/browser_styleinspector_csslogic-content-stylesheets.js
@@ -6,17 +6,17 @@
 // Check stylesheets on HMTL and XUL document
 
 // FIXME: this test opens the devtools for nothing, it should be changed into a
 // devtools/server/tests/mochitest/test_css-logic-...something...html
 // test
 
 const TEST_URI_HTML = TEST_URL_ROOT + "doc_content_stylesheet.html";
 const TEST_URI_AUTHOR = TEST_URL_ROOT + "doc_author-sheet.html";
-const TEST_URI_XUL = TEST_URL_ROOT + "doc_content_stylesheet.xul";
+const TEST_URI_XUL = TEST_URL_ROOT + "doc_content_stylesheet.xhtml";
 const XUL_URI = Services.io.newURI(TEST_URI_XUL);
 const XUL_PRINCIPAL = Services.scriptSecurityManager.createContentPrincipal(
   XUL_URI,
   {}
 );
 
 add_task(async function() {
   requestLongerTimeout(2);
rename from devtools/client/inspector/shared/test/doc_content_stylesheet.xul
rename to devtools/client/inspector/shared/test/doc_content_stylesheet.xhtml
--- a/devtools/client/inspector/test/browser.ini
+++ b/devtools/client/inspector/test/browser.ini
@@ -29,17 +29,17 @@ support-files =
   doc_inspector_infobar_02.html
   doc_inspector_infobar_03.html
   doc_inspector_infobar_04.html
   doc_inspector_infobar_textnode.html
   doc_inspector_long-divs.html
   doc_inspector_menu.html
   doc_inspector_outerhtml.html
   doc_inspector_pane-toggle-layout-invariant.html
-  doc_inspector_reload_xul.xul
+  doc_inspector_reload_xul.xhtml
   doc_inspector_remove-iframe-during-load.html
   doc_inspector_search.html
   doc_inspector_search-reserved.html
   doc_inspector_search-suggestions.html
   doc_inspector_search-svg.html
   doc_inspector_select-last-selected-01.html
   doc_inspector_select-last-selected-02.html
   doc_inspector_svg.svg
--- a/devtools/client/inspector/test/browser_inspector_reload_xul.js
+++ b/devtools/client/inspector/test/browser_inspector_reload_xul.js
@@ -1,16 +1,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
 // Tests for inspecting a node on a XUL document, spanning a tab reload.
 
-const TEST_URI = URL_ROOT + "doc_inspector_reload_xul.xul";
+const TEST_URI = URL_ROOT + "doc_inspector_reload_xul.xhtml";
 
 add_task(async function() {
   await pushPref("dom.allow_XUL_XBL_for_file", false);
 
   const { tab, inspector, toolbox } = await openInspectorForURL(TEST_URI);
   await testToolboxInitialization(tab, inspector, toolbox);
 });
 
rename from devtools/client/inspector/test/doc_inspector_reload_xul.xul
rename to devtools/client/inspector/test/doc_inspector_reload_xul.xhtml
--- a/devtools/client/shared/sourceeditor/test/browser.ini
+++ b/devtools/client/shared/sourceeditor/test/browser.ini
@@ -15,17 +15,17 @@ support-files =
   codemirror/vim_test.js
   codemirror/codemirror.html
   codemirror/vimemacs.html
   codemirror/mode/javascript/test.js
   css_statemachine_testcases.css
   css_statemachine_tests.json
   css_autocompletion_tests.json
   head.js
-  head.xul
+  head.xhtml
   helper_codemirror_runner.js
   cm_mode_ruby.js
   cm_script_injection_test.js
   !/devtools/client/shared/test/shared-head.js
   !/devtools/client/shared/test/telemetry-test-helpers.js
 
 [browser_editor_autocomplete_basic.js]
 [browser_editor_autocomplete_events.js]
--- a/devtools/client/shared/sourceeditor/test/head.js
+++ b/devtools/client/shared/sourceeditor/test/head.js
@@ -21,17 +21,17 @@ function promiseWaitForFocus(el) {
   return new Promise(resolve => waitForFocus(resolve, el));
 }
 
 async function setup(additionalOpts = {}) {
   try {
     const opt = "chrome,titlebar,toolbar,centerscreen,resizable,dialog=no";
     const win = Services.ww.openWindow(
       null,
-      CHROME_URL_ROOT + "head.xul",
+      CHROME_URL_ROOT + "head.xhtml",
       "_blank",
       opt,
       null
     );
     const opts = {
       value: "Hello.",
       lineNumbers: true,
       foldGutter: true,
rename from devtools/client/shared/sourceeditor/test/head.xul
rename to devtools/client/shared/sourceeditor/test/head.xhtml
--- a/devtools/client/shared/test/browser.ini
+++ b/devtools/client/shared/test/browser.ini
@@ -10,40 +10,40 @@ support-files =
   code_WorkerTargetActor.attach-worker2.js
   code_WorkerTargetActor.attachThread-worker.js
   code_frame-script.js
   doc_cubic-bezier-01.html
   doc_cubic-bezier-02.html
   doc_empty-tab-01.html
   doc_empty-tab-02.html
   doc_filter-editor-01.html
-  doc_html_tooltip-02.xul
-  doc_html_tooltip-03.xul
-  doc_html_tooltip-04.xul
-  doc_html_tooltip-05.xul
-  doc_html_tooltip.xul
-  doc_html_tooltip_arrow-01.xul
-  doc_html_tooltip_arrow-02.xul
-  doc_html_tooltip_doorhanger-01.xul
-  doc_html_tooltip_doorhanger-02.xul
-  doc_html_tooltip_hover.xul
-  doc_html_tooltip_rtl.xul
+  doc_html_tooltip-02.xhtml
+  doc_html_tooltip-03.xhtml
+  doc_html_tooltip-04.xhtml
+  doc_html_tooltip-05.xhtml
+  doc_html_tooltip.xhtml
+  doc_html_tooltip_arrow-01.xhtml
+  doc_html_tooltip_arrow-02.xhtml
+  doc_html_tooltip_doorhanger-01.xhtml
+  doc_html_tooltip_doorhanger-02.xhtml
+  doc_html_tooltip_hover.xhtml
+  doc_html_tooltip_rtl.xhtml
   doc_inline-debugger-statement.html
-  doc_inplace-editor_autocomplete_offset.xul
+  doc_inplace-editor_autocomplete_offset.xhtml
   doc_layoutHelpers-getBoxQuads.html
   doc_layoutHelpers.html
   doc_listworkers-tab.html
   doc_native-event-handler.html
-  doc_options-view.xul
+  doc_options-view.xhtml
   doc_script-switching-01.html
   doc_script-switching-02.html
   doc_spectrum.html
   doc_tableWidget_basic.html
-  doc_tableWidget_keyboard_interaction.xul
-  doc_tableWidget_mouse_interaction.xul
+  doc_tableWidget_keyboard_interaction.xhtml
+  doc_tableWidget_mouse_interaction.xhtml
   doc_templater_basic.html
   doc_WorkerTargetActor.attach-tab1.html
   doc_WorkerTargetActor.attach-tab2.html
   doc_WorkerTargetActor.attachThread-tab.html
   dummy.html
   frame-script-utils.js
   head.js
   helper_addons.js
--- a/devtools/client/shared/test/browser_html_tooltip-01.js
+++ b/devtools/client/shared/test/browser_html_tooltip-01.js
@@ -4,17 +4,17 @@
 
 "use strict";
 
 /**
  * Test the HTMLTooltip show & hide methods.
  */
 
 const HTML_NS = "http://www.w3.org/1999/xhtml";
-const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip.xul";
+const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip.xhtml";
 
 const {
   HTMLTooltip,
 } = require("devtools/client/shared/widgets/tooltip/HTMLTooltip");
 loadHelperScript("helper_html_tooltip.js");
 
 let useXulWrapper;
 
--- a/devtools/client/shared/test/browser_html_tooltip-02.js
+++ b/devtools/client/shared/test/browser_html_tooltip-02.js
@@ -3,17 +3,17 @@
 /* import-globals-from helper_html_tooltip.js */
 "use strict";
 
 /**
  * Test the HTMLTooltip is closed when clicking outside of its container.
  */
 
 const HTML_NS = "http://www.w3.org/1999/xhtml";
-const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip-02.xul";
+const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip-02.xhtml";
 const PROMISE_TIMEOUT = 3000;
 
 const {
   HTMLTooltip,
 } = require("devtools/client/shared/widgets/tooltip/HTMLTooltip");
 loadHelperScript("helper_html_tooltip.js");
 
 let useXulWrapper;
--- a/devtools/client/shared/test/browser_html_tooltip-03.js
+++ b/devtools/client/shared/test/browser_html_tooltip-03.js
@@ -4,17 +4,17 @@
 
 "use strict";
 
 /**
  * This is the sanity test for the HTMLTooltip focus
  */
 
 const HTML_NS = "http://www.w3.org/1999/xhtml";
-const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip-03.xul";
+const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip-03.xhtml";
 
 const {
   HTMLTooltip,
 } = require("devtools/client/shared/widgets/tooltip/HTMLTooltip");
 loadHelperScript("helper_html_tooltip.js");
 
 let useXulWrapper;
 
--- a/devtools/client/shared/test/browser_html_tooltip-04.js
+++ b/devtools/client/shared/test/browser_html_tooltip-04.js
@@ -5,17 +5,17 @@
 "use strict";
 
 /**
  * Test the HTMLTooltip positioning for a small tooltip element (should aways
  * find a way to fit).
  */
 
 const HTML_NS = "http://www.w3.org/1999/xhtml";
-const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip-04.xul";
+const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip-04.xhtml";
 
 const {
   HTMLTooltip,
 } = require("devtools/client/shared/widgets/tooltip/HTMLTooltip");
 loadHelperScript("helper_html_tooltip.js");
 
 const TOOLTIP_HEIGHT = 30;
 const TOOLTIP_WIDTH = 100;
--- a/devtools/client/shared/test/browser_html_tooltip-05.js
+++ b/devtools/client/shared/test/browser_html_tooltip-05.js
@@ -5,17 +5,17 @@
 "use strict";
 
 /**
  * Test the HTMLTooltip positioning for a huge tooltip element (can not fit in
  * the viewport).
  */
 
 const HTML_NS = "http://www.w3.org/1999/xhtml";
-const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip-05.xul";
+const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip-05.xhtml";
 
 const {
   HTMLTooltip,
 } = require("devtools/client/shared/widgets/tooltip/HTMLTooltip");
 loadHelperScript("helper_html_tooltip.js");
 
 const TOOLTIP_HEIGHT = 200;
 const TOOLTIP_WIDTH = 200;
--- a/devtools/client/shared/test/browser_html_tooltip_arrow-01.js
+++ b/devtools/client/shared/test/browser_html_tooltip_arrow-01.js
@@ -5,17 +5,17 @@
 "use strict";
 
 /**
  * Test the HTMLTooltip "arrow" type on small anchors. The arrow should remain
  * aligned with the anchors as much as possible
  */
 
 const HTML_NS = "http://www.w3.org/1999/xhtml";
-const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip_arrow-01.xul";
+const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip_arrow-01.xhtml";
 
 const {
   HTMLTooltip,
 } = require("devtools/client/shared/widgets/tooltip/HTMLTooltip");
 loadHelperScript("helper_html_tooltip.js");
 
 let useXulWrapper;
 
--- a/devtools/client/shared/test/browser_html_tooltip_arrow-02.js
+++ b/devtools/client/shared/test/browser_html_tooltip_arrow-02.js
@@ -5,17 +5,17 @@
 "use strict";
 
 /**
  * Test the HTMLTooltip "arrow" type on wide anchors. The arrow should remain
  * aligned with the anchors as much as possible
  */
 
 const HTML_NS = "http://www.w3.org/1999/xhtml";
-const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip_arrow-02.xul";
+const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip_arrow-02.xhtml";
 
 const {
   HTMLTooltip,
 } = require("devtools/client/shared/widgets/tooltip/HTMLTooltip");
 loadHelperScript("helper_html_tooltip.js");
 
 let useXulWrapper;
 
--- a/devtools/client/shared/test/browser_html_tooltip_consecutive-show.js
+++ b/devtools/client/shared/test/browser_html_tooltip_consecutive-show.js
@@ -5,17 +5,17 @@
 "use strict";
 
 /**
  * Test the HTMLTooltip show can be called several times. It should move according to the
  * new anchor/options and should not leak event listeners.
  */
 
 const HTML_NS = "http://www.w3.org/1999/xhtml";
-const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip.xul";
+const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip.xhtml";
 
 const {
   HTMLTooltip,
 } = require("devtools/client/shared/widgets/tooltip/HTMLTooltip");
 loadHelperScript("helper_html_tooltip.js");
 
 function getTooltipContent(doc) {
   const div = doc.createElementNS(HTML_NS, "div");
--- a/devtools/client/shared/test/browser_html_tooltip_doorhanger-01.js
+++ b/devtools/client/shared/test/browser_html_tooltip_doorhanger-01.js
@@ -6,17 +6,17 @@
 
 /**
  * Test the HTMLTooltip "doorhanger" type's hang direction. It should hang
  * along the flow of text e.g. in RTL mode it should hang left and in LTR mode
  * it should hang right.
  */
 
 const HTML_NS = "http://www.w3.org/1999/xhtml";
-const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip_doorhanger-01.xul";
+const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip_doorhanger-01.xhtml";
 
 const {
   HTMLTooltip,
 } = require("devtools/client/shared/widgets/tooltip/HTMLTooltip");
 loadHelperScript("helper_html_tooltip.js");
 
 let useXulWrapper;
 
--- a/devtools/client/shared/test/browser_html_tooltip_doorhanger-02.js
+++ b/devtools/client/shared/test/browser_html_tooltip_doorhanger-02.js
@@ -5,17 +5,17 @@
 "use strict";
 
 /**
  * Test the HTMLTooltip "doorhanger" type's arrow tip is precisely centered on
  * the anchor when the anchor is small.
  */
 
 const HTML_NS = "http://www.w3.org/1999/xhtml";
-const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip_doorhanger-02.xul";
+const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip_doorhanger-02.xhtml";
 
 const {
   HTMLTooltip,
 } = require("devtools/client/shared/widgets/tooltip/HTMLTooltip");
 loadHelperScript("helper_html_tooltip.js");
 
 let useXulWrapper;
 
--- a/devtools/client/shared/test/browser_html_tooltip_height-auto.js
+++ b/devtools/client/shared/test/browser_html_tooltip_height-auto.js
@@ -5,17 +5,17 @@
 "use strict";
 
 /**
  * Test the HTMLTooltip content can automatically calculate its height based on
  * content.
  */
 
 const HTML_NS = "http://www.w3.org/1999/xhtml";
-const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip.xul";
+const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip.xhtml";
 
 const {
   HTMLTooltip,
 } = require("devtools/client/shared/widgets/tooltip/HTMLTooltip");
 loadHelperScript("helper_html_tooltip.js");
 
 let useXulWrapper;
 
--- a/devtools/client/shared/test/browser_html_tooltip_hover.js
+++ b/devtools/client/shared/test/browser_html_tooltip_hover.js
@@ -4,17 +4,17 @@
 
 "use strict";
 
 /**
  * Test the TooltipToggle helper class for HTMLTooltip
  */
 
 const HTML_NS = "http://www.w3.org/1999/xhtml";
-const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip_hover.xul";
+const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip_hover.xhtml";
 
 const {
   HTMLTooltip,
 } = require("devtools/client/shared/widgets/tooltip/HTMLTooltip");
 loadHelperScript("helper_html_tooltip.js");
 
 add_task(async function() {
   const [, , doc] = await createHost("bottom", TEST_URI);
--- a/devtools/client/shared/test/browser_html_tooltip_offset.js
+++ b/devtools/client/shared/test/browser_html_tooltip_offset.js
@@ -3,17 +3,17 @@
 /* import-globals-from helper_html_tooltip.js */
 "use strict";
 
 /**
  * Test the HTMLTooltip can be displayed with vertical and horizontal offsets.
  */
 
 const HTML_NS = "http://www.w3.org/1999/xhtml";
-const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip.xul";
+const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip.xhtml";
 
 const {
   HTMLTooltip,
 } = require("devtools/client/shared/widgets/tooltip/HTMLTooltip");
 loadHelperScript("helper_html_tooltip.js");
 
 add_task(async function() {
   // Force the toolbox to be 200px high;
--- a/devtools/client/shared/test/browser_html_tooltip_resize.js
+++ b/devtools/client/shared/test/browser_html_tooltip_resize.js
@@ -3,17 +3,17 @@
 /* import-globals-from helper_html_tooltip.js */
 "use strict";
 
 /**
  * Test the HTMLTooltip can be resized.
  */
 
 const HTML_NS = "http://www.w3.org/1999/xhtml";
-const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip.xul";
+const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip.xhtml";
 
 const {
   HTMLTooltip,
 } = require("devtools/client/shared/widgets/tooltip/HTMLTooltip");
 loadHelperScript("helper_html_tooltip.js");
 
 const TOOLBOX_WIDTH = 500;
 
--- a/devtools/client/shared/test/browser_html_tooltip_rtl.js
+++ b/devtools/client/shared/test/browser_html_tooltip_rtl.js
@@ -5,17 +5,17 @@
 
 /**
  * Test the HTMLTooltip anchor alignment changes with the anchor direction.
  * - should be aligned to the right of RTL anchors
  * - should be aligned to the left of LTR anchors
  */
 
 const HTML_NS = "http://www.w3.org/1999/xhtml";
-const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip_rtl.xul";
+const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip_rtl.xhtml";
 
 const {
   HTMLTooltip,
 } = require("devtools/client/shared/widgets/tooltip/HTMLTooltip");
 loadHelperScript("helper_html_tooltip.js");
 
 const TOOLBOX_WIDTH = 500;
 const TOOLTIP_WIDTH = 150;
--- a/devtools/client/shared/test/browser_html_tooltip_screen_edge.js
+++ b/devtools/client/shared/test/browser_html_tooltip_screen_edge.js
@@ -9,17 +9,17 @@
  * screen and uses a XUL wrapper. The XUL panel cannot be displayed off screen
  * at all so this verifies that the calculated position of the tooltip always
  * ensure that the whole tooltip is rendered on the screen
  *
  * See Bug 1590408
  */
 
 const HTML_NS = "http://www.w3.org/1999/xhtml";
-const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip_doorhanger-01.xul";
+const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip_doorhanger-01.xhtml";
 
 const {
   HTMLTooltip,
 } = require("devtools/client/shared/widgets/tooltip/HTMLTooltip");
 loadHelperScript("helper_html_tooltip.js");
 
 add_task(async function() {
   // Force the toolbox to be 200px high;
--- a/devtools/client/shared/test/browser_html_tooltip_variable-height.js
+++ b/devtools/client/shared/test/browser_html_tooltip_variable-height.js
@@ -4,17 +4,17 @@
 
 "use strict";
 
 /**
  * Test the HTMLTooltip content can have a variable height.
  */
 
 const HTML_NS = "http://www.w3.org/1999/xhtml";
-const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip.xul";
+const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip.xhtml";
 
 const CONTAINER_HEIGHT = 300;
 const CONTAINER_WIDTH = 200;
 const TOOLTIP_HEIGHT = 50;
 
 const {
   HTMLTooltip,
 } = require("devtools/client/shared/widgets/tooltip/HTMLTooltip");
--- a/devtools/client/shared/test/browser_html_tooltip_width-auto.js
+++ b/devtools/client/shared/test/browser_html_tooltip_width-auto.js
@@ -4,17 +4,17 @@
 
 "use strict";
 
 /**
  * Test the HTMLTooltip content can automatically calculate its width based on content.
  */
 
 const HTML_NS = "http://www.w3.org/1999/xhtml";
-const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip.xul";
+const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip.xhtml";
 
 const {
   HTMLTooltip,
 } = require("devtools/client/shared/widgets/tooltip/HTMLTooltip");
 loadHelperScript("helper_html_tooltip.js");
 
 let useXulWrapper;
 
--- a/devtools/client/shared/test/browser_html_tooltip_xul-wrapper.js
+++ b/devtools/client/shared/test/browser_html_tooltip_xul-wrapper.js
@@ -4,17 +4,17 @@
 
 "use strict";
 
 /**
  * Test the HTMLTooltip can overflow out of the toolbox when using a XUL panel wrapper.
  */
 
 const HTML_NS = "http://www.w3.org/1999/xhtml";
-const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip-05.xul";
+const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip-05.xhtml";
 
 const {
   HTMLTooltip,
 } = require("devtools/client/shared/widgets/tooltip/HTMLTooltip");
 loadHelperScript("helper_html_tooltip.js");
 
 // The test toolbox will be 200px tall, the anchors are 50px tall, therefore, the maximum
 // tooltip height that could fit in the toolbox is 150px. Setting 160px, the tooltip will
--- a/devtools/client/shared/test/browser_html_tooltip_zoom.js
+++ b/devtools/client/shared/test/browser_html_tooltip_zoom.js
@@ -4,17 +4,17 @@
 
 "use strict";
 
 /**
  * Test the HTMLTooltip is displayed correct position if content is zoomed in.
  */
 
 const HTML_NS = "http://www.w3.org/1999/xhtml";
-const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip.xul";
+const TEST_URI = CHROME_URL_ROOT + "doc_html_tooltip.xhtml";
 
 const {
   HTMLTooltip,
 } = require("devtools/client/shared/widgets/tooltip/HTMLTooltip");
 
 function getTooltipContent(doc) {
   const div = doc.createElementNS(HTML_NS, "div");
   div.style.height = "50px";
--- a/devtools/client/shared/test/browser_inplace-editor_autocomplete_offset.js
+++ b/devtools/client/shared/test/browser_inplace-editor_autocomplete_offset.js
@@ -3,17 +3,18 @@
 /* import-globals-from helper_inplace_editor.js */
 
 "use strict";
 
 const AutocompletePopup = require("devtools/client/shared/autocomplete-popup");
 const { InplaceEditor } = require("devtools/client/shared/inplace-editor");
 loadHelperScript("helper_inplace_editor.js");
 
-const TEST_URI = CHROME_URL_ROOT + "doc_inplace-editor_autocomplete_offset.xul";
+const TEST_URI =
+  CHROME_URL_ROOT + "doc_inplace-editor_autocomplete_offset.xhtml";
 
 // Test the inplace-editor autocomplete popup is aligned with the completed query.
 // Which means when completing "style=display:flex; color:" the popup will aim to be
 // aligned with the ":" next to "color".
 
 // format :
 //  [
 //    what key to press,
--- a/devtools/client/shared/test/browser_tableWidget_keyboard_interaction.js
+++ b/devtools/client/shared/test/browser_tableWidget_keyboard_interaction.js
@@ -1,16 +1,16 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Tests that keyboard interaction works fine with the table widget
 
 "use strict";
 
-const TEST_URI = CHROME_URL_ROOT + "doc_tableWidget_keyboard_interaction.xul";
+const TEST_URI = CHROME_URL_ROOT + "doc_tableWidget_keyboard_interaction.xhtml";
 const TEST_OPT = "chrome,titlebar,toolbar,centerscreen,resizable,dialog=no";
 
 const { TableWidget } = require("devtools/client/shared/widgets/TableWidget");
 
 var doc, table;
 
 function test() {
   waitForExplicitFinish();
--- a/devtools/client/shared/test/browser_tableWidget_mouse_interaction.js
+++ b/devtools/client/shared/test/browser_tableWidget_mouse_interaction.js
@@ -1,16 +1,16 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Tests that mosue interaction works fine with the table widget
 
 "use strict";
 
-const TEST_URI = CHROME_URL_ROOT + "doc_tableWidget_mouse_interaction.xul";
+const TEST_URI = CHROME_URL_ROOT + "doc_tableWidget_mouse_interaction.xhtml";
 const TEST_OPT = "chrome,titlebar,toolbar,centerscreen,resizable,dialog=no";
 
 const { TableWidget } = require("devtools/client/shared/widgets/TableWidget");
 
 var doc, table;
 
 function test() {
   waitForExplicitFinish();
rename from devtools/client/shared/test/doc_html_tooltip-02.xul
rename to devtools/client/shared/test/doc_html_tooltip-02.xhtml
rename from devtools/client/shared/test/doc_html_tooltip-03.xul
rename to devtools/client/shared/test/doc_html_tooltip-03.xhtml
rename from devtools/client/shared/test/doc_html_tooltip-04.xul
rename to devtools/client/shared/test/doc_html_tooltip-04.xhtml
rename from devtools/client/shared/test/doc_html_tooltip-05.xul
rename to devtools/client/shared/test/doc_html_tooltip-05.xhtml
rename from devtools/client/shared/test/doc_html_tooltip.xul
rename to devtools/client/shared/test/doc_html_tooltip.xhtml
rename from devtools/client/shared/test/doc_html_tooltip_arrow-01.xul
rename to devtools/client/shared/test/doc_html_tooltip_arrow-01.xhtml
rename from devtools/client/shared/test/doc_html_tooltip_arrow-02.xul
rename to devtools/client/shared/test/doc_html_tooltip_arrow-02.xhtml
rename from devtools/client/shared/test/doc_html_tooltip_doorhanger-01.xul
rename to devtools/client/shared/test/doc_html_tooltip_doorhanger-01.xhtml
rename from devtools/client/shared/test/doc_html_tooltip_doorhanger-02.xul
rename to devtools/client/shared/test/doc_html_tooltip_doorhanger-02.xhtml
rename from devtools/client/shared/test/doc_html_tooltip_hover.xul
rename to devtools/client/shared/test/doc_html_tooltip_hover.xhtml
rename from devtools/client/shared/test/doc_html_tooltip_rtl.xul
rename to devtools/client/shared/test/doc_html_tooltip_rtl.xhtml
rename from devtools/client/shared/test/doc_inplace-editor_autocomplete_offset.xul
rename to devtools/client/shared/test/doc_inplace-editor_autocomplete_offset.xhtml
rename from devtools/client/shared/test/doc_options-view.xul
rename to devtools/client/shared/test/doc_options-view.xhtml
rename from devtools/client/shared/test/doc_tableWidget_keyboard_interaction.xul
rename to devtools/client/shared/test/doc_tableWidget_keyboard_interaction.xhtml
rename from devtools/client/shared/test/doc_tableWidget_mouse_interaction.xul
rename to devtools/client/shared/test/doc_tableWidget_mouse_interaction.xhtml
--- a/devtools/client/shared/test/head.js
+++ b/devtools/client/shared/test/head.js
@@ -12,17 +12,17 @@ Services.scriptloader.loadSubScript(
   "chrome://mochitests/content/browser/devtools/client/shared/test/shared-head.js",
   this
 );
 
 const { DOMHelpers } = require("devtools/shared/dom-helpers");
 const { Hosts } = require("devtools/client/framework/toolbox-hosts");
 
 const TEST_URI_ROOT = "http://example.com/browser/devtools/client/shared/test/";
-const OPTIONS_VIEW_URL = CHROME_URL_ROOT + "doc_options-view.xul";
+const OPTIONS_VIEW_URL = CHROME_URL_ROOT + "doc_options-view.xhtml";
 
 const EXAMPLE_URL =
   "chrome://mochitests/content/browser/devtools/client/shared/test/";
 
 function catchFail(func) {
   return function() {
     try {
       return func.apply(null, arguments);
--- a/devtools/client/styleeditor/test/browser.ini
+++ b/devtools/client/styleeditor/test/browser.ini
@@ -57,17 +57,17 @@ support-files =
   sourcemaps-large.html
   sourcemaps-watching.html
   test_private.css
   test_private.html
   doc_fetch_from_netmonitor.html
   doc_long_string.css
   doc_long.css
   doc_short_string.css
-  doc_xulpage.xul
+  doc_xulpage.xhtml
   sync.html
   utf-16.css
   !/devtools/client/inspector/shared/test/head.js
   !/devtools/client/inspector/test/head.js
   !/devtools/client/inspector/test/shared-head.js
   !/devtools/client/responsive/test/browser/devices.json
   !/devtools/client/shared/test/shared-head.js
   !/devtools/client/shared/test/telemetry-test-helpers.js
--- a/devtools/client/styleeditor/test/browser_styleeditor_xul.js
+++ b/devtools/client/styleeditor/test/browser_styleeditor_xul.js
@@ -2,17 +2,17 @@
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Test that the style-editor initializes correctly for XUL windows.
 
 "use strict";
 
 waitForExplicitFinish();
 
-const TEST_URL = TEST_BASE + "doc_xulpage.xul";
+const TEST_URL = TEST_BASE + "doc_xulpage.xhtml";
 
 add_task(async function() {
   const tab = await addTab(TEST_URL);
   const target = await TargetFactory.forTab(tab);
 
   const toolbox = await gDevTools.showToolbox(target, "styleeditor");
   const panel = toolbox.getCurrentPanel();
 
rename from devtools/client/styleeditor/test/doc_xulpage.xul
rename to devtools/client/styleeditor/test/doc_xulpage.xhtml
--- a/devtools/server/tests/mochitest/chrome.ini
+++ b/devtools/server/tests/mochitest/chrome.ini
@@ -1,13 +1,13 @@
 [DEFAULT]
 tags = devtools
 skip-if = os == 'android'
 support-files =
-  doc_Debugger.Source.prototype.introductionType.xul
+  doc_Debugger.Source.prototype.introductionType.xhtml
   Debugger.Source.prototype.element.js
   Debugger.Source.prototype.element-2.js
   Debugger.Source.prototype.element.html
   framerate-helpers.js
   hello-actor.js
   iframe1_makeGlobalObjectReference.html
   iframe2_makeGlobalObjectReference.html
   inspector_css-properties.html
rename from devtools/server/tests/mochitest/doc_Debugger.Source.prototype.introductionType.xul
rename to devtools/server/tests/mochitest/doc_Debugger.Source.prototype.introductionType.xhtml
--- a/devtools/server/tests/mochitest/doc_Debugger.Source.prototype.introductionType.xul
+++ b/devtools/server/tests/mochitest/doc_Debugger.Source.prototype.introductionType.xhtml
@@ -1,4 +1,7 @@
 <?xml version="1.0"?>
 <window xmlns='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'>
-<script id='xulie'>function xulScriptFunc() { debugger; }</script>
+<script id='xulie'>
+/* eslint-disable strict, no-unused-vars, no-debugger */
+function xulScriptFunc() { debugger; }
+</script>
 </window>
--- a/devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionType.html
+++ b/devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionType.html
@@ -134,17 +134,17 @@ addTest(function InsertRover() {
 
     runNextTest();
   }
 });
 
 // Create a XUL document with a script element, and check its introduction type.
 addTest(function XULDocumentScript() {
   const xulFrame = document.createElement("iframe");
-  xulFrame.src = "doc_Debugger.Source.prototype.introductionType.xul";
+  xulFrame.src = "doc_Debugger.Source.prototype.introductionType.xhtml";
   xulFrame.onload = xulLoaded;
   info("Appending iframe containing XUL document");
   document.body.appendChild(xulFrame);
 
   function xulLoaded() {
     info("Loaded XUL document");
     const xulFrameDO = dbg.addDebuggee(xulFrame.contentWindow);
     const xulFnDO = xulFrameDO.getOwnPropertyDescriptor("xulScriptFunc").value;