Issue 2420 - Update notification tests

chrome/content/tests/notification.js

 (function()
 {
   let testRunner = null;
   let randomResult = 0.5;
 
   let originalInfo;
   let info = require("info");
 
   function showNotifications(url)
   {
     let shownNotifications = [];
     function showListener(notification)
     {
       shownNotifications.push(notification);
+      Notification.markAsShown(notification.id);
     }
     Notification.addShowListener(showListener);
     Notification.showNext(url);
     Notification.removeShowListener(showListener);
-    shownNotifications.forEach(function(notification)
-    {
-      Notification.markAsShown(notification.id);

[Wladimir Palant, 2015/06/08 11:45:21]

Shouldn't this be called in showListener above?

[Felix Dahlke, 2015/06/08 19:36:53]

Done.

-    });
     return shownNotifications;
   }
 
   module("Notification handling",
   {
     setup: function()
     {
       testRunner = this;
 
       preparePrefs.call(this);
@@ skipping 18 matching lines @@
       Prefs.notificationurl = "http://example.com/notification.json";
       Prefs.notificationdata = {};
       Prefs.notifications_ignoredcategories = [];
 
       // Replace Math.random() function
       let DownloaderGlobal = Cu.getGlobalForObject(getModuleGlobal("downloader"));
       this._origRandom = DownloaderGlobal.Math.random;
       DownloaderGlobal.Math.random = () => randomResult;
       randomResult = 0.5;
 
-      Notification.removeAllShowListeners();

[Wladimir Palant, 2015/06/08 11:45:21]

Better save the old listeners and restore them in teardown - this way the
functionality isn't broken after the test. You can use
getModuleGlobal("notification").showListeners for that.

[Felix Dahlke, 2015/06/08 19:36:53]

Done.

+      let NotificationGlobal = getModuleGlobal("notification");
+      this._origShowListeners = NotificationGlobal.showListeners;
+      NotificationGlobal.showListeners = [];
     },
 
     teardown: function()
     {
       restorePrefs.call(this);
       restoreVirtualTime.call(this);
       restoreVirtualXMLHttp.call(this);
 
       for (let key in originalInfo)
         info[key] = originalInfo[key];
 
       if (this._origRandom)
       {
         let DownloaderGlobal = Cu.getGlobalForObject(getModuleGlobal("downloader"));
         DownloaderGlobal.Math.random = this._origRandom;
         delete this._origRandom;
+      }
+
+      if (this._origShowListeners)
+      {
+        let NotificationGlobal = getModuleGlobal("notification");
+        NotificationGlobal.showListeners = this._origShowListeners;
+        delete this._origShowListeners;
       }
 
       Notification.init();
     }
   });
 
   function registerHandler(notifications, checkCallback)
   {
     testRunner.registerHandler("/notification.json", function(metadata)
     {
@@ skipping 337 matching lines @@
     });
     let critical = fixConstructors({
       id: 2,
       type: "critical"
     });
 
     Notification.toggleIgnoreCategory("*", true);
     registerHandler([information]);
     testRunner.runScheduledTasks(1);
 
-    deepEqual(Notification.getNextToShow(), null, "Information notifications are ignored after enabling global opt-out");
+    deepEqual(showNotifications(), [], "Information notifications are ignored after enabling global opt-out");

[Felix Dahlke, 2015/06/08 19:36:53]

This and the following changes are the result of rebasing - wasn't on the latest
revision...

     Notification.toggleIgnoreCategory("*", false);
-    deepEqual(Notification.getNextToShow(), information, "Information notifications are shown after disabling global opt-out");
+    deepEqual(showNotifications(), [information], "Information notifications are shown after disabling global opt-out");
 
     Notification.toggleIgnoreCategory("*", true);
     Prefs.notificationdata = {};
     registerHandler([critical]);
     testRunner.runScheduledTasks(1);
 
-    deepEqual(Notification.getNextToShow(), critical, "Critical notifications are not ignored");
+    deepEqual(showNotifications(), [critical], "Critical notifications are not ignored");
   });
 
   module("Notification localization");
 
   test("Message without localization", function()
   {
     let notification = {message: "non-localized"};
     let texts = Notification.getLocalizedTexts(notification, "en-US");
     equal(texts.message, "non-localized");
   });
@@ skipping 16 matching lines @@
     equal(texts.message, "fr");
   });
 
   test("Missing translation", function()
   {
     let notification = {message: {"en-US": "en-US"}};
     let texts = Notification.getLocalizedTexts(notification, "fr");
     equal(texts.message, "en-US");
   });
 })();