Merge branch 'ext-work'

1 files changed, 38 insertions, 0 deletions

diff --git a/toolkit/mozapps/webextensions/test/xpinstall/browser_localfile2.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_localfile2.js
new file mode 100644
index 000000000..b0e3ffc42
--- /dev/null
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_localfile2.js
@@ -0,0 +1,38 @@
+// ----------------------------------------------------------------------------
+// Test whether an install fails if the url is a local file when requested from
+// web content
+add_task(function* test() {
+  var cr = Components.classes["@mozilla.org/chrome/chrome-registry;1"]
+                     .getService(Components.interfaces.nsIChromeRegistry);
+
+  var chromeroot = getChromeRoot(gTestPath);
+  var xpipath = chromeroot + "amosigned.xpi";
+  try {
+    xpipath = cr.convertChromeURL(makeURI(xpipath)).spec;
+  } catch (ex) {
+    // scenario where we are running from a .jar and already extracted
+  }
+
+  var triggers = encodeURIComponent(JSON.stringify({
+    "Unsigned XPI": xpipath
+  }));
+
+  // In non-e10s the exception in the content page would trigger a test failure
+  if (!gMultiProcessBrowser)
+    expectUncaughtException();
+
+  let URI = TESTROOT + "installtrigger.html?" + triggers;
+  yield BrowserTestUtils.withNewTab({ gBrowser, url: "about:blank" }, function* (browser) {
+    yield ContentTask.spawn(browser, URI, function* (URI) {
+      content.location.href = URI;
+
+      let loaded = ContentTaskUtils.waitForEvent(this, "load", true);
+      let installTriggered = ContentTaskUtils.waitForEvent(this, "InstallTriggered", true, null, true);
+      yield Promise.all([ loaded, installTriggered ]);
+
+      let doc = content.document;
+      is(doc.getElementById("return").textContent, "exception", "installTrigger should have failed");
+    });
+  });
+});
+// ----------------------------------------------------------------------------