Bug 1375463 - Move contextmenu related tests into browser/base/content/test/contextMenu. r=Standard8
authorMatthew Wacha <matthewacha@gmail.com>
Tue, 14 May 2019 12:38:53 +0000
changeset 535658 baae6f2fe9a7c1b55225ba3cd1291b0c671df185
parent 535657 23ab80e6ec5318991ef646bc74515bd4347d0da1
child 535659 2351c4f1d47d75218a1bbf2bcf19b34835428972
push id2082
push userffxbld-merge
push dateMon, 01 Jul 2019 08:34:18 +0000
treeherdermozilla-release@2fb19d0466d2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersStandard8
bugs1375463
milestone68.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 1375463 - Move contextmenu related tests into browser/base/content/test/contextMenu. r=Standard8 Differential Revision: https://phabricator.services.mozilla.com/D21916
browser/base/content/test/contextMenu/browser.ini
browser/base/content/test/contextMenu/browser_contextmenu.js
browser/base/content/test/contextMenu/browser_contextmenu_childprocess.js
browser/base/content/test/contextMenu/browser_contextmenu_input.js
browser/base/content/test/contextMenu/contextmenu_common.js
browser/base/content/test/contextMenu/ctxmenu-image.png
browser/base/content/test/contextMenu/subtst_contextmenu.html
browser/base/content/test/contextMenu/subtst_contextmenu_input.html
browser/base/content/test/contextMenu/subtst_contextmenu_xul.xul
browser/base/content/test/general/browser.ini
browser/base/content/test/general/browser_contextmenu.js
browser/base/content/test/general/browser_contextmenu_childprocess.js
browser/base/content/test/general/browser_contextmenu_input.js
browser/base/content/test/general/contextmenu_common.js
browser/base/content/test/general/ctxmenu-image.png
browser/base/content/test/general/subtst_contextmenu.html
browser/base/content/test/general/subtst_contextmenu_input.html
browser/base/content/test/general/subtst_contextmenu_xul.xul
--- a/browser/base/content/test/contextMenu/browser.ini
+++ b/browser/base/content/test/contextMenu/browser.ini
@@ -1,15 +1,28 @@
 [DEFAULT]
 support-files =
-  !/browser/base/content/test/general/contextmenu_common.js
   subtst_contextmenu_webext.html
   test_contextmenu_links.html
+  subtst_contextmenu.html
+  subtst_contextmenu_input.html
+  subtst_contextmenu_xul.xul
+  ctxmenu-image.png
+  ../general/head.js
+  ../general/video.ogg
+  ../general/audio.ogg
+  contextmenu_common.js
 
 [browser_contextmenu_touch.js]
 skip-if = !(os == 'win' && os_version == '10.0')
 [browser_contextmenu_linkopen.js]
 [browser_contextmenu_iframe.js]
 support-files =
   test_contextmenu_iframe.html
 [browser_utilityOverlay.js]
 skip-if = os == "linux" || os == "mac" #Bug 1444631
 [browser_utilityOverlayPrincipal.js]
+[browser_contextmenu_childprocess.js]
+[browser_contextmenu.js]
+tags = fullscreen clipboard
+skip-if = toolkit == "gtk3" || verify || (os == "win" && processor == "aarch64") # disabled on Linux due to bug 513558, aarch64 due to 1531590
+[browser_contextmenu_input.js]
+skip-if = toolkit == "gtk3" || (os == "win" && processor == "aarch64") # disabled on Linux due to bug 513558, aarch64 due to 1533161
rename from browser/base/content/test/general/browser_contextmenu.js
rename to browser/base/content/test/contextMenu/browser_contextmenu.js
--- a/browser/base/content/test/general/browser_contextmenu.js
+++ b/browser/base/content/test/contextMenu/browser_contextmenu.js
@@ -8,22 +8,26 @@ let LOGIN_FILL_ITEMS = [
       "fill-login-no-logins", false,
       "---", null,
       "fill-login-saved-passwords", true,
     ], null,
 ];
 let hasPocket = Services.prefs.getBoolPref("extensions.pocket.enabled");
 let hasContainers = Services.prefs.getBoolPref("privacy.userContext.enabled");
 
-const example_base = "http://example.com/browser/browser/base/content/test/general/";
-const chrome_base = "chrome://mochitests/content/browser/browser/base/content/test/general/";
+const example_base = "http://example.com/browser/browser/base/content/test/contextMenu/";
+const chrome_base = "chrome://mochitests/content/browser/browser/base/content/test/contextMenu/";
+const head_base = "chrome://mochitests/content/browser/browser/base/content/test/contextMenu/";
 
 /* import-globals-from contextmenu_common.js */
 Services.scriptloader.loadSubScript(chrome_base + "contextmenu_common.js", this);
 
+/* import-globals-from ../general/head.js */
+Services.scriptloader.loadSubScript(head_base + "head.js", this);
+
 add_task(async function init() {
   // Ensure screenshots is really disabled (bug 1498738)
   const addon = await AddonManager.getAddonByID("screenshots@mozilla.org");
   await addon.disable({allowSystemAddons: true});
 });
 
 // Below are test cases for XUL element
 add_task(async function test_xul_text_link_label() {
rename from browser/base/content/test/general/browser_contextmenu_childprocess.js
rename to browser/base/content/test/contextMenu/browser_contextmenu_childprocess.js
--- a/browser/base/content/test/general/browser_contextmenu_childprocess.js
+++ b/browser/base/content/test/contextMenu/browser_contextmenu_childprocess.js
@@ -1,12 +1,12 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-const gBaseURL = "https://example.com/browser/browser/base/content/test/general/";
+const gBaseURL = "https://example.com/browser/browser/base/content/test/contextMenu/";
 
 add_task(async function() {
   let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, gBaseURL + "subtst_contextmenu.html");
 
   let contextMenu = document.getElementById("contentAreaContextMenu");
 
   // Get the point of the element with the page menu (test-pagemenu) and
   // synthesize a right mouse click there.
rename from browser/base/content/test/general/browser_contextmenu_input.js
rename to browser/base/content/test/contextMenu/browser_contextmenu_input.js
--- a/browser/base/content/test/general/browser_contextmenu_input.js
+++ b/browser/base/content/test/contextMenu/browser_contextmenu_input.js
@@ -1,19 +1,19 @@
 "use strict";
 
 let contextMenu;
 let hasPocket = Services.prefs.getBoolPref("extensions.pocket.enabled");
 
 add_task(async function test_setup() {
-  const example_base = "http://example.com/browser/browser/base/content/test/general/";
+  const example_base = "http://example.com/browser/browser/base/content/test/contextMenu/";
   const url = example_base + "subtst_contextmenu_input.html";
   await BrowserTestUtils.openNewForegroundTab(gBrowser, url);
 
-  const chrome_base = "chrome://mochitests/content/browser/browser/base/content/test/general/";
+  const chrome_base = "chrome://mochitests/content/browser/browser/base/content/test/contextMenu/";
   const contextmenu_common = chrome_base + "contextmenu_common.js";
   /* import-globals-from contextmenu_common.js */
   Services.scriptloader.loadSubScript(contextmenu_common, this);
 
   // Ensure screenshots is really disabled (bug 1498738)
   const addon = await AddonManager.getAddonByID("screenshots@mozilla.org");
   await addon.disable({allowSystemAddons: true});
 });
rename from browser/base/content/test/general/contextmenu_common.js
rename to browser/base/content/test/contextMenu/contextmenu_common.js
rename from browser/base/content/test/general/ctxmenu-image.png
rename to browser/base/content/test/contextMenu/ctxmenu-image.png
rename from browser/base/content/test/general/subtst_contextmenu.html
rename to browser/base/content/test/contextMenu/subtst_contextmenu.html
rename from browser/base/content/test/general/subtst_contextmenu_input.html
rename to browser/base/content/test/contextMenu/subtst_contextmenu_input.html
rename from browser/base/content/test/general/subtst_contextmenu_xul.xul
rename to browser/base/content/test/contextMenu/subtst_contextmenu_xul.xul
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -20,18 +20,16 @@ support-files =
   browser_web_channel.html
   browser_web_channel_iframe.html
   bug592338.html
   bug792517-2.html
   bug792517.html
   bug792517.sjs
   bug839103.css
   clipboard_pastefile.html
-  contextmenu_common.js
-  ctxmenu-image.png
   discovery.html
   download_page.html
   download_page_1.txt
   download_page_2.txt
   dummy_page.html
   file_documentnavigation_frameset.html
   file_double_close_tab.html
   file_fullscreen-window-open.html
@@ -41,19 +39,16 @@ support-files =
   navigating_window_with_download.html
   page_style_sample.html
   pinning_headers.sjs
   ssl_error_reports.sjs
   print_postdata.sjs
   searchSuggestionEngine.sjs
   searchSuggestionEngine.xml
   searchSuggestionEngine2.xml
-  subtst_contextmenu.html
-  subtst_contextmenu_input.html
-  subtst_contextmenu_xul.xul
   test_bug462673.html
   test_bug628179.html
   test_bug839103.html
   test_process_flags_chrome.html
   title_test.svg
   unknownContentType_file.pif
   unknownContentType_file.pif^headers^
   video.ogg
@@ -242,23 +237,16 @@ tags = clipboard
 [browser_clipboard_pastefile.js]
 skip-if = true # Disabled due to the clipboard not supporting real file types yet (bug 1288773)
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_contentAreaClick.js]
 skip-if = e10s # Clicks in content don't go through contentAreaClick with e10s.
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_contentAltClick.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
-[browser_contextmenu.js]
-tags = fullscreen clipboard
-skip-if = toolkit == "gtk3" || verify || (os == "win" && processor == "aarch64") # disabled on Linux due to bug 513558, aarch64 due to 1531590
-# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
-[browser_contextmenu_input.js]
-skip-if = toolkit == "gtk3" || (os == "win" && processor == "aarch64") # disabled on Linux due to bug 513558, aarch64 due to 1533161
-# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_ctrlTab.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_datachoices_notification.js]
 skip-if = !datareporting || (verify && !debug && (os == 'win'))
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_decoderDoctor.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_search_discovery.js]
@@ -447,18 +435,16 @@ uses-unsafe-cpows = true
 tags = psm
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_windowactivation.js]
 skip-if = verify
 support-files =
   file_window_activation.html
   file_window_activation2.html
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
-[browser_contextmenu_childprocess.js]
-# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug963945.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_domFullscreen_fullscreenMode.js]
 tags = fullscreen
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_newTabDrop.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.