From 93bab82386140939b0e1127eda222ba48723c6db Mon Sep 17 00:00:00 2001 From: William Durand Date: Tue, 25 Oct 2022 14:46:40 +0000 Subject: [PATCH] Bug 1797050 - Part 1 - Use `browser_specific_settings` instead of `applications` in existing `devtools/` tests. r=rpl,nchevobbe We want to encourage extension developers to use `browser_specific_settings` instead of `applications`, which will be unsupported in Manifest Version 3+. This patch prepares the introduction of a new warning (that is usually converted into an error in the test environment). Differential Revision: https://phabricator.services.mozilla.com/D160057 --- devtools/client/aboutdebugging/test/browser/helper-addons.js | 2 +- .../test/browser_toolbox_toolbar_reorder_with_extension.js | 2 +- .../browser_toolbox_toolbar_reorder_with_hidden_extension.js | 2 +- .../client/shared/remote-debugging/adb/xpcshell/test_adb.js | 12 ++++++------ .../server/tests/xpcshell/test_extension_storage_actor.js | 6 +++--- .../tests/xpcshell/test_extension_storage_actor_upgrade.js | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/devtools/client/aboutdebugging/test/browser/helper-addons.js b/devtools/client/aboutdebugging/test/browser/helper-addons.js index 37f1c18ac1a2..8791fde7b03b 100644 --- a/devtools/client/aboutdebugging/test/browser/helper-addons.js +++ b/devtools/client/aboutdebugging/test/browser/helper-addons.js @@ -86,7 +86,7 @@ function createTemporaryXPI(xpiData) { const manifest = Object.assign( {}, { - applications: { gecko: { id } }, + browser_specific_settings: { gecko: { id } }, manifest_version: 2, name, version: "1.0", diff --git a/devtools/client/framework/test/browser_toolbox_toolbar_reorder_with_extension.js b/devtools/client/framework/test/browser_toolbox_toolbar_reorder_with_extension.js index df0c0e0e8429..de4259cc85dd 100644 --- a/devtools/client/framework/test/browser_toolbox_toolbar_reorder_with_extension.js +++ b/devtools/client/framework/test/browser_toolbox_toolbar_reorder_with_extension.js @@ -31,7 +31,7 @@ add_task(async function() { useAddonManager: "temporary", manifest: { devtools_page: "extension.html", - applications: { + browser_specific_settings: { gecko: { id: EXTENSION }, }, }, diff --git a/devtools/client/framework/test/browser_toolbox_toolbar_reorder_with_hidden_extension.js b/devtools/client/framework/test/browser_toolbox_toolbar_reorder_with_hidden_extension.js index 4d5cea739b50..3b9e155d8961 100644 --- a/devtools/client/framework/test/browser_toolbox_toolbar_reorder_with_hidden_extension.js +++ b/devtools/client/framework/test/browser_toolbox_toolbar_reorder_with_hidden_extension.js @@ -150,7 +150,7 @@ add_task(async function() { useAddonManager: "temporary", manifest: { devtools_page: "extension.html", - applications: { + browser_specific_settings: { gecko: { id: EXTENSION }, }, }, diff --git a/devtools/client/shared/remote-debugging/adb/xpcshell/test_adb.js b/devtools/client/shared/remote-debugging/adb/xpcshell/test_adb.js index 8ac5f6c5d7fb..a140d805a1d8 100644 --- a/devtools/client/shared/remote-debugging/adb/xpcshell/test_adb.js +++ b/devtools/client/shared/remote-debugging/adb/xpcshell/test_adb.js @@ -67,7 +67,7 @@ add_task(async function testNoAdbExtension() { const extension = ExtensionTestUtils.loadExtension({ manifest: { version: (extension_version++).toString(), - applications: { + browser_specific_settings: { gecko: { id: "not-adb@mozilla.org" }, }, }, @@ -85,7 +85,7 @@ add_task(async function testNoAdbJSON() { const extension = ExtensionTestUtils.loadExtension({ manifest: { version: (extension_version++).toString(), - applications: { + browser_specific_settings: { // The extension id here and in later test cases should match the // corresponding prefrece value. gecko: { id: "adb@mozilla.org" }, @@ -105,7 +105,7 @@ add_task(async function testNoTargetBinaries() { const extension = ExtensionTestUtils.loadExtension({ manifest: { version: (extension_version++).toString(), - applications: { + browser_specific_settings: { gecko: { id: "adb@mozilla.org" }, }, }, @@ -126,7 +126,7 @@ add_task(async function testExtract() { const extension = ExtensionTestUtils.loadExtension({ manifest: { version: (extension_version++).toString(), - applications: { + browser_specific_settings: { gecko: { id: "adb@mozilla.org" }, }, }, @@ -157,7 +157,7 @@ add_task( const extension = ExtensionTestUtils.loadExtension({ manifest: { version: (extension_version++).toString(), - applications: { + browser_specific_settings: { gecko: { id: "adb@mozilla.org" }, }, }, @@ -205,7 +205,7 @@ add_task( const extension = ExtensionTestUtils.loadExtension({ manifest: { version: (extension_version++).toString(), - applications: { + browser_specific_settings: { gecko: { id: "adb@mozilla.org" }, }, }, diff --git a/devtools/server/tests/xpcshell/test_extension_storage_actor.js b/devtools/server/tests/xpcshell/test_extension_storage_actor.js index e6b498abe3a5..c238d99e110a 100644 --- a/devtools/server/tests/xpcshell/test_extension_storage_actor.js +++ b/devtools/server/tests/xpcshell/test_extension_storage_actor.js @@ -846,7 +846,7 @@ add_task(async function test_panel_live_reload_for_extension_without_bg_page() { const EXTENSION_ID = "test_local_storage_live_reload@xpcshell.mozilla.org"; let manifest = { version: "1.0", - applications: { + browser_specific_settings: { gecko: { id: EXTENSION_ID, }, @@ -930,7 +930,7 @@ add_task( const EXTENSION_ID = "test_local_storage_live_reload@xpcshell.mozilla.org"; let manifest = { version: "1.0", - applications: { + browser_specific_settings: { gecko: { id: EXTENSION_ID, }, @@ -1009,7 +1009,7 @@ add_task( const EXTENSION_ID = "test_panel_data_only_updates_for_storage_local_changes@xpcshell.mozilla.org"; const manifest = { - applications: { + browser_specific_settings: { gecko: { id: EXTENSION_ID, }, diff --git a/devtools/server/tests/xpcshell/test_extension_storage_actor_upgrade.js b/devtools/server/tests/xpcshell/test_extension_storage_actor_upgrade.js index fbe87e12d977..75d661e06259 100644 --- a/devtools/server/tests/xpcshell/test_extension_storage_actor_upgrade.js +++ b/devtools/server/tests/xpcshell/test_extension_storage_actor_upgrade.js @@ -67,7 +67,7 @@ add_task(async function test_panel_live_reload() { const EXTENSION_ID = "test_panel_live_reload@xpcshell.mozilla.org"; let manifest = { version: "1.0", - applications: { + browser_specific_settings: { gecko: { id: EXTENSION_ID, }, -- 2.11.4.GIT