Merge branch 'ext-work'FF_Checkpoint_1

1 files changed, 42 insertions, 0 deletions

diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug514327_2.js b/toolkit/mozapps/extensions/test/xpcshell/test_bug514327_2.js
new file mode 100644
index 000000000..a8c369f1b
--- /dev/null
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_bug514327_2.js
@@ -0,0 +1,42 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+
+const nsIBLS = Ci.nsIBlocklistService;
+
+// Finds the test nsIPluginTag
+function get_test_plugintag() {
+  var host = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
+  var tags = host.getPluginTags();
+  for (let tag of tags) {
+    if (tag.name == "Test Plug-in")
+      return tag;
+  }
+  return null;
+}
+
+function run_test() {
+  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9");
+
+  copyBlocklistToProfile(do_get_file("data/test_bug514327_2.xml"));
+
+  var blocklist = Cc["@mozilla.org/extensions/blocklist;1"].getService(nsIBLS);
+  var prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
+
+  var plugin = get_test_plugintag();
+  if (!plugin)
+    do_throw("Plugin tag not found");
+
+  //run the code after the blocklist is closed
+  Services.obs.notifyObservers(null, "addon-blocklist-closed", null);
+  do_execute_soon(function() {
+    // should be marked as outdated by the blocklist
+    do_check_true(blocklist.getPluginBlocklistState(plugin, "1", "1.9") == nsIBLS.STATE_OUTDATED);
+
+    // should indicate that a warning should be shown
+    do_check_true(prefs.getBoolPref("plugins.update.notifyUser"));
+  });
+}