Merge branch 'ext-work'FF_Checkpoint_1

1 files changed, 34 insertions, 0 deletions

diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_bug611242.js b/toolkit/mozapps/extensions/test/xpinstall/browser_bug611242.js
new file mode 100644
index 000000000..08af331bd
--- /dev/null
+++ b/toolkit/mozapps/extensions/test/xpinstall/browser_bug611242.js
@@ -0,0 +1,34 @@
+// ----------------------------------------------------------------------------
+// Test whether setting a new property in InstallTrigger then persists to other
+// page loads
+function loadURI(aUri, aCallback) {
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    if (gBrowser.selectedBrowser.currentURI.spec != aUri)
+      return;
+
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+
+    aCallback();
+  }, true);
+
+  gBrowser.loadURI(aUri);
+}
+
+function test() {
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+
+  loadURI(TESTROOT + "enabled.html", function() {
+    window.content.wrappedJSObject.InstallTrigger.enabled.k = function() { };
+
+    loadURI(TESTROOT2 + "enabled.html", function() {
+      is(window.content.wrappedJSObject.InstallTrigger.enabled.k, undefined, "Property should not be defined");
+
+      gBrowser.removeTab(gBrowser.selectedTab);
+
+      finish();
+    });
+  });
+}
+// ----------------------------------------------------------------------------