From ce9c72d88e34e573c05d5d59734f9d23a7a4d44b Mon Sep 17 00:00:00 2001
From: Emma Malysz <emalysz@mozilla.com>
Date: Tue, 19 Nov 2019 23:40:10 +0000
Subject: [PATCH] Bug 1597752, rename .xul files in editor/ to .xhtml
 r=masayuki

Differential Revision: https://phabricator.services.mozilla.com/D53844

--HG--
rename : editor/composer/test/test_bug434998.xul => editor/composer/test/test_bug434998.xhtml
rename : editor/libeditor/tests/test_bug1386222.xul => editor/libeditor/tests/test_bug1386222.xhtml
rename : editor/libeditor/tests/test_bug1397412.xul => editor/libeditor/tests/test_bug1397412.xhtml
rename : editor/libeditor/tests/test_bug489202.xul => editor/libeditor/tests/test_bug489202.xhtml
rename : editor/libeditor/tests/test_bug599983.xul => editor/libeditor/tests/test_bug599983.xhtml
rename : editor/libeditor/tests/test_bug607584.xul => editor/libeditor/tests/test_bug607584.xhtml
rename : editor/libeditor/tests/test_bug616590.xul => editor/libeditor/tests/test_bug616590.xhtml
rename : editor/libeditor/tests/test_bug780908.xul => editor/libeditor/tests/test_bug780908.xhtml
rename : editor/libeditor/tests/test_cut_copy_delete_command_enabled.xul => editor/libeditor/tests/test_cut_copy_delete_command_enabled.xhtml
rename : editor/libeditor/tests/test_pasteImgTextarea.xul => editor/libeditor/tests/test_pasteImgTextarea.xhtml
rename : editor/reftests/xul/empty-ref.xul => editor/reftests/xul/empty-ref.xhtml
rename : editor/reftests/xul/emptytextbox-4.xul => editor/reftests/xul/emptytextbox-4.xhtml
rename : editor/reftests/xul/emptytextbox-ref.xul => editor/reftests/xul/emptytextbox-ref.xhtml
extra : moz-landing-system : lando
---
 .eslintrc.js                                   | 11 +++++++++++
 editor/composer/test/chrome.ini                |  2 +-
 ...test_bug434998.xul => test_bug434998.xhtml} |  0
 editor/libeditor/tests/chrome.ini              | 18 +++++++++---------
 ...st_bug1386222.xul => test_bug1386222.xhtml} |  0
 ...st_bug1397412.xul => test_bug1397412.xhtml} |  0
 ...test_bug489202.xul => test_bug489202.xhtml} |  0
 ...test_bug599983.xul => test_bug599983.xhtml} |  0
 ...test_bug607584.xul => test_bug607584.xhtml} |  0
 ...test_bug616590.xul => test_bug616590.xhtml} |  0
 ...test_bug780908.xul => test_bug780908.xhtml} |  2 +-
 ...test_cut_copy_delete_command_enabled.xhtml} |  0
 ...extarea.xul => test_pasteImgTextarea.xhtml} |  0
 .../xul/{empty-ref.xul => empty-ref.xhtml}     |  0
 ...emptytextbox-4.xul => emptytextbox-4.xhtml} |  0
 ...ytextbox-ref.xul => emptytextbox-ref.xhtml} |  0
 editor/reftests/xul/reftest.list               |  2 +-
 17 files changed, 23 insertions(+), 12 deletions(-)
 rename editor/composer/test/{test_bug434998.xul => test_bug434998.xhtml} (100%)
 rename editor/libeditor/tests/{test_bug1386222.xul => test_bug1386222.xhtml} (100%)
 rename editor/libeditor/tests/{test_bug1397412.xul => test_bug1397412.xhtml} (100%)
 rename editor/libeditor/tests/{test_bug489202.xul => test_bug489202.xhtml} (100%)
 rename editor/libeditor/tests/{test_bug599983.xul => test_bug599983.xhtml} (100%)
 rename editor/libeditor/tests/{test_bug607584.xul => test_bug607584.xhtml} (100%)
 rename editor/libeditor/tests/{test_bug616590.xul => test_bug616590.xhtml} (100%)
 rename editor/libeditor/tests/{test_bug780908.xul => test_bug780908.xhtml} (98%)
 rename editor/libeditor/tests/{test_cut_copy_delete_command_enabled.xul => test_cut_copy_delete_command_enabled.xhtml} (100%)
 rename editor/libeditor/tests/{test_pasteImgTextarea.xul => test_pasteImgTextarea.xhtml} (100%)
 rename editor/reftests/xul/{empty-ref.xul => empty-ref.xhtml} (100%)
 rename editor/reftests/xul/{emptytextbox-4.xul => emptytextbox-4.xhtml} (100%)
 rename editor/reftests/xul/{emptytextbox-ref.xul => emptytextbox-ref.xhtml} (100%)

diff --git a/.eslintrc.js b/.eslintrc.js
index 10cd1a3c1cf3..56902992b65c 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -409,6 +409,17 @@ module.exports = {
       "no-unused-vars": "off",
       "no-useless-call": "off",
     }
+  }, {
+    "files": [
+      "editor/composer/test/test_bug434998.xhtml",
+      "editor/libeditor/tests/test_bug607584.xhtml",
+      "editor/libeditor/tests/test_bug616590.xhtml",
+      "editor/libeditor/tests/test_bug780908.xhtml",
+    ],
+    "rules": {
+      "object-shorthand": "off",
+      "no-undef": "off",
+    }
   }, {
     "files": [
       "toolkit/components/aboutmemory/tests/test_aboutmemory.xhtml",
diff --git a/editor/composer/test/chrome.ini b/editor/composer/test/chrome.ini
index 015cad3d5c45..cd25f64656d8 100644
--- a/editor/composer/test/chrome.ini
+++ b/editor/composer/test/chrome.ini
@@ -1,5 +1,5 @@
 [DEFAULT]
 skip-if = os == 'android'
 
-[test_bug434998.xul]
+[test_bug434998.xhtml]
 [test_bug1266815.html]
diff --git a/editor/composer/test/test_bug434998.xul b/editor/composer/test/test_bug434998.xhtml
similarity index 100%
rename from editor/composer/test/test_bug434998.xul
rename to editor/composer/test/test_bug434998.xhtml
diff --git a/editor/libeditor/tests/chrome.ini b/editor/libeditor/tests/chrome.ini
index 76f12e8e6059..7847447d12dd 100644
--- a/editor/libeditor/tests/chrome.ini
+++ b/editor/libeditor/tests/chrome.ini
@@ -2,16 +2,16 @@
 skip-if = os == 'android'
 support-files = green.png
 
-[test_bug489202.xul]
-[test_bug599983.xul]
-[test_bug607584.xul]
-[test_bug616590.xul]
-[test_bug780908.xul]
-[test_bug1386222.xul]
-[test_bug1397412.xul]
+[test_bug489202.xhtml]
+[test_bug599983.xhtml]
+[test_bug607584.xhtml]
+[test_bug616590.xhtml]
+[test_bug780908.xhtml]
+[test_bug1386222.xhtml]
+[test_bug1397412.xhtml]
 [test_contenteditable_text_input_handling.html]
-[test_cut_copy_delete_command_enabled.xul]
+[test_cut_copy_delete_command_enabled.xhtml]
 [test_htmleditor_keyevent_handling.html]
 [test_texteditor_keyevent_handling.html]
 skip-if = (debug && os=='win') || (os == 'linux') # Bug 1116205, leaks on windows debug, fails delete key on linux
-[test_pasteImgTextarea.xul]
+[test_pasteImgTextarea.xhtml]
diff --git a/editor/libeditor/tests/test_bug1386222.xul b/editor/libeditor/tests/test_bug1386222.xhtml
similarity index 100%
rename from editor/libeditor/tests/test_bug1386222.xul
rename to editor/libeditor/tests/test_bug1386222.xhtml
diff --git a/editor/libeditor/tests/test_bug1397412.xul b/editor/libeditor/tests/test_bug1397412.xhtml
similarity index 100%
rename from editor/libeditor/tests/test_bug1397412.xul
rename to editor/libeditor/tests/test_bug1397412.xhtml
diff --git a/editor/libeditor/tests/test_bug489202.xul b/editor/libeditor/tests/test_bug489202.xhtml
similarity index 100%
rename from editor/libeditor/tests/test_bug489202.xul
rename to editor/libeditor/tests/test_bug489202.xhtml
diff --git a/editor/libeditor/tests/test_bug599983.xul b/editor/libeditor/tests/test_bug599983.xhtml
similarity index 100%
rename from editor/libeditor/tests/test_bug599983.xul
rename to editor/libeditor/tests/test_bug599983.xhtml
diff --git a/editor/libeditor/tests/test_bug607584.xul b/editor/libeditor/tests/test_bug607584.xhtml
similarity index 100%
rename from editor/libeditor/tests/test_bug607584.xul
rename to editor/libeditor/tests/test_bug607584.xhtml
diff --git a/editor/libeditor/tests/test_bug616590.xul b/editor/libeditor/tests/test_bug616590.xhtml
similarity index 100%
rename from editor/libeditor/tests/test_bug616590.xul
rename to editor/libeditor/tests/test_bug616590.xhtml
diff --git a/editor/libeditor/tests/test_bug780908.xul b/editor/libeditor/tests/test_bug780908.xhtml
similarity index 98%
rename from editor/libeditor/tests/test_bug780908.xul
rename to editor/libeditor/tests/test_bug780908.xhtml
index b365542fb5e5..237e1a5c5b89 100644
--- a/editor/libeditor/tests/test_bug780908.xul
+++ b/editor/libeditor/tests/test_bug780908.xhtml
@@ -6,7 +6,7 @@
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=780908
 
-adapted from test_bug607584.xul by Kent James <kent@caspia.com>
+adapted from test_bug607584.xhtml by Kent James <kent@caspia.com>
 -->
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="Mozilla Bug 780908" onload="runTest();">
diff --git a/editor/libeditor/tests/test_cut_copy_delete_command_enabled.xul b/editor/libeditor/tests/test_cut_copy_delete_command_enabled.xhtml
similarity index 100%
rename from editor/libeditor/tests/test_cut_copy_delete_command_enabled.xul
rename to editor/libeditor/tests/test_cut_copy_delete_command_enabled.xhtml
diff --git a/editor/libeditor/tests/test_pasteImgTextarea.xul b/editor/libeditor/tests/test_pasteImgTextarea.xhtml
similarity index 100%
rename from editor/libeditor/tests/test_pasteImgTextarea.xul
rename to editor/libeditor/tests/test_pasteImgTextarea.xhtml
diff --git a/editor/reftests/xul/empty-ref.xul b/editor/reftests/xul/empty-ref.xhtml
similarity index 100%
rename from editor/reftests/xul/empty-ref.xul
rename to editor/reftests/xul/empty-ref.xhtml
diff --git a/editor/reftests/xul/emptytextbox-4.xul b/editor/reftests/xul/emptytextbox-4.xhtml
similarity index 100%
rename from editor/reftests/xul/emptytextbox-4.xul
rename to editor/reftests/xul/emptytextbox-4.xhtml
diff --git a/editor/reftests/xul/emptytextbox-ref.xul b/editor/reftests/xul/emptytextbox-ref.xhtml
similarity index 100%
rename from editor/reftests/xul/emptytextbox-ref.xul
rename to editor/reftests/xul/emptytextbox-ref.xhtml
diff --git a/editor/reftests/xul/reftest.list b/editor/reftests/xul/reftest.list
index 06336c46b0de..591ee8f6c76b 100644
--- a/editor/reftests/xul/reftest.list
+++ b/editor/reftests/xul/reftest.list
@@ -1 +1 @@
-!= chrome://reftest/content/editor/reftests/xul/emptytextbox-4.xul chrome://reftest/content/editor/reftests/xul/emptytextbox-ref.xul
+!= chrome://reftest/content/editor/reftests/xul/emptytextbox-4.xhtml chrome://reftest/content/editor/reftests/xul/emptytextbox-ref.xhtml