From 6487560a871cf91c864bfcc635fde8a8f8fb731f Mon Sep 17 00:00:00 2001 From: Andrew Swan Date: Mon, 27 Feb 2017 15:40:59 -0800 Subject: [PATCH] Bug 1340586 Part 1 Move webextensions tests to their own directory r=mossop MozReview-Commit-ID: JaCyAVYgjL6 --HG-- rename : browser/base/content/test/general/browser_extension_permissions.js => browser/base/content/test/webextensions/browser_extension_permissions.js rename : browser/base/content/test/general/browser_extension_sideloading.js => browser/base/content/test/webextensions/browser_extension_sideloading.js rename : browser/base/content/test/general/browser_extension_update_background.js => browser/base/content/test/webextensions/browser_extension_update_background.js rename : browser/base/content/test/general/browser_extension_update_interactive.js => browser/base/content/test/webextensions/browser_extension_update_interactive.js rename : browser/base/content/test/general/browser_legacy.xpi => browser/base/content/test/webextensions/browser_legacy.xpi rename : browser/base/content/test/general/browser_legacy_webext.xpi => browser/base/content/test/webextensions/browser_legacy_webext.xpi rename : browser/base/content/test/general/browser_webext_nopermissions.xpi => browser/base/content/test/webextensions/browser_webext_nopermissions.xpi rename : browser/base/content/test/general/browser_webext_permissions.xpi => browser/base/content/test/webextensions/browser_webext_permissions.xpi rename : browser/base/content/test/general/browser_webext_search.xml => browser/base/content/test/webextensions/browser_webext_search.xml rename : browser/base/content/test/general/browser_webext_update.json => browser/base/content/test/webextensions/browser_webext_update.json rename : browser/base/content/test/general/browser_webext_update1.xpi => browser/base/content/test/webextensions/browser_webext_update1.xpi rename : browser/base/content/test/general/browser_webext_update2.xpi => browser/base/content/test/webextensions/browser_webext_update2.xpi rename : browser/base/content/test/general/browser_webext_update_icon1.xpi => browser/base/content/test/webextensions/browser_webext_update_icon1.xpi rename : browser/base/content/test/general/browser_webext_update_icon2.xpi => browser/base/content/test/webextensions/browser_webext_update_icon2.xpi rename : browser/base/content/test/general/browser_webext_update_perms1.xpi => browser/base/content/test/webextensions/browser_webext_update_perms1.xpi rename : browser/base/content/test/general/browser_webext_update_perms2.xpi => browser/base/content/test/webextensions/browser_webext_update_perms2.xpi rename : browser/base/content/test/general/file_install_extensions.html => browser/base/content/test/webextensions/file_install_extensions.html extra : rebase_source : c9cbd1d914f0120e913ebcf0977df8a9e00744dd --- browser/base/content/test/general/browser.ini | 17 --------------- .../content/test/webextensions/browser.ini | 20 ++++++++++++++++++ .../browser_extension_permissions.js | 0 .../browser_extension_sideloading.js | 0 .../browser_extension_update_background.js | 0 .../browser_extension_update_interactive.js | 2 +- .../browser_legacy.xpi | Bin .../browser_legacy_webext.xpi | Bin .../browser_webext_nopermissions.xpi | Bin .../browser_webext_permissions.xpi | Bin .../browser_webext_search.xml | 4 ++-- .../browser_webext_update.json | 8 +++---- .../browser_webext_update1.xpi | Bin .../browser_webext_update2.xpi | Bin .../browser_webext_update_icon1.xpi | Bin .../browser_webext_update_icon2.xpi | Bin .../browser_webext_update_perms1.xpi | Bin .../browser_webext_update_perms2.xpi | Bin .../file_install_extensions.html | 0 browser/base/moz.build | 1 + 20 files changed, 28 insertions(+), 24 deletions(-) create mode 100644 browser/base/content/test/webextensions/browser.ini rename browser/base/content/test/{general => webextensions}/browser_extension_permissions.js (100%) rename browser/base/content/test/{general => webextensions}/browser_extension_sideloading.js (100%) rename browser/base/content/test/{general => webextensions}/browser_extension_update_background.js (100%) rename browser/base/content/test/{general => webextensions}/browser_extension_update_interactive.js (99%) rename browser/base/content/test/{general => webextensions}/browser_legacy.xpi (100%) rename browser/base/content/test/{general => webextensions}/browser_legacy_webext.xpi (100%) rename browser/base/content/test/{general => webextensions}/browser_webext_nopermissions.xpi (100%) rename browser/base/content/test/{general => webextensions}/browser_webext_permissions.xpi (100%) rename browser/base/content/test/{general => webextensions}/browser_webext_search.xml (91%) rename browser/base/content/test/{general => webextensions}/browser_webext_update.json (85%) rename browser/base/content/test/{general => webextensions}/browser_webext_update1.xpi (100%) rename browser/base/content/test/{general => webextensions}/browser_webext_update2.xpi (100%) rename browser/base/content/test/{general => webextensions}/browser_webext_update_icon1.xpi (100%) rename browser/base/content/test/{general => webextensions}/browser_webext_update_icon2.xpi (100%) rename browser/base/content/test/{general => webextensions}/browser_webext_update_perms1.xpi (100%) rename browser/base/content/test/{general => webextensions}/browser_webext_update_perms2.xpi (100%) rename browser/base/content/test/{general => webextensions}/file_install_extensions.html (100%) diff --git a/browser/base/content/test/general/browser.ini b/browser/base/content/test/general/browser.ini index 8bdb1be38b9a..47d6371eaa93 100644 --- a/browser/base/content/test/general/browser.ini +++ b/browser/base/content/test/general/browser.ini @@ -74,19 +74,6 @@ support-files = web_video1.ogv web_video1.ogv^headers^ zoom_test.html - file_install_extensions.html - browser_legacy.xpi - browser_legacy_webext.xpi - browser_webext_permissions.xpi - browser_webext_nopermissions.xpi - browser_webext_update1.xpi - browser_webext_update2.xpi - browser_webext_update_icon1.xpi - browser_webext_update_icon2.xpi - browser_webext_update_perms1.xpi - browser_webext_update_perms2.xpi - browser_webext_update.json - browser_webext_search.xml !/image/test/mochitest/blue.png !/toolkit/content/tests/browser/common/mockTransfer.js !/toolkit/modules/tests/browser/metadata_*.html @@ -256,10 +243,6 @@ skip-if = os == "mac" # decoder doctor isn't implemented on osx [browser_duplicateIDs.js] [browser_drag.js] skip-if = true # browser_drag.js is disabled, as it needs to be updated for the new behavior from bug 320638. -[browser_extension_permissions.js] -[browser_extension_sideloading.js] -[browser_extension_update_background.js] -[browser_extension_update_interactive.js] [browser_favicon_change.js] [browser_favicon_change_not_in_document.js] [browser_findbarClose.js] diff --git a/browser/base/content/test/webextensions/browser.ini b/browser/base/content/test/webextensions/browser.ini new file mode 100644 index 000000000000..818f393de50f --- /dev/null +++ b/browser/base/content/test/webextensions/browser.ini @@ -0,0 +1,20 @@ +[DEFAULT] +support-files = + file_install_extensions.html + browser_legacy.xpi + browser_legacy_webext.xpi + browser_webext_permissions.xpi + browser_webext_nopermissions.xpi + browser_webext_update1.xpi + browser_webext_update2.xpi + browser_webext_update_icon1.xpi + browser_webext_update_icon2.xpi + browser_webext_update_perms1.xpi + browser_webext_update_perms2.xpi + browser_webext_update.json + browser_webext_search.xml + +[browser_extension_permissions.js] +[browser_extension_sideloading.js] +[browser_extension_update_background.js] +[browser_extension_update_interactive.js] diff --git a/browser/base/content/test/general/browser_extension_permissions.js b/browser/base/content/test/webextensions/browser_extension_permissions.js similarity index 100% rename from browser/base/content/test/general/browser_extension_permissions.js rename to browser/base/content/test/webextensions/browser_extension_permissions.js diff --git a/browser/base/content/test/general/browser_extension_sideloading.js b/browser/base/content/test/webextensions/browser_extension_sideloading.js similarity index 100% rename from browser/base/content/test/general/browser_extension_sideloading.js rename to browser/base/content/test/webextensions/browser_extension_sideloading.js diff --git a/browser/base/content/test/general/browser_extension_update_background.js b/browser/base/content/test/webextensions/browser_extension_update_background.js similarity index 100% rename from browser/base/content/test/general/browser_extension_update_background.js rename to browser/base/content/test/webextensions/browser_extension_update_background.js diff --git a/browser/base/content/test/general/browser_extension_update_interactive.js b/browser/base/content/test/webextensions/browser_extension_update_interactive.js similarity index 99% rename from browser/base/content/test/general/browser_extension_update_interactive.js rename to browser/base/content/test/webextensions/browser_extension_update_interactive.js index e6c29df89586..51a33e46a9d6 100644 --- a/browser/base/content/test/general/browser_extension_update_interactive.js +++ b/browser/base/content/test/webextensions/browser_extension_update_interactive.js @@ -1,6 +1,6 @@ const {AddonManagerPrivate} = Cu.import("resource://gre/modules/AddonManager.jsm", {}); -const URL_BASE = "https://example.com/browser/browser/base/content/test/general"; +const URL_BASE = "https://example.com/browser/browser/base/content/test/webextensions"; const ID = "update2@tests.mozilla.org"; const ID_LEGACY = "legacy_update@tests.mozilla.org"; diff --git a/browser/base/content/test/general/browser_legacy.xpi b/browser/base/content/test/webextensions/browser_legacy.xpi similarity index 100% rename from browser/base/content/test/general/browser_legacy.xpi rename to browser/base/content/test/webextensions/browser_legacy.xpi diff --git a/browser/base/content/test/general/browser_legacy_webext.xpi b/browser/base/content/test/webextensions/browser_legacy_webext.xpi similarity index 100% rename from browser/base/content/test/general/browser_legacy_webext.xpi rename to browser/base/content/test/webextensions/browser_legacy_webext.xpi diff --git a/browser/base/content/test/general/browser_webext_nopermissions.xpi b/browser/base/content/test/webextensions/browser_webext_nopermissions.xpi similarity index 100% rename from browser/base/content/test/general/browser_webext_nopermissions.xpi rename to browser/base/content/test/webextensions/browser_webext_nopermissions.xpi diff --git a/browser/base/content/test/general/browser_webext_permissions.xpi b/browser/base/content/test/webextensions/browser_webext_permissions.xpi similarity index 100% rename from browser/base/content/test/general/browser_webext_permissions.xpi rename to browser/base/content/test/webextensions/browser_webext_permissions.xpi diff --git a/browser/base/content/test/general/browser_webext_search.xml b/browser/base/content/test/webextensions/browser_webext_search.xml similarity index 91% rename from browser/base/content/test/general/browser_webext_search.xml rename to browser/base/content/test/webextensions/browser_webext_search.xml index 196dda929256..23b8ce8d37ba 100644 --- a/browser/base/content/test/general/browser_webext_search.xml +++ b/browser/base/content/test/webextensions/browser_webext_search.xml @@ -21,7 +21,7 @@ ALL - https://example.com/browser/browser/base/content/test/general/browser_webext_permissions.xpi + https://example.com/browser/browser/base/content/test/webextensions/browser_webext_permissions.xpi @@ -45,7 +45,7 @@ ALL - https://example.com/browser/browser/base/content/test/general/browser_webext_nopermissions.xpi + https://example.com/browser/browser/base/content/test/webextensions/browser_webext_nopermissions.xpi diff --git a/browser/base/content/test/general/browser_webext_update.json b/browser/base/content/test/webextensions/browser_webext_update.json similarity index 85% rename from browser/base/content/test/general/browser_webext_update.json rename to browser/base/content/test/webextensions/browser_webext_update.json index 3aa2bb5a8b5b..fd53bde526af 100644 --- a/browser/base/content/test/general/browser_webext_update.json +++ b/browser/base/content/test/webextensions/browser_webext_update.json @@ -4,7 +4,7 @@ "updates": [ { "version": "2.0", - "update_link": "https://example.com/browser/browser/base/content/test/general/browser_webext_update2.xpi", + "update_link": "https://example.com/browser/browser/base/content/test/webextensions/browser_webext_update2.xpi", "applications": { "gecko": { "strict_min_version": "1", @@ -18,7 +18,7 @@ "updates": [ { "version": "2.0", - "update_link": "https://example.com/browser/browser/base/content/test/general/browser_webext_update_icon2.xpi", + "update_link": "https://example.com/browser/browser/base/content/test/webextensions/browser_webext_update_icon2.xpi", "applications": { "gecko": { "strict_min_version": "1", @@ -32,7 +32,7 @@ "updates": [ { "version": "2.0", - "update_link": "https://example.com/browser/browser/base/content/test/general/browser_webext_update_perms2.xpi", + "update_link": "https://example.com/browser/browser/base/content/test/webextensions/browser_webext_update_perms2.xpi", "applications": { "gecko": { "strict_min_version": "1", @@ -46,7 +46,7 @@ "updates": [ { "version": "2.0", - "update_link": "https://example.com/browser/browser/base/content/test/general/browser_legacy_webext.xpi", + "update_link": "https://example.com/browser/browser/base/content/test/webextensions/browser_legacy_webext.xpi", "applications": { "gecko": { "strict_min_version": "1", diff --git a/browser/base/content/test/general/browser_webext_update1.xpi b/browser/base/content/test/webextensions/browser_webext_update1.xpi similarity index 100% rename from browser/base/content/test/general/browser_webext_update1.xpi rename to browser/base/content/test/webextensions/browser_webext_update1.xpi diff --git a/browser/base/content/test/general/browser_webext_update2.xpi b/browser/base/content/test/webextensions/browser_webext_update2.xpi similarity index 100% rename from browser/base/content/test/general/browser_webext_update2.xpi rename to browser/base/content/test/webextensions/browser_webext_update2.xpi diff --git a/browser/base/content/test/general/browser_webext_update_icon1.xpi b/browser/base/content/test/webextensions/browser_webext_update_icon1.xpi similarity index 100% rename from browser/base/content/test/general/browser_webext_update_icon1.xpi rename to browser/base/content/test/webextensions/browser_webext_update_icon1.xpi diff --git a/browser/base/content/test/general/browser_webext_update_icon2.xpi b/browser/base/content/test/webextensions/browser_webext_update_icon2.xpi similarity index 100% rename from browser/base/content/test/general/browser_webext_update_icon2.xpi rename to browser/base/content/test/webextensions/browser_webext_update_icon2.xpi diff --git a/browser/base/content/test/general/browser_webext_update_perms1.xpi b/browser/base/content/test/webextensions/browser_webext_update_perms1.xpi similarity index 100% rename from browser/base/content/test/general/browser_webext_update_perms1.xpi rename to browser/base/content/test/webextensions/browser_webext_update_perms1.xpi diff --git a/browser/base/content/test/general/browser_webext_update_perms2.xpi b/browser/base/content/test/webextensions/browser_webext_update_perms2.xpi similarity index 100% rename from browser/base/content/test/general/browser_webext_update_perms2.xpi rename to browser/base/content/test/webextensions/browser_webext_update_perms2.xpi diff --git a/browser/base/content/test/general/file_install_extensions.html b/browser/base/content/test/webextensions/file_install_extensions.html similarity index 100% rename from browser/base/content/test/general/file_install_extensions.html rename to browser/base/content/test/webextensions/file_install_extensions.html diff --git a/browser/base/moz.build b/browser/base/moz.build index 11a9625edfa1..589f22024790 100644 --- a/browser/base/moz.build +++ b/browser/base/moz.build @@ -28,6 +28,7 @@ BROWSER_CHROME_MANIFESTS += [ 'content/test/tabPrompts/browser.ini', 'content/test/tabs/browser.ini', 'content/test/urlbar/browser.ini', + 'content/test/webextensions/browser.ini', 'content/test/webrtc/browser.ini', ]