From 35558fd4e90d72debd3914a5848e756e88aa7e98 Mon Sep 17 00:00:00 2001 From: Aryeh Gregor Date: Tue, 30 Aug 2016 18:25:18 +0300 Subject: [PATCH] Bug 1271119 - Port test_bug490879.xul from chrome to plain; r=masayuki Possible issue: the previous version saved document.popupNode and restored it after copying the image, and the new version does not (because I don't know how). The test seems to pass anyway. It seems I had to use doCommand instead of execCommand to carry out the paste, presumably because of permissions differences between plain and chrome mochitests. MozReview-Commit-ID: CdPUCmEtgwO --HG-- rename : editor/libeditor/tests/test_bug490879.xul => editor/libeditor/tests/test_bug490879.html --- editor/libeditor/tests/chrome.ini | 2 - editor/libeditor/tests/mochitest.ini | 3 + editor/libeditor/tests/test_bug490879.html | 45 ++++++++++++++ editor/libeditor/tests/test_bug490879.xul | 71 ---------------------- 4 files changed, 48 insertions(+), 73 deletions(-) create mode 100644 editor/libeditor/tests/test_bug490879.html delete mode 100644 editor/libeditor/tests/test_bug490879.xul diff --git a/editor/libeditor/tests/chrome.ini b/editor/libeditor/tests/chrome.ini index b4546ea63f2d..241d4637c8b6 100644 --- a/editor/libeditor/tests/chrome.ini +++ b/editor/libeditor/tests/chrome.ini @@ -3,8 +3,6 @@ skip-if = buildapp == 'b2g' || os == 'android' support-files = green.png [test_bug489202.xul] -[test_bug490879.xul] -subsuite = clipboard [test_bug569988.html] skip-if = buildapp == 'mulet' [test_bug599983.xul] diff --git a/editor/libeditor/tests/mochitest.ini b/editor/libeditor/tests/mochitest.ini index 49036d1aa1f4..8d4fd1d04c59 100644 --- a/editor/libeditor/tests/mochitest.ini +++ b/editor/libeditor/tests/mochitest.ini @@ -60,6 +60,9 @@ skip-if = toolkit == 'android' [test_bug484181.html] skip-if = toolkit == 'android' [test_bug487524.html] +[test_bug490879.html] +subsuite = clipboard +skip-if = toolkit == 'android' # bug 1299578 [test_bug502673.html] [test_bug514156.html] [test_bug520189.html] diff --git a/editor/libeditor/tests/test_bug490879.html b/editor/libeditor/tests/test_bug490879.html new file mode 100644 index 000000000000..1e412a7d652a --- /dev/null +++ b/editor/libeditor/tests/test_bug490879.html @@ -0,0 +1,45 @@ + +Mozilla Bug 490879 + + +Mozilla Bug 490879 + + + diff --git a/editor/libeditor/tests/test_bug490879.xul b/editor/libeditor/tests/test_bug490879.xul deleted file mode 100644 index 8081e81ec670..000000000000 --- a/editor/libeditor/tests/test_bug490879.xul +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - -