roytam1/basilisk55
1
0
Fork 0
mirror of https://github.com/roytam1/basilisk55.git synced 2026-05-26 05:02:25 +00:00
Code Issues Projects Releases Wiki Activity

webextension: revert this part of changes in rev f63e51e471

Browse Source
This commit is contained in:
Roy Tam
2019-03-25 23:21:44 +08:00
parent 141fdee146
commit abd82fe1f2
50 changed files with 154 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
devtools/client/aboutdebugging/test/addons/test-devtools-webextension-nobg/manifest.json
+1 -1
View File
@@ -3,7 +3,7 @@
"name": "test-devtools-webextension-nobg",
"version": "1.0",
"applications": {
"goanna": {
"gecko": {
"id": "test-devtools-webextension-nobg@mozilla.org"
}
}
devtools/client/aboutdebugging/test/addons/test-devtools-webextension/manifest.json
+1 -1
View File
@@ -3,7 +3,7 @@
"name": "test-devtools-webextension",
"version": "1.0",
"applications": {
"goanna": {
"gecko": {
"id": "test-devtools-webextension@mozilla.org"
}
},
devtools/client/aboutdebugging/test/browser_addons_reload.js
+1 -1
View File
@@ -148,7 +148,7 @@ add_task(function* reloadButtonRefreshesMetadata() {
"name": "Temporary web extension",
"version": "1.0",
"applications": {
"goanna": {
"gecko": {
"id": ADDON_ID
}
}
devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon_webext_contentscript/manifest.json
+1 -1
View File
@@ -4,7 +4,7 @@
"description": "test content script sources",
"version": "0.1.0",
"applications": {
"goanna": {
"gecko": {
"id": "test-contentscript-sources@mozilla.com"
}
},
devtools/server/tests/unit/addons/web-extension-upgrade/manifest.json
+1 -1
View File
@@ -3,7 +3,7 @@
"name": "Test Addons Actor Upgrade",
"version": "1.0",
"applications": {
"goanna": {
"gecko": {
"id": "test-addons-actor@mozilla.org"
}
}
devtools/server/tests/unit/addons/web-extension/manifest.json
+1 -1
View File
@@ -3,7 +3,7 @@
"name": "Test Addons Actor",
"version": "1.0",
"applications": {
"goanna": {
"gecko": {
"id": "test-addons-actor@mozilla.org"
}
}
devtools/server/tests/unit/addons/web-extension2/manifest.json
+1 -1
View File
@@ -3,7 +3,7 @@
"name": "Test Addons Actor 2",
"version": "1.0",
"applications": {
"goanna": {
"gecko": {
"id": "test-addons-actor2@mozilla.org"
}
}
jetpack/source/test/addons/embedded-webextension/webextension/manifest.json
+1 -1
View File
@@ -3,7 +3,7 @@
"description": "",
"version": "0.1.0",
"applications": {
"goanna": {
"gecko": {
"id": "embedded-webextension@jetpack"
}
},
mobile/android/components/extensions/test/mochitest/test_ext_pageAction.html
+1 -1
View File
@@ -61,7 +61,7 @@ add_task(function* test_pageAction() {
},
},
"applications": {
"goanna": {
"gecko": {
"id": "foo@bar.com",
},
},
toolkit/components/extensions/ExtensionTestCommon.jsm
+5 -5
View File
@@ -215,7 +215,7 @@ class ExtensionTestCommon {
<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:em="http://www.mozilla.org/2004/em-rdf#">
<Description about="urn:mozilla:install-manifest"
em:id="${manifest.applications.goanna.id}"
em:id="${manifest.applications.gecko.id}"
em:name="${manifest.name}"
em:type="2"
em:version="${manifest.version}"
@@ -327,10 +327,10 @@ class ExtensionTestCommon {
let id;
if (data.manifest) {
if (data.manifest.applications && data.manifest.applications.goanna) {
id = data.manifest.applications.goanna.id;
} else if (data.manifest.browser_specific_settings && data.manifest.browser_specific_settings.goanna) {
id = data.manifest.browser_specific_settings.goanna.id;
if (data.manifest.applications && data.manifest.applications.gecko) {
id = data.manifest.applications.gecko.id;
} else if (data.manifest.browser_specific_settings && data.manifest.browser_specific_settings.gecko) {
id = data.manifest.browser_specific_settings.gecko.id;
}
}
if (!id) {
toolkit/components/extensions/ExtensionXPCShellUtils.jsm
+1 -1
View File
@@ -29,7 +29,7 @@ XPCOMUtils.defineLazyGetter(this, "Management", () => {
let BASE_MANIFEST = Object.freeze({
"applications": Object.freeze({
"goanna": Object.freeze({
"gecko": Object.freeze({
"id": "test@web.ext",
}),
}),
toolkit/components/extensions/schemas/manifest.json
+2 -2
View File
@@ -22,7 +22,7 @@
"type": "object",
"optional": true,
"properties": {
"goanna": {
"gecko": {
"$ref": "FirefoxSpecificProperties",
"optional": true
}
@@ -33,7 +33,7 @@
"type": "object",
"optional": true,
"properties": {
"goanna": {
"gecko": {
"$ref": "FirefoxSpecificProperties",
"optional": true
}
toolkit/components/extensions/test/mochitest/test_chrome_ext_background_debug_global.html
+1 -1
View File
@@ -39,7 +39,7 @@ let extensionData = {
useAddonManager: "temporary",
background,
manifest: {
applications: {goanna: {id: ID}},
applications: {gecko: {id: ID}},
},
};
toolkit/components/extensions/test/mochitest/test_chrome_ext_identity.html
+4 -4
View File
@@ -37,7 +37,7 @@ add_task(function* test_badAuthURI() {
let extension = ExtensionTestUtils.loadExtension({
manifest: {
"applications": {
"goanna": {
"gecko": {
"id": "identity@mozilla.org",
},
},
@@ -167,7 +167,7 @@ add_task(function* test_autoRedirect() {
let extension = ExtensionTestUtils.loadExtension({
manifest: {
"applications": {
"goanna": {
"gecko": {
"id": "identity@mozilla.org",
},
},
@@ -189,7 +189,7 @@ add_task(function* test_noRedirect() {
let extension = ExtensionTestUtils.loadExtension({
manifest: {
"applications": {
"goanna": {
"gecko": {
"id": "identity@mozilla.org",
},
},
@@ -214,7 +214,7 @@ add_task(function* test_interaction() {
let extension = ExtensionTestUtils.loadExtension({
manifest: {
"applications": {
"goanna": {
"gecko": {
"id": "identity@mozilla.org",
},
},
toolkit/components/extensions/test/mochitest/test_chrome_ext_storage_cleanup.html
+3 -3
View File
@@ -108,7 +108,7 @@ add_task(function* test_uninstall() {
let extension = ExtensionTestUtils.loadExtension({
background: writeData,
manifest: {
applications: {goanna: {id: ID}},
applications: {gecko: {id: ID}},
permissions: ["storage"],
},
useAddonManager: "temporary",
@@ -127,7 +127,7 @@ add_task(function* test_uninstall() {
extension = ExtensionTestUtils.loadExtension({
background: readData,
manifest: {
applications: {goanna: {id: ID}},
applications: {gecko: {id: ID}},
permissions: ["storage"],
},
useAddonManager: "temporary",
@@ -145,7 +145,7 @@ add_task(function* test_uninstall() {
extension = ExtensionTestUtils.loadExtension({
background: readData,
manifest: {
applications: {goanna: {id: ID}},
applications: {gecko: {id: ID}},
permissions: ["storage"],
},
useAddonManager: "temporary",
toolkit/components/extensions/test/mochitest/test_ext_contentscript.html
+2 -2
View File
@@ -40,13 +40,13 @@ add_task(function* test_contentscript() {
function contentScript() {
let manifest = browser.runtime.getManifest();
void manifest.applications.goanna.id;
void manifest.applications.gecko.id;
chrome.runtime.sendMessage(["chrome-namespace-ok"]);
}
let extensionData = {
manifest: {
applications: {goanna: {id: "contentscript@tests.mozilla.org"}},
applications: {gecko: {id: "contentscript@tests.mozilla.org"}},
content_scripts: [
{
"matches": ["http://mochi.test/*/file_sample.html"],
toolkit/components/extensions/test/mochitest/test_ext_contentscript_create_iframe.html
+4 -4
View File
@@ -34,14 +34,14 @@ add_task(function* test_contentscript_create_iframe() {
browser.test.assertFalse(hasExtTabsAPI, "the created iframe should not be able to use privileged APIs (tabs)");
browser.test.assertFalse(hasExtWindowsAPI, "the created iframe should not be able to use privileged APIs (windows)");
let {applications: {goanna: {id: expectedManifestGoannaId}}} = chrome.runtime.getManifest();
let {applications: {goanna: {id: actualManifestGoannaId}}} = manifest;
let {applications: {gecko: {id: expectedManifestGoannaId}}} = chrome.runtime.getManifest();
let {applications: {gecko: {id: actualManifestGoannaId}}} = manifest;
browser.test.assertEq(actualManifestGoannaId, expectedManifestGoannaId,
"the add-on manifest should be accessible from the created iframe"
);
let {applications: {goanna: {id: testGetManifestGoannaId}}} = testGetManifest;
let {applications: {gecko: {id: testGetManifestGoannaId}}} = testGetManifest;
browser.test.assertEq(testGetManifestGoannaId, expectedManifestGoannaId,
"GET_MANIFEST() returns manifest data before extension unload"
@@ -84,7 +84,7 @@ add_task(function* test_contentscript_create_iframe() {
const ID = "contentscript@tests.mozilla.org";
let extensionData = {
manifest: {
applications: {goanna: {id: ID}},
applications: {gecko: {id: ID}},
content_scripts: [
{
"matches": ["http://mochi.test/*/file_sample.html"],
toolkit/components/extensions/test/mochitest/test_ext_runtime_id.html
+1 -1
View File
@@ -28,7 +28,7 @@ add_task(function* test_runtime_id() {
let extension = ExtensionTestUtils.loadExtension({
manifest: {
applications: {goanna: {id}},
applications: {gecko: {id}},
"content_scripts": [{
"matches": ["http://mochi.test/*/file_sample.html"],
"run_at": "document_start",
toolkit/components/extensions/test/xpcshell/test_ext_experiments.js
+2 -2
View File
@@ -84,7 +84,7 @@ add_task(function* test_experiments_api() {
let addonFile = Extension.generateXPI({
manifest: {
applications: {goanna: {id: "meh@web.extension"}},
applications: {gecko: {id: "meh@web.extension"}},
permissions: ["experiments.meh"],
},
@@ -104,7 +104,7 @@ add_task(function* test_experiments_api() {
let boringAddonFile = Extension.generateXPI({
manifest: {
applications: {goanna: {id: "boring@web.extension"}},
applications: {gecko: {id: "boring@web.extension"}},
},
background() {
if (browser.meh) {
toolkit/components/extensions/test/xpcshell/test_ext_json_parser.js
+2 -2
View File
@@ -9,7 +9,7 @@ add_task(function* test_json_parser() {
files: {
"manifest.json": String.raw`{
// This is a manifest.
"applications": {"goanna": {"id": "${ID}"}},
"applications": {"gecko": {"id": "${ID}"}},
"name": "This \" is // not a comment",
"version": "0.1\\" // , "description": "This is not a description"
}`,
@@ -17,7 +17,7 @@ add_task(function* test_json_parser() {
});
let expectedManifest = {
"applications": {"goanna": {"id": ID}},
"applications": {"gecko": {"id": ID}},
"name": "This \" is // not a comment",
"version": "0.1\\",
};
toolkit/components/extensions/test/xpcshell/test_ext_legacy_extension_embedding.js
+1 -1
View File
@@ -41,7 +41,7 @@ add_task(function* test_embedded_webextension_utils() {
// loaded from a 'webextension/' directory).
let fakeHybridAddonFile = Extension.generateZipFile({
"webextension/manifest.json": {
applications: {goanna: {id}},
applications: {gecko: {id}},
name: "embedded webextension name",
manifest_version: 2,
version: "1.0",
toolkit/components/extensions/test/xpcshell/test_ext_localStorage.js
+1 -1
View File
@@ -28,7 +28,7 @@ function backgroundScript() {
const ID = "test-webextension@mozilla.com";
let extensionData = {
manifest: {applications: {goanna: {id: ID}}},
manifest: {applications: {gecko: {id: ID}}},
background: backgroundScript,
};
toolkit/components/extensions/test/xpcshell/test_ext_management_uninstall_self.js
+1 -1
View File
@@ -10,7 +10,7 @@ const id = "uninstall_self_test@tests.mozilla.com";
const manifest = {
applications: {
goanna: {
gecko: {
id,
},
},
toolkit/components/extensions/test/xpcshell/test_ext_native_messaging.js
+9 -9
View File
@@ -88,7 +88,7 @@ add_task(function* test_happy_path() {
let extension = ExtensionTestUtils.loadExtension({
background,
manifest: {
applications: {goanna: {id: ID}},
applications: {gecko: {id: ID}},
permissions: ["nativeMessaging"],
},
});
@@ -157,7 +157,7 @@ if (AppConstants.platform == "win") {
let extension = ExtensionTestUtils.loadExtension({
background,
manifest: {
applications: {goanna: {id: ID}},
applications: {gecko: {id: ID}},
permissions: ["nativeMessaging"],
},
});
@@ -197,7 +197,7 @@ add_task(function* test_sendNativeMessage() {
let extension = ExtensionTestUtils.loadExtension({
background,
manifest: {
applications: {goanna: {id: ID}},
applications: {gecko: {id: ID}},
permissions: ["nativeMessaging"],
},
});
@@ -249,7 +249,7 @@ add_task(function* test_disconnect() {
let extension = ExtensionTestUtils.loadExtension({
background,
manifest: {
applications: {goanna: {id: ID}},
applications: {gecko: {id: ID}},
permissions: ["nativeMessaging"],
},
});
@@ -302,7 +302,7 @@ add_task(function* test_write_limit() {
let extension = ExtensionTestUtils.loadExtension({
background,
manifest: {
applications: {goanna: {id: ID}},
applications: {gecko: {id: ID}},
permissions: ["nativeMessaging"],
},
});
@@ -343,7 +343,7 @@ add_task(function* test_read_limit() {
let extension = ExtensionTestUtils.loadExtension({
background,
manifest: {
applications: {goanna: {id: ID}},
applications: {gecko: {id: ID}},
permissions: ["nativeMessaging"],
},
});
@@ -427,7 +427,7 @@ add_task(function* test_child_process() {
let extension = ExtensionTestUtils.loadExtension({
background,
manifest: {
applications: {goanna: {id: ID}},
applications: {gecko: {id: ID}},
permissions: ["nativeMessaging"],
},
});
@@ -459,7 +459,7 @@ add_task(function* test_stderr() {
let extension = ExtensionTestUtils.loadExtension({
background,
manifest: {
applications: {goanna: {id: ID}},
applications: {gecko: {id: ID}},
permissions: ["nativeMessaging"],
},
});
@@ -503,7 +503,7 @@ add_task(function* test_multiple_connects() {
let extension = ExtensionTestUtils.loadExtension({
background,
manifest: {
applications: {goanna: {id: ID}},
applications: {gecko: {id: ID}},
permissions: ["nativeMessaging"],
},
});
toolkit/components/extensions/test/xpcshell/test_ext_native_messaging_perf.js
+1 -1
View File
@@ -108,7 +108,7 @@ add_task(function* test_round_trip_perf() {
});
},
manifest: {
applications: {goanna: {id: ID}},
applications: {gecko: {id: ID}},
permissions: ["nativeMessaging"],
},
});
toolkit/components/extensions/test/xpcshell/test_ext_native_messaging_unresponsive.js
+1 -1
View File
@@ -62,7 +62,7 @@ add_task(function* test_unresponsive_native_app() {
let extension = ExtensionTestUtils.loadExtension({
background,
manifest: {
applications: {goanna: {id: ID}},
applications: {gecko: {id: ID}},
permissions: ["nativeMessaging"],
},
});
toolkit/components/extensions/test/xpcshell/test_ext_runtime_onInstalled_and_onStartup.js
+5 -5
View File
@@ -99,7 +99,7 @@ add_task(function* test_should_fire_on_addon_update() {
manifest: {
"version": "1.0",
"applications": {
"goanna": {
"gecko": {
"id": EXTENSION_ID,
"update_url": `http://localhost:${port}/test_update.json`,
},
@@ -127,7 +127,7 @@ add_task(function* test_should_fire_on_addon_update() {
manifest: {
version: "2.0",
applications: {
goanna: {
gecko: {
id: EXTENSION_ID,
},
},
@@ -188,7 +188,7 @@ add_task(function* test_should_fire_on_browser_update() {
manifest: {
"version": "1.0",
"applications": {
"goanna": {
"gecko": {
"id": EXTENSION_ID,
},
},
@@ -264,7 +264,7 @@ add_task(function* test_should_not_fire_on_reload() {
manifest: {
"version": "1.0",
"applications": {
"goanna": {
"gecko": {
"id": EXTENSION_ID,
},
},
@@ -304,7 +304,7 @@ add_task(function* test_should_not_fire_on_restart() {
manifest: {
"version": "1.0",
"applications": {
"goanna": {
"gecko": {
"id": EXTENSION_ID,
},
},
toolkit/components/extensions/test/xpcshell/test_locale_data.js
+1 -1
View File
@@ -10,7 +10,7 @@ function* generateAddon(data) {
let id = uuidGenerator.generateUUID().number;
data = Object.assign({embedded: true}, data);
data.manifest = Object.assign({applications: {goanna: {id}}}, data.manifest);
data.manifest = Object.assign({applications: {gecko: {id}}}, data.manifest);
let xpi = Extension.generateXPI(data);
do_register_cleanup(() => {
toolkit/mozapps/extensions/internal/AddonTestUtils.jsm
+1 -1
View File
@@ -422,7 +422,7 @@ var AddonTestUtils = {
let manifest = yield body.json();
try {
return manifest.applications.goanna.id;
return manifest.applications.gecko.id;
} catch (e) {
// IDs for WebExtensions are extracted from the certificate when
// not present in the manifest, so just generate a random one.
toolkit/mozapps/extensions/internal/XPIProvider.jsm
+2 -2
View File
@@ -938,8 +938,8 @@ var loadManifestFromWebManifest = Task.async(function*(aUri) {
if (extension.errors.length)
throw new Error("Extension is invalid");
let bss = (manifest.browser_specific_settings && manifest.browser_specific_settings.goanna)
|| (manifest.applications && manifest.applications.goanna) || {};
let bss = (manifest.browser_specific_settings && manifest.browser_specific_settings.gecko)
|| (manifest.applications && manifest.applications.gecko) || {};
if (manifest.browser_specific_settings && manifest.applications) {
logger.warn("Ignoring applications property in manifest");
}
toolkit/mozapps/extensions/test/addons/test_delay_update_complete_webextension_v2/manifest.json
+1 -1
View File
@@ -3,7 +3,7 @@
"name": "Delay Upgrade",
"version": "2.0",
"applications": {
"goanna": {
"gecko": {
"id": "test_delay_update_complete_webext@tests.mozilla.org"
}
}
toolkit/mozapps/extensions/test/addons/test_delay_update_defer_webextension_v2/manifest.json
+1 -1
View File
@@ -3,7 +3,7 @@
"name": "Delay Upgrade",
"version": "2.0",
"applications": {
"goanna": {
"gecko": {
"id": "test_delay_update_defer_webext@tests.mozilla.org"
}
}
toolkit/mozapps/extensions/test/addons/test_delay_update_ignore_webextension_v2/manifest.json
+1 -1
View File
@@ -3,7 +3,7 @@
"name": "Delay Upgrade",
"version": "2.0",
"applications": {
"goanna": {
"gecko": {
"id": "test_delay_update_ignore_webext@tests.mozilla.org"
}
}
toolkit/mozapps/extensions/test/addons/webextension_1/manifest.json
+1 -1
View File
@@ -3,7 +3,7 @@
"version": "1.0",
"manifest_version": 2,
"applications": {
"goanna": {
"gecko": {
"id": "webextension1@tests.mozilla.org"
}
},
toolkit/mozapps/extensions/test/addons/webextension_2/manifest.json
+1 -1
View File
@@ -3,7 +3,7 @@
"version": "1.0",
"manifest_version": 2,
"applications": {
"goanna": {
"gecko": {
"id": "last-webextension2@tests.mozilla.org"
}
}
toolkit/mozapps/extensions/test/addons/webextension_3/manifest.json
+1 -1
View File
@@ -5,7 +5,7 @@
"manifest_version": 2,
"default_locale": "en",
"applications": {
"goanna": {
"gecko": {
"id": "webextension3@tests.mozilla.org"
}
}
toolkit/mozapps/extensions/test/browser/browser_inlinesettings_browser.js
+1 -1
View File
@@ -17,7 +17,7 @@ function installAddon(details) {
if (!details.manifest) {
details.manifest = {};
}
details.manifest.applications = {goanna: {id}};
details.manifest.applications = {gecko: {id}};
let xpi = Extension.generateXPI(details);
return AddonManager.installTemporaryAddon(xpi).then(addon => {
toolkit/mozapps/extensions/test/xpcshell/data/test_update.json
+16 -16
View File
@@ -5,7 +5,7 @@
{
"version": "1.0",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "1",
"strict_min_version": "1"
}
@@ -14,7 +14,7 @@
{
"version": "1.0",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "2",
"strict_min_version": "2"
}
@@ -25,7 +25,7 @@
"update_link": "http://localhost:%PORT%/addons/test_update.xpi",
"update_info_url": "http://example.com/updateInfo.xhtml",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "1",
"strict_min_version": "1"
}
@@ -39,7 +39,7 @@
{
"version": "1.0",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "0",
"advisory_max_version": "1"
}
@@ -53,7 +53,7 @@
{
"version": "1.0",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "0",
"advisory_max_version": "1"
}
@@ -67,7 +67,7 @@
{
"version": "1.0",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "3",
"advisory_max_version": "3"
}
@@ -81,7 +81,7 @@
{
"version": "5.0",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "0",
"advisory_max_version": "0"
}
@@ -95,7 +95,7 @@
{
"version": "1.0",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "0",
"advisory_max_version": "1"
}
@@ -110,7 +110,7 @@
"version": "2.0",
"update_link": "http://localhost:%PORT%/addons/test_update8.xpi",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "1",
"advisory_max_version": "1"
}
@@ -125,7 +125,7 @@
"version": "2.0",
"update_link": "http://localhost:%PORT%/addons/test_update9_2.xpi",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "1",
"advisory_max_version": "1"
}
@@ -136,7 +136,7 @@
"version": "3.0",
"update_link": "http://localhost:%PORT%/addons/test_update9_3.xpi",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "0.9",
"advisory_max_version": "0.9"
}
@@ -147,7 +147,7 @@
"version": "4.0",
"update_link": "http://localhost:%PORT%/addons/test_update9_4.xpi",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "0.9",
"advisory_max_version": "0.9"
}
@@ -158,7 +158,7 @@
"version": "4.0",
"update_link": "http://localhost:%PORT%/addons/test_update9_5.xpi",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "5",
"advisory_max_version": "6"
}
@@ -173,7 +173,7 @@
"version": "1.0",
"update_link": "http://localhost:%PORT%/addons/test_update10.xpi",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "0.1",
"advisory_max_version": "0.4"
}
@@ -188,7 +188,7 @@
"version": "2.0",
"update_link": "http://localhost:%PORT%/addons/test_update11.xpi",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "0.1",
"strict_max_version": "0.2"
}
@@ -203,7 +203,7 @@
"version": "2.0",
"update_link": "http://localhost:%PORT%/addons/test_update12.xpi",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "1",
"advisory_max_version": "1"
}
toolkit/mozapps/extensions/test/xpcshell/data/test_updatecheck.json
+21 -21
View File
@@ -6,7 +6,7 @@
"version": "1.0",
"update_link": "https://localhost:4444/addons/test1.xpi",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "1",
"strict_max_version": "1"
}
@@ -17,7 +17,7 @@
"version": "2.0",
"update_link": "https://localhost:4444/addons/test2.xpi",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "2",
"strict_max_version": "2"
}
@@ -27,7 +27,7 @@
"version": "3.0",
"update_link": "https://localhost:4444/addons/test3.xpi",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "1",
"strict_max_version": "1"
}
@@ -37,7 +37,7 @@
"version": "2.0",
"update_link": "https://localhost:4444/addons/test2.xpi",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "1",
"strict_max_version": "2"
}
@@ -48,7 +48,7 @@
"version": "4.0",
"update_link": "https://localhost:4444/addons/test4.xpi",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "2",
"strict_max_version": "2"
}
@@ -68,7 +68,7 @@
"version": "2.0",
"update_link": "http://localhost:4444/broken.xpi",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "1",
"strict_max_version": "1"
}
@@ -83,7 +83,7 @@
"version": "2.0",
"update_link": "http://localhost:4444/broken.xpi",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "1",
"strict_max_version": "1"
}
@@ -103,7 +103,7 @@
"version": "2.0",
"update_link": "http://localhost:4444/broken.xpi",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "1",
"strict_max_version": "2"
}
@@ -121,7 +121,7 @@
"version": "2.0",
"update_link": "http://localhost:4444/broken.xpi",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "1",
"strict_max_version": "1"
}
@@ -139,7 +139,7 @@
"update_link": "http://localhost:4444/broken.xpi",
"update_hash": "sha256:78fc1d2887eda35b4ad2e3a0b60120ca271ce6e6",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "1",
"strict_max_version": "1"
}
@@ -156,7 +156,7 @@
"version": "2.0",
"update_link": "https://localhost:4444/broken.xpi",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "1",
"strict_max_version": "1"
}
@@ -173,7 +173,7 @@
"version": "2.0",
"update_link": "https://localhost:4444/broken.xpi",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "1",
"strict_max_version": "1"
}
@@ -192,7 +192,7 @@
"update_link": "http://localhost:4444/broken.xpi",
"update_hash": "sha1:78fc1d2887eda35b4ad2e3a0b60120ca271ce6e6",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "1",
"strict_max_version": "1"
}
@@ -211,7 +211,7 @@
"update_link": "https://localhost:4444/broken.xpi",
"update_hash": "sha1:78fc1d2887eda35b4ad2e3a0b60120ca271ce6e6",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "1",
"strict_max_version": "1"
}
@@ -236,7 +236,7 @@
"version": "1.0",
"update_link": "https://localhost:4444/addons/test1.xpi",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "0.1",
"advisory_max_version": "0.2"
}
@@ -246,7 +246,7 @@
"version": "2.0",
"update_link": "https://localhost:4444/addons/test2.xpi",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "0.5",
"advisory_max_version": "0.6"
}
@@ -257,7 +257,7 @@
"version": "3.0",
"update_link": "https://localhost:4444/addons/test3.xpi",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "2",
"advisory_max_version": "3"
}
@@ -275,7 +275,7 @@
"version": "1.0",
"update_link": "https://localhost:4444/addons/test1.xpi",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "0.1",
"advisory_max_version": "0.2"
}
@@ -286,7 +286,7 @@
"version": "2.0",
"update_link": "https://localhost:4444/addons/test2.xpi",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "0.5",
"advisory_max_version": "0.6"
}
@@ -297,7 +297,7 @@
"version": "3.0",
"update_link": "https://localhost:4444/addons/test3.xpi",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "2",
"advisory_max_version": "3"
}
@@ -315,7 +315,7 @@
"update_link": "https://localhost:4444/addons/test1.xpi",
"_comment_": "strictCompatibility: true",
"applications": {
"goanna": {
"gecko": {
"strict_min_version": "0.1",
"strict_max_version": "0.2"
}
toolkit/mozapps/extensions/test/xpcshell/head_addons.js
+1 -1
View File
@@ -747,7 +747,7 @@ function writeInstallRDFForExtension(aData, aDir, aId, aExtraFile) {
* An optional string to override the default installation aId
* @return A file pointing to where the extension was installed
*/
function promiseWriteWebManifestForExtension(aData, aDir, aId = aData.applications.goanna.id) {
function promiseWriteWebManifestForExtension(aData, aDir, aId = aData.applications.gecko.id) {
let files = {
"manifest.json": JSON.stringify(aData),
}
toolkit/mozapps/extensions/test/xpcshell/test_delay_update_webextension.js
+4 -4
View File
@@ -52,7 +52,7 @@ add_task(function* delay_updates_ignore() {
manifest: {
"version": "1.0",
"applications": {
"goanna": {
"gecko": {
"id": IGNORE_ID,
"update_url": `http://localhost:${gPort}/data/test_delay_updates_ignore.json`,
},
@@ -132,7 +132,7 @@ add_task(function* delay_updates_complete() {
manifest: {
"version": "1.0",
"applications": {
"goanna": {
"gecko": {
"id": COMPLETE_ID,
"update_url": `http://localhost:${gPort}/data/test_delay_updates_complete.json`,
},
@@ -196,7 +196,7 @@ add_task(function* delay_updates_defer() {
manifest: {
"version": "1.0",
"applications": {
"goanna": {
"gecko": {
"id": DEFER_ID,
"update_url": `http://localhost:${gPort}/data/test_delay_updates_defer.json`,
},
@@ -293,7 +293,7 @@ add_task(function* runtime_reload() {
manifest: {
"version": "1.0",
"applications": {
"goanna": {
"gecko": {
"id": NOUPDATE_ID,
"update_url": `http://localhost:${gPort}/data/test_no_update.json`,
},
toolkit/mozapps/extensions/test/xpcshell/test_ext_management.js
+4 -4
View File
@@ -23,7 +23,7 @@ add_task(function* test_management_get_self_complete() {
let manifest = {
applications: {
goanna: {
gecko: {
id,
update_url: "https://updates.mozilla.com/",
},
@@ -60,7 +60,7 @@ add_task(function* test_management_get_self_complete() {
equal(extInfo.mayDisable, true, "getSelf returned the expected value for mayDisable");
equal(extInfo.enabled, true, "getSelf returned the expected value for enabled");
equal(extInfo.homepageUrl, manifest.homepage_url, "getSelf returned the expected homepageUrl");
equal(extInfo.updateUrl, manifest.applications.goanna.update_url, "getSelf returned the expected updateUrl");
equal(extInfo.updateUrl, manifest.applications.gecko.update_url, "getSelf returned the expected updateUrl");
ok(extInfo.optionsUrl.endsWith(manifest.options_ui.page), "getSelf returned the expected optionsUrl");
for (let [index, size] of Object.keys(manifest.icons).sort().entries()) {
equal(extInfo.icons[index].size, +size, "getSelf returned the expected icon size");
@@ -77,7 +77,7 @@ add_task(function* test_management_get_self_minimal() {
let manifest = {
applications: {
goanna: {
gecko: {
id,
},
},
@@ -115,7 +115,7 @@ add_task(function* test_management_get_self_permanent() {
let manifest = {
applications: {
goanna: {
gecko: {
id,
},
},
toolkit/mozapps/extensions/test/xpcshell/test_json_updatecheck.js
+7 -7
View File
@@ -103,8 +103,8 @@ add_task(function* test_default_values() {
equal(update.updateInfoURL, null, "updateInfoURL");
// If there's no applications property, we default to using one
// containing "goanna". If there is an applications property, but
// it doesn't contain "goanna", the update is skipped.
// containing "gecko". If there is an applications property, but
// it doesn't contain "gecko", the update is skipped.
updates = yield checkUpdates({
id: "updatecheck-defaults@tests.mozilla.org",
version: "0.1",
@@ -140,7 +140,7 @@ add_task(function* test_explicit_values() {
update_info_url: "https://example.com/update_info.html",
multiprocess_compatible: false,
applications: {
goanna: {
gecko: {
strict_min_version: "42.0a2.xpcshell",
strict_max_version: "43.xpcshell"
}
@@ -220,13 +220,13 @@ add_task(function* test_strict_compat() {
version: "0.1",
updates: [
{ version: "0.2",
applications: { goanna: { strict_max_version: "*" } } },
applications: { gecko: { strict_max_version: "*" } } },
{ version: "0.3",
applications: { goanna: { strict_max_version: "43" } } },
applications: { gecko: { strict_max_version: "43" } } },
{ version: "0.4",
applications: { goanna: { advisory_max_version: "43" } } },
applications: { gecko: { advisory_max_version: "43" } } },
{ version: "0.5",
applications: { goanna: { advisory_max_version: "43",
applications: { gecko: { advisory_max_version: "43",
strict_max_version: "44" } } },
]
});
toolkit/mozapps/extensions/test/xpcshell/test_reload.js
+3 -3
View File
@@ -135,7 +135,7 @@ add_task(function* test_reload_to_invalid_version_fails() {
manifest_version: 2,
version: "1.0",
applications: {
goanna: {
gecko: {
id: addonId,
}
},
@@ -154,8 +154,8 @@ add_task(function* test_reload_to_invalid_version_fails() {
addonDir.remove(true);
// update the manifest to make the add-on version incompatible, so the reload will reject
manifest.applications.goanna.strict_min_version = "1";
manifest.applications.goanna.strict_max_version = "1";
manifest.applications.gecko.strict_min_version = "1";
manifest.applications.gecko.strict_max_version = "1";
manifest.version = "2.0";
addonDir = yield promiseWriteWebManifestForExtension(manifest, tempdir, "invalid_version", false);
toolkit/mozapps/extensions/test/xpcshell/test_temporary.js
+2 -2
View File
@@ -256,7 +256,7 @@ add_task(function*() {
version: "4.0",
name: "Test WebExtension 1 (temporary)",
applications: {
goanna: {
gecko: {
id: ID
}
}
@@ -286,7 +286,7 @@ add_task(function*() {
version: "5.0",
name: "Test WebExtension 1 (temporary)",
applications: {
goanna: {
gecko: {
id: ID
}
}
toolkit/mozapps/extensions/test/xpcshell/test_update_webextensions.js
+7 -7
View File
@@ -63,7 +63,7 @@ var checkUpdates = Task.async(function* (aData, aReason = AddonManager.UPDATE_WH
let id = uuidGenerator.generateUUID().number;
provide(aData, "addon.id", id);
provide(aData, "addon.manifest.applications.goanna.id", id);
provide(aData, "addon.manifest.applications.gecko.id", id);
let updatePath = `/updates/${id}.json`.replace(/[{}]/g, "");
let updateUrl = `http://localhost:${gPort}${updatePath}`
@@ -74,7 +74,7 @@ var checkUpdates = Task.async(function* (aData, aReason = AddonManager.UPDATE_WH
};
provide(aData, "addon.manifest.applications.goanna.update_url", updateUrl);
provide(aData, "addon.manifest.applications.gecko.update_url", updateUrl);
let awaitInstall = promiseInstallWebExtension(aData.addon);
@@ -83,7 +83,7 @@ var checkUpdates = Task.async(function* (aData, aReason = AddonManager.UPDATE_WH
update.version = version;
provide(update, "addon.id", id);
provide(update, "addon.manifest.applications.goanna.id", id);
provide(update, "addon.manifest.applications.gecko.id", id);
let addon = update.addon;
delete update.addon;
@@ -137,12 +137,12 @@ add_task(function* checkUpdateMetadata() {
addon: {
manifest: {
version: "1.0",
applications: { goanna: { strict_max_version: "45" } },
applications: { gecko: { strict_max_version: "45" } },
}
},
updates: {
"1.0": {
applications: { goanna: { strict_min_version: "40",
applications: { gecko: { strict_min_version: "40",
strict_max_version: "48" } },
}
}
@@ -166,7 +166,7 @@ add_task(function* checkUpdateToWebExt() {
updates: {
"1.1": { },
"1.2": { },
"1.3": { "applications": { "goanna": { "strict_min_version": "48" } } },
"1.3": { "applications": { "gecko": { "strict_min_version": "48" } } },
}
});
@@ -228,7 +228,7 @@ add_task(function* checkIllegalUpdateURL() {
for (let url of URLS) {
let { messages } = yield promiseConsoleOutput(() => {
let addonFile = createTempWebExtensionFile({
manifest: { applications: { goanna: { update_url: url } } },
manifest: { applications: { gecko: { update_url: url } } },
});
return AddonManager.getInstallForFile(addonFile).then(install => {
toolkit/mozapps/extensions/test/xpcshell/test_webextension.js
+6 -6
View File
@@ -128,7 +128,7 @@ add_task(function*() {
version: "1.0",
manifest_version: 2,
applications: {
goanna: {
gecko: {
id: ID
}
}
@@ -193,7 +193,7 @@ add_task(function*() {
name: "Web Extension Name",
manifest_version: 2,
applications: {
goanna: {
gecko: {
id: ID
}
}
@@ -217,7 +217,7 @@ add_task(function*() {
version: "1.0",
manifest_version: 1,
applications: {
goanna: {
gecko: {
id: ID
}
}
@@ -264,7 +264,7 @@ add_task(function* test_options_ui() {
const extensionId = "webextension@tests.mozilla.org";
yield promiseInstallWebExtension({
manifest: {
applications: {goanna: {id: extensionId}},
applications: {gecko: {id: extensionId}},
"options_ui": {
"page": "options.html",
},
@@ -283,7 +283,7 @@ add_task(function* test_options_ui() {
const ID2 = "webextension2@tests.mozilla.org";
yield promiseInstallWebExtension({
manifest: {
applications: {goanna: {id: ID2}},
applications: {gecko: {id: ID2}},
"options_ui": {
"page": "options.html",
"open_in_tab": true,
@@ -309,7 +309,7 @@ add_task(function* test_experiments_dependencies() {
let addonFile = createTempWebExtensionFile({
manifest: {
applications: {goanna: {id: "meh@experiment"}},
applications: {gecko: {id: "meh@experiment"}},
"permissions": ["experiments.meh"],
},
});
toolkit/mozapps/extensions/test/xpcshell/test_webextension_icons.js
+3 -3
View File
@@ -31,7 +31,7 @@ add_task(function*() {
version: "1.0",
manifest_version: 2,
applications: {
goanna: {
gecko: {
id: ID
}
},
@@ -95,7 +95,7 @@ add_task(function*() {
version: "1.0",
manifest_version: 2,
applications: {
goanna: {
gecko: {
id: ID
}
},
@@ -141,7 +141,7 @@ add_task(function*() {
version: "1.0",
manifest_version: 2,
applications: {
goanna: {
gecko: {
id: ID
}
}
toolkit/mozapps/extensions/test/xpcshell/test_webextension_install.js
+13 -13
View File
@@ -145,7 +145,7 @@ add_task(function* test_bss_id() {
version: "1.0",
browser_specific_settings: {
goanna: {
gecko: {
id: ID
}
}
@@ -179,13 +179,13 @@ add_task(function* test_two_ids() {
version: "1.0",
applications: {
goanna: {
gecko: {
id: BAD_ID
}
},
browser_specific_settings: {
goanna: {
gecko: {
id: GOOD_ID
}
}
@@ -220,7 +220,7 @@ add_task(function* test_strict_min_max() {
// bad max good min
let apps = {
applications: {
goanna: {
gecko: {
id: addonId,
strict_min_version: "1",
strict_max_version: "1"
@@ -246,7 +246,7 @@ add_task(function* test_strict_min_max() {
// bad min good max
apps = {
applications: {
goanna: {
gecko: {
id: addonId,
strict_min_version: "2",
strict_max_version: "2"
@@ -272,7 +272,7 @@ add_task(function* test_strict_min_max() {
// bad both
apps = {
applications: {
goanna: {
gecko: {
id: addonId,
strict_min_version: "2",
strict_max_version: "1"
@@ -298,7 +298,7 @@ add_task(function* test_strict_min_max() {
// bad only min
apps = {
applications: {
goanna: {
gecko: {
id: addonId,
strict_min_version: "2"
},
@@ -323,7 +323,7 @@ add_task(function* test_strict_min_max() {
// bad only max
apps = {
applications: {
goanna: {
gecko: {
id: addonId,
strict_max_version: "1"
},
@@ -348,7 +348,7 @@ add_task(function* test_strict_min_max() {
// good both
apps = {
applications: {
goanna: {
gecko: {
id: addonId,
strict_min_version: "1",
strict_max_version: "2"
@@ -373,7 +373,7 @@ add_task(function* test_strict_min_max() {
let newId = "strict_min_only@tests.mozilla.org";
apps = {
applications: {
goanna: {
gecko: {
id: newId,
strict_min_version: "1",
},
@@ -398,7 +398,7 @@ add_task(function* test_strict_min_max() {
newId = "strict_max_only@tests.mozilla.org";
apps = {
applications: {
goanna: {
gecko: {
id: newId,
strict_max_version: "2",
},
@@ -424,7 +424,7 @@ add_task(function* test_strict_min_max() {
newId = "strict_min_star@tests.mozilla.org";
let minStarApps = {
applications: {
goanna: {
gecko: {
id: newId,
strict_min_version: version,
},
@@ -451,7 +451,7 @@ add_task(function* test_strict_min_max() {
newId = "checkCompatibility@tests.mozilla.org";
apps = {
applications: {
goanna: {
gecko: {
id: newId,
strict_max_version: "1",
},
toolkit/mozapps/extensions/test/xpcshell/test_webextension_paths.js
+1 -1
View File
@@ -24,7 +24,7 @@ add_task(function* test_bad_unpacked_path() {
version: "1.0",
browser_specific_settings: {
goanna: {
gecko: {
id: MANIFEST_ID
}
}