Bug 1287007 - Fix test_ext_api_permissions.js r=billm
authorRob Wu <rob@robwu.nl>
Wed, 07 Sep 2016 17:10:33 -0700
changeset 428712 e3514b399ec46ced8c47c24ed69d15b9cac9c591
parent 428711 6b9a398be651f28216e4693a6151776d73f44156
child 428713 f9da44ff592d2a570c2f501b9e8588351d105aee
push id33405
push userbcampen@mozilla.com
push dateMon, 24 Oct 2016 15:32:53 +0000
reviewersbillm
bugs1287007
milestone52.0a1
Bug 1287007 - Fix test_ext_api_permissions.js r=billm "extension.views" will only be available in content, so use the "proxy-context-load" event to detect new views. MozReview-Commit-ID: K86Be5IDk42
toolkit/components/extensions/test/xpcshell/test_ext_api_permissions.js
--- a/toolkit/components/extensions/test/xpcshell/test_ext_api_permissions.js
+++ b/toolkit/components/extensions/test/xpcshell/test_ext_api_permissions.js
@@ -1,41 +1,53 @@
 /* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
 /* vim: set sts=2 sw=2 et tw=80: */
 "use strict";
 
+let {Management} = Cu.import("resource://gre/modules/Extension.jsm", {});
+function getNextContext() {
+  return new Promise(resolve => {
+    Management.on("proxy-context-load", function listener(type, context) {
+      Management.off("proxy-context-load", listener);
+      resolve(context);
+    });
+  });
+}
+
 add_task(function* test_storage_api_without_permissions() {
   let extension = ExtensionTestUtils.loadExtension({
     background() {},
 
     manifest: {
       permissions: [],
     },
   });
 
+  let contextPromise = getNextContext();
   yield extension.startup();
 
-  let context = Array.from(extension.extension.views)[0];
+  let context = yield contextPromise;
 
   ok(!("storage" in context._unwrappedAPIs),
      "The storage API should not be initialized");
 
   yield extension.unload();
 });
 
 add_task(function* test_storage_api_with_permissions() {
   let extension = ExtensionTestUtils.loadExtension({
     background() {},
 
     manifest: {
       permissions: ["storage"],
     },
   });
 
+  let contextPromise = getNextContext();
   yield extension.startup();
 
-  let context = Array.from(extension.extension.views)[0];
+  let context = yield contextPromise;
 
   equal(typeof context._unwrappedAPIs.storage, "object",
         "The storage API should be initialized");
 
   yield extension.unload();
 });