Bug 1551490 - Disable HTML about:addons on legacy XUL about:addons tests. r=kmag,rpl, a=test-only
authorLuca Greco <lgreco@mozilla.com>
Sat, 08 Jun 2019 16:03:59 +0000
changeset 536900 9688b1081c1db3d73d08418b2e78508ec7778d03
parent 536899 fd69d7d0f0d080ffe71b6539b95103c106a28fb0
child 536901 09a47b7d1716348806063aa220db1bf8b50b096c
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)
reviewerskmag, rpl, test-only
bugs1551490
milestone68.0
Bug 1551490 - Disable HTML about:addons on legacy XUL about:addons tests. r=kmag,rpl, a=test-only Depends on D31782 Differential Revision: https://phabricator.services.mozilla.com/D31789
toolkit/mozapps/extensions/test/browser/browser_bug562890.js
toolkit/mozapps/extensions/test/browser/browser_bug562899.js
toolkit/mozapps/extensions/test/browser/browser_bug562992.js
toolkit/mozapps/extensions/test/browser/browser_bug580298.js
toolkit/mozapps/extensions/test/browser/browser_bug587970.js
toolkit/mozapps/extensions/test/browser/browser_bug590347.js
toolkit/mozapps/extensions/test/browser/browser_bug591663.js
toolkit/mozapps/extensions/test/browser/browser_bug618502.js
toolkit/mozapps/extensions/test/browser/browser_details.js
toolkit/mozapps/extensions/test/browser/browser_discovery.js
toolkit/mozapps/extensions/test/browser/browser_discovery_clientid.js
toolkit/mozapps/extensions/test/browser/browser_globalwarnings.js
toolkit/mozapps/extensions/test/browser/browser_langpack_signing.js
toolkit/mozapps/extensions/test/browser/browser_legacy.js
toolkit/mozapps/extensions/test/browser/browser_legacy_pre57.js
toolkit/mozapps/extensions/test/browser/browser_list.js
toolkit/mozapps/extensions/test/browser/browser_manualupdates.js
toolkit/mozapps/extensions/test/browser/browser_plugin_enabled_state_locked.js
toolkit/mozapps/extensions/test/browser/browser_pluginprefs.js
toolkit/mozapps/extensions/test/browser/browser_sorting.js
toolkit/mozapps/extensions/test/browser/browser_sorting_plugins.js
toolkit/mozapps/extensions/test/browser/browser_tabsettings.js
toolkit/mozapps/extensions/test/browser/browser_theme_previews.js
toolkit/mozapps/extensions/test/browser/browser_types.js
toolkit/mozapps/extensions/test/browser/browser_uninstalling.js
--- a/toolkit/mozapps/extensions/test/browser/browser_bug562890.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_bug562890.js
@@ -1,16 +1,22 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 /**
  * Tests the Preferences button for addons in list view
  */
 
+// This test is testing XUL about:addons UI (the HTML about:addons has its
+// own test files for these test cases).
+SpecialPowers.pushPrefEnv({
+  set: [["extensions.htmlaboutaddons.enabled", false]],
+});
+
 async function test() {
   requestLongerTimeout(2);
 
   waitForExplicitFinish();
 
   var addonPrefsURI = CHROMEROOT + "addon_prefs.xul";
 
   var gProvider = new MockProvider();
--- a/toolkit/mozapps/extensions/test/browser/browser_bug562899.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_bug562899.js
@@ -7,16 +7,22 @@
 
 const {PromiseTestUtils} = ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm");
 
 PromiseTestUtils.whitelistRejectionsGlobally(/this\._errorLink/);
 
 var gManagerWindow;
 var gCategoryUtilities;
 
+// This test is testing XUL about:addons UI (the HTML about:addons has its
+// own test files and these test cases should be added in Bug 1552170).
+SpecialPowers.pushPrefEnv({
+  set: [["extensions.htmlaboutaddons.enabled", false]],
+});
+
 async function test() {
   waitForExplicitFinish();
 
   let aWindow = await open_manager(null);
   gManagerWindow = aWindow;
   gCategoryUtilities = new CategoryUtilities(gManagerWindow);
   run_next_test();
 }
--- a/toolkit/mozapps/extensions/test/browser/browser_bug562992.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_bug562992.js
@@ -11,16 +11,22 @@
  */
 
 var gManagerWindow;
 var gProvider;
 var gInstall;
 
 const EXTENSION_NAME = "Wunderbar";
 
+// This test is testing XUL about:addons UI (the HTML about:addons has its
+// own test files for these test cases).
+SpecialPowers.pushPrefEnv({
+  set: [["extensions.htmlaboutaddons.enabled", false]],
+});
+
 async function test() {
   waitForExplicitFinish();
 
   gProvider = new MockProvider();
 
   let aWindow = await open_manager("addons://list/extension");
   gManagerWindow = aWindow;
   run_next_test();
--- a/toolkit/mozapps/extensions/test/browser/browser_bug580298.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_bug580298.js
@@ -4,16 +4,22 @@
 
 // Tests that certain types of addons do not have their version number
 // displayed. This currently only includes lightweight themes.
 
 var gManagerWindow;
 var gCategoryUtilities;
 var gProvider;
 
+// This test is testing XUL about:addons UI (and the HTML about:addons
+// actually shows the version also on themes).
+SpecialPowers.pushPrefEnv({
+  set: [["extensions.htmlaboutaddons.enabled", false]],
+});
+
 add_task(async function test() {
   gProvider = new MockProvider();
 
   gProvider.createAddons([{
     id: "extension@tests.mozilla.org",
     name: "Extension 1",
     type: "extension",
     version: "123",
--- a/toolkit/mozapps/extensions/test/browser/browser_bug587970.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_bug587970.js
@@ -3,16 +3,23 @@
  */
 /* eslint-disable mozilla/no-arbitrary-setTimeout */
 
 // Bug 587970 - Provide ability "Update all now" within 'Available Updates' screen
 
 var gManagerWindow;
 var gProvider;
 
+// This test is testing XUL about:addons UI (the HTML about:addons has its
+// own test files for these test cases, "Update all now" has been deprecated
+// and not supported in HTML about:addons).
+SpecialPowers.pushPrefEnv({
+  set: [["extensions.htmlaboutaddons.enabled", false]],
+});
+
 async function test() {
   waitForExplicitFinish();
 
   gProvider = new MockProvider();
 
   gProvider.createAddons([{
     id: "addon1@tests.mozilla.org",
     name: "addon 1",
--- a/toolkit/mozapps/extensions/test/browser/browser_bug590347.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_bug590347.js
@@ -8,16 +8,21 @@
 
 var gProvider;
 var gManagerWindow;
 var gCategoryUtilities;
 
 var gApp = document.getElementById("bundle_brand").getString("brandShortName");
 var gVersion = Services.appinfo.version;
 
+// Not implemented in HTML about:addons (Bug 1544950)
+SpecialPowers.pushPrefEnv({
+  set: [["extensions.htmlaboutaddons.enabled", false]],
+});
+
 // Opens the details view of an add-on
 async function open_details(aId, aType, aCallback) {
   requestLongerTimeout(2);
 
   await gCategoryUtilities.openType(aType);
   var list = gManagerWindow.document.getElementById("addon-list");
   var item = list.firstChild;
   while (item) {
--- a/toolkit/mozapps/extensions/test/browser/browser_bug591663.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_bug591663.js
@@ -25,16 +25,21 @@ var gAddonProperties = {
   name: "Bug 591663 Mock Add-on",
   type: "mock-addon",
 };
 var gExtensionProperties = {
   name: "Bug 591663 Extension Install",
   type: "extension",
 };
 
+// Not implemented yet on HTML about:addons (Bug 1550911).
+SpecialPowers.pushPrefEnv({
+  set: [["extensions.htmlaboutaddons.enabled", false]],
+});
+
 async function test() {
   waitForExplicitFinish();
 
   gProvider = new MockProvider(true, [{
     id: "mock-addon",
     name: "Mock Add-ons",
     uiPriority: 4500,
     flags: AddonManager.TYPE_UI_VIEW_LIST,
--- a/toolkit/mozapps/extensions/test/browser/browser_bug618502.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_bug618502.js
@@ -2,16 +2,22 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 // Bug 608316 - Test that opening the manager to an add-on that doesn't exist
 // just loads the default view
 
 var gCategoryUtilities;
 
+// Not implemented yet on HTML about:addons (Bug 1552184), once supported
+// this test case will be included in the HTML about:addons test files.
+SpecialPowers.pushPrefEnv({
+  set: [["extensions.htmlaboutaddons.enabled", false]],
+});
+
 function test() {
   waitForExplicitFinish();
 
   run_next_test();
 }
 
 function end_test() {
   finish();
--- a/toolkit/mozapps/extensions/test/browser/browser_details.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_details.js
@@ -12,16 +12,24 @@ var gManagerWindow;
 var gCategoryUtilities;
 var gProvider;
 
 var gApp = document.getElementById("bundle_brand").getString("brandShortName");
 var gVersion = Services.appinfo.version;
 var gDate = new Date(2010, 7, 1);
 var infoURL = Services.urlFormatter.formatURLPref("app.support.baseURL") + "unsigned-addons";
 
+// This test is testing XUL about:addons UI (the HTML about:addons has its
+// own test files for these test cases).
+SpecialPowers.pushPrefEnv({
+  set: [
+    ["extensions.htmlaboutaddons.enabled", false],
+  ],
+});
+
 async function open_details(aId, aType, aCallback) {
   requestLongerTimeout(2);
 
   await gCategoryUtilities.openType(aType);
   var list = gManagerWindow.document.getElementById("addon-list");
   var item = list.firstChild;
   while (item) {
     if ("mAddon" in item && item.mAddon.id == aId) {
@@ -157,17 +165,16 @@ async function test() {
 
 async function end_test() {
   await close_manager(gManagerWindow);
   finish();
 }
 
 // Opens and tests the details view for add-on 2
 add_test(async function() {
-  await SpecialPowers.pushPrefEnv({set: [["extensions.allowPrivateBrowsingByDefault", false]]});
   open_details("addon2@tests.mozilla.org", "extension", async () => {
     is(get("detail-name").textContent, "Test add-on 2", "Name should be correct");
     is_element_visible(get("detail-version"), "Version should not be hidden");
     is(get("detail-version").value, "2.2", "Version should be correct");
     is(get("detail-icon").src, "chrome://foo/skin/icon.png", "Icon should be correct");
 
     is_element_visible(get("detail-creator"), "Creator should not be hidden");
     is_element_visible(get("detail-creator")._creatorName, "Creator name should not be hidden");
@@ -199,38 +206,35 @@ add_test(async function() {
     is_element_hidden(get("detail-uninstall-btn"), "Remove button should be hidden");
 
     is_element_hidden(get("detail-warning"), "Warning message should be hidden");
     is_element_hidden(get("detail-warning-link"), "Warning link should be hidden");
     is_element_hidden(get("detail-error"), "Error message should be hidden");
     is_element_hidden(get("detail-error-link"), "Error link should be hidden");
     is_element_hidden(get("detail-pending"), "Pending message should be hidden");
 
-    await SpecialPowers.popPrefEnv();
     run_next_test();
   });
 });
 
 
 // Opens and tests the details view for add-on theme
 add_test(async function() {
   // This is a duplicate of addon-2, so we're only testing that private browsing is
   // not visible.
-  await SpecialPowers.pushPrefEnv({set: [["extensions.allowPrivateBrowsingByDefault", false]]});
   open_details("addon-theme@tests.mozilla.org", "theme", async () => {
     is(get("detail-name").textContent, "Test add-on theme", "Name should be correct");
     is_element_visible(get("detail-version"), "Version should not be hidden");
     is(get("detail-version").value, "2.3", "Version should be correct");
     is(get("detail-icon").src, "chrome://foo/skin/icon.png", "Icon should be correct");
 
     is_element_hidden(get("detail-privateBrowsing-row"), "Private browsing should be hidden");
     is_element_hidden(get("detail-privateBrowsing-row-footer"), "Private browsing footer should be hidden");
     is(get("detail-privateBrowsing").value, "0", "Private browsing should be off");
 
-    await SpecialPowers.popPrefEnv();
     run_next_test();
   });
 });
 
 // Opens and tests the details view for add-on 3
 add_test(function() {
   open_details("addon3@tests.mozilla.org", "extension", function() {
     is(get("detail-name").textContent, "Test add-on 3", "Name should be correct");
--- a/toolkit/mozapps/extensions/test/browser/browser_discovery.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_discovery.js
@@ -7,16 +7,24 @@
 const MAIN_URL = "https://example.com/" + RELATIVE_DIR + "discovery.html";
 
 var gManagerWindow;
 var gCategoryUtilities;
 var gProvider;
 
 var gLoadCompleteCallback = null;
 
+// This test file is testing the old XUL disco pane.
+SpecialPowers.pushPrefEnv({
+  set: [
+    ["extensions.htmlaboutaddons.enabled", false],
+    ["extensions.htmlaboutaddons.discover.enabled", false],
+  ],
+});
+
 var gProgressListener = {
   onStateChange(aWebProgress, aRequest, aStateFlags, aStatus) {
     // Only care about the network stop status events
     if (!(aStateFlags & (Ci.nsIWebProgressListener.STATE_IS_NETWORK)) ||
         !(aStateFlags & (Ci.nsIWebProgressListener.STATE_STOP)))
       return;
 
     if (gLoadCompleteCallback)
--- a/toolkit/mozapps/extensions/test/browser/browser_discovery_clientid.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_discovery_clientid.js
@@ -1,14 +1,23 @@
 "use strict";
 
 const {ClientID} = ChromeUtils.import("resource://gre/modules/ClientID.jsm");
 
 const MAIN_URL = "https://example.com/" + RELATIVE_DIR + "discovery.html";
 
+// This test is testing XUL about:addons UI (the HTML about:addons is tested in
+// browser_html_discover_view_clientid.js).
+SpecialPowers.pushPrefEnv({
+  set: [
+    ["extensions.htmlaboutaddons.discover.enabled", false],
+    ["extensions.htmlaboutaddons.enabled", false],
+  ],
+});
+
 function waitForHeader() {
   return new Promise(resolve => {
     let observer = (subject, topic, state) => {
       let channel = subject.QueryInterface(Ci.nsIHttpChannel);
       if (channel.URI.spec != MAIN_URL) {
         return;
       }
       try {
--- a/toolkit/mozapps/extensions/test/browser/browser_globalwarnings.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_globalwarnings.js
@@ -1,14 +1,20 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 // Bug 566194 - safe mode / security & compatibility check status are not exposed in new addon manager UI
 
+// Not yet supported by HTML about:addons (tracked by Bug 1544950), once implemented by the
+// HTML about:addons it will be tested in a separate test file.
+SpecialPowers.pushPrefEnv({
+  set: [["extensions.htmlaboutaddons.enabled", false]],
+});
+
 function test() {
   waitForExplicitFinish();
   run_next_test();
 }
 
 function end_test() {
   finish();
 }
--- a/toolkit/mozapps/extensions/test/browser/browser_langpack_signing.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_langpack_signing.js
@@ -1,8 +1,17 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+// This test is testing a warning message that is not yet supported
+// by the HTML about:addons views (tracked by Bug 1544950).
+SpecialPowers.pushPrefEnv({
+  set: [["extensions.htmlaboutaddons.enabled", false]],
+});
 
 // Tests that signed and unsigned language packs show up correctly in
 // the Languages tab based on the langpack signing preference.
 add_task(async function() {
   const PREF = "extensions.langpacks.signatures.required";
 
   await SpecialPowers.pushPrefEnv({
     set: [[PREF, false]],
--- a/toolkit/mozapps/extensions/test/browser/browser_legacy.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_legacy.js
@@ -1,8 +1,13 @@
+// This test is testing the view with legacy add-ons in the XUL about:addons UI.
+// This is not implemented in HTML about:addons, but might be in bug 1525184.
+SpecialPowers.pushPrefEnv({
+  set: [["extensions.htmlaboutaddons.enabled", false]],
+});
 
 add_task(async function() {
   const INFO_URL = Services.urlFormatter.formatURLPref("app.support.baseURL") + "webextensions";
 
   // The mochitest framework installs a bunch of legacy extensions.
   // Fortunately, the extensions.legacy.exceptions preference exists to
   // avoid treating some extensions as legacy for the purposes of the UI.
   const IGNORE = [
--- a/toolkit/mozapps/extensions/test/browser/browser_legacy_pre57.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_legacy_pre57.js
@@ -1,8 +1,17 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+// This test is testing XUL about:addons UI not implemented in the HTML about:addons,
+// it may be adapted or tested in a separate test file in Bug 1525184.
+SpecialPowers.pushPrefEnv({
+  set: [["extensions.htmlaboutaddons.enabled", false]],
+});
 
 add_task(async function() {
   const INFO_URL = Services.urlFormatter.formatURLPref("app.support.baseURL") + "webextensions";
 
   const NAMES = {
     newTheme: "New LWT",
     legacy: "Legacy Extension",
     webextension: "WebExtension",
--- a/toolkit/mozapps/extensions/test/browser/browser_list.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_list.js
@@ -16,16 +16,22 @@ var gCategoryUtilities;
 
 var gApp = document.getElementById("bundle_brand").getString("brandShortName");
 var gVersion = Services.appinfo.version;
 var gDate = new Date(2010, 7, 16);
 var infoURL = Services.urlFormatter.formatURLPref("app.support.baseURL") + "unsigned-addons";
 
 const EXPECTED_ADDONS = 11;
 
+// This test is testing XUL about:addons UI (the HTML about:addons has its
+// own test files for these test cases).
+SpecialPowers.pushPrefEnv({
+  set: [["extensions.htmlaboutaddons.enabled", false]],
+});
+
 add_task(async function() {
   gProvider = new MockProvider();
 
   gProvider.createAddons([{
     id: "addon1@tests.mozilla.org",
     name: "Test add-on",
     version: "1.0",
     description: "A test add-on",
--- a/toolkit/mozapps/extensions/test/browser/browser_manualupdates.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_manualupdates.js
@@ -4,16 +4,22 @@
 
 // Tests manual updates, including the Available Updates pane
 
 var gProvider;
 var gManagerWindow;
 var gCategoryUtilities;
 var gAvailableCategory;
 
+// This test is testing XUL about:addons UI (the HTML about:addons has its
+// own test files for these test cases).
+SpecialPowers.pushPrefEnv({
+  set: [["extensions.htmlaboutaddons.enabled", false]],
+});
+
 async function test() {
   waitForExplicitFinish();
 
   gProvider = new MockProvider();
 
   gProvider.createAddons([{
     id: "addon1@tests.mozilla.org",
     name: "auto updating addon",
--- a/toolkit/mozapps/extensions/test/browser/browser_plugin_enabled_state_locked.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_plugin_enabled_state_locked.js
@@ -16,16 +16,22 @@ function getTestPluginPref() {
   let prefix = "plugin.state.";
   if (gIsWindows)
     return `${prefix}nptest`;
   if (gIsLinux)
     return `${prefix}libnptest`;
   return `${prefix}test`;
 }
 
+// This test is testing XUL about:addons UI (the HTML about:addons tests should verify
+// this in their own test files).
+SpecialPowers.pushPrefEnv({
+  set: [["extensions.htmlaboutaddons.enabled", false]],
+});
+
 registerCleanupFunction(() => {
   Services.prefs.unlockPref(getTestPluginPref());
   Services.prefs.clearUserPref(getTestPluginPref());
 });
 
 function getPlugins() {
   return AddonManager.getAddonsByTypes(["plugin"]);
 }
--- a/toolkit/mozapps/extensions/test/browser/browser_pluginprefs.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_pluginprefs.js
@@ -1,14 +1,21 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 // Tests the detail view of plugins
 
+// This test is testing plugin preferences in the XUL about:addons UI, the HTML about:addons
+// doesn't yet supported (tracked by Bug 1552537) and this test cases will be part of the
+// HTML about:addons test files.
+SpecialPowers.pushPrefEnv({
+  set: [["extensions.htmlaboutaddons.enabled", false]],
+});
+
 var gManagerWindow;
 
 async function test() {
   waitForExplicitFinish();
 
   let aWindow = await open_manager("addons://list/plugin");
   gManagerWindow = aWindow;
 
--- a/toolkit/mozapps/extensions/test/browser/browser_sorting.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_sorting.js
@@ -3,16 +3,22 @@
  */
 
 // Tests that sorting of add-ons works correctly
 // (this test uses the list view, even though it no longer has sort buttons - see bug 623207)
 
 var gManagerWindow;
 var gProvider;
 
+// This test is testing XUL about:addons UI features that are not supported in the
+// HTML about:addons.
+SpecialPowers.pushPrefEnv({
+  set: [["extensions.htmlaboutaddons.enabled", false]],
+});
+
 async function test() {
   waitForExplicitFinish();
 
   gProvider = new MockProvider();
   gProvider.createAddons([{
     //  enabledInstalled group
     //    * Enabled
     //    * Incompatible but enabled because compatibility checking is off
--- a/toolkit/mozapps/extensions/test/browser/browser_sorting_plugins.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_sorting_plugins.js
@@ -4,16 +4,22 @@
 
 // Tests that sorting of plugins works correctly
 // (this test checks that plugins with "ask to activate" state appear after those with
 //  "always activate" and before those with "never activate")
 
 var gManagerWindow;
 var gProvider;
 
+// This test is testing XUL about:addons UI features that are not supported in the
+// HTML about:addons.
+SpecialPowers.pushPrefEnv({
+  set: [["extensions.htmlaboutaddons.enabled", false]],
+});
+
 async function test() {
   waitForExplicitFinish();
 
   gProvider = new MockProvider();
   gProvider.createAddons([{
     //  enabledInstalled group
     //    * Always activate
     //    * Ask to activate
--- a/toolkit/mozapps/extensions/test/browser/browser_tabsettings.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_tabsettings.js
@@ -2,16 +2,22 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 // Tests various aspects of the details view
 
 var gManagerWindow;
 var gProvider;
 
+// This test is testing XUL about:addons UI (the HTML about:addons has its
+// own test files for these test cases).
+SpecialPowers.pushPrefEnv({
+  set: [["extensions.htmlaboutaddons.enabled", false]],
+});
+
 async function test() {
   waitForExplicitFinish();
 
   gProvider = new MockProvider();
 
   gProvider.createAddons([{
     id: "tabsettings@tests.mozilla.org",
     name: "Tab Settings",
--- a/toolkit/mozapps/extensions/test/browser/browser_theme_previews.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_theme_previews.js
@@ -1,13 +1,21 @@
 const {AddonTestUtils} = ChromeUtils.import("resource://testing-common/AddonTestUtils.jsm");
 
 let gManagerWindow;
 let gCategoryUtilities;
 
+// This test is testing the theme list at XUL about:addons. HTML about:addons's
+// theme list is already tested in browser_html_list_view.js.
+// The testThemeOrdering part of this test should be adapted when bug 1557768
+// is fixed.
+SpecialPowers.pushPrefEnv({
+  set: [["extensions.htmlaboutaddons.enabled", false]],
+});
+
 registerCleanupFunction(() => {
   // AddonTestUtils with open_manager cause this reference to be maintained and creates a leak.
   gManagerWindow = null;
 });
 
 function imageBufferFromDataURI(encodedImageData) {
   let decodedImageData = atob(encodedImageData);
   return Uint8Array.from(decodedImageData, byte => byte.charCodeAt(0)).buffer;
--- a/toolkit/mozapps/extensions/test/browser/browser_types.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_types.js
@@ -20,16 +20,22 @@ var gTypes = [
   {
     id: "type3",
     name: "Type 3",
     uiPriority: 5200,
     viewType: AddonManager.VIEW_TYPE_LIST,
   },
 ];
 
+// This test is testing XUL about:addons UI features that are not supported in the
+// HTML about:addons.
+SpecialPowers.pushPrefEnv({
+  set: [["extensions.htmlaboutaddons.enabled", false]],
+});
+
 function go_back(aManager) {
   gBrowser.goBack();
 }
 
 function go_forward(aManager) {
   gBrowser.goForward();
 }
 
--- a/toolkit/mozapps/extensions/test/browser/browser_uninstalling.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_uninstalling.js
@@ -2,16 +2,22 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 var gManagerWindow;
 var gDocument;
 var gCategoryUtilities;
 var gProvider;
 
+// This test is testing XUL about:addons UI (the HTML about:addons has its
+// own test files for these test cases).
+SpecialPowers.pushPrefEnv({
+  set: [["extensions.htmlaboutaddons.enabled", false]],
+});
+
 async function setup_manager(...args) {
   let aWindow = await open_manager(...args);
   gManagerWindow = aWindow;
   gDocument = gManagerWindow.document;
   gCategoryUtilities = new CategoryUtilities(gManagerWindow);
 }
 
 async function test() {