Merge branch 'ext-work'

1 files changed, 32 insertions, 0 deletions

diff --git a/toolkit/mozapps/webextensions/test/xpinstall/browser_enabled2.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_enabled2.js
new file mode 100644
index 000000000..cc1b8a8b2
--- /dev/null
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_enabled2.js
@@ -0,0 +1,32 @@
+// ----------------------------------------------------------------------------
+// Test whether an InstallTrigger.enabled is working
+function test() {
+  waitForExplicitFinish();
+
+  Services.prefs.setBoolPref("xpinstall.enabled", false);
+
+  gBrowser.selectedTab = gBrowser.addTab();
+
+  ContentTask.spawn(gBrowser.selectedBrowser, TESTROOT + "enabled.html", function (url) {
+    return new Promise(resolve => {
+      function page_loaded() {
+        content.removeEventListener("PageLoaded", page_loaded, false);
+        resolve(content.document.getElementById("enabled").textContent);
+      }
+
+      function load_listener() {
+        removeEventListener("load", load_listener, true);
+        content.addEventListener("PageLoaded", page_loaded, false);
+      }
+
+      addEventListener("load", load_listener, true);
+
+      content.location.href = url;
+    });
+  }).then(text => {
+    is(text, "false", "installTrigger should have not been enabled");
+    Services.prefs.clearUserPref("xpinstall.enabled");
+    gBrowser.removeCurrentTab();
+    finish();
+  });
+}