Bug 782211 - Part 10: Update webapp browser permission test to clean up alerts. r=fabrice

Author: William Chen

dom/tests/browser/Makefile.in

@@ -28,7 +28,7 @@ MOCHITEST_BROWSER_FILES := \
   page_privatestorageevent.html
   $(NULL)
 
-ifeq (Linux,$(OS_ARCH))
+ifeq (,$(filter-out Linux WINNT,$(OS_ARCH)))
 MOCHITEST_BROWSER_FILES += \
   browser_webapps_permissions.js \
   test-webapp.webapp \
@@ -39,7 +39,7 @@ MOCHITEST_BROWSER_FILES += \
 endif
 
 
-# TODO: Re-enable permissions tests on Mac and Windows, bug 795334
+# TODO: Re-enable permissions tests on Mac, bug 795334
 # TODO: disabled test browser_webapps_perms_reinstall.js, re-enable when bug 794920 is fixed
 
 include $(topsrcdir)/config/rules.mk

dom/tests/browser/browser_webapps_permissions.js

@@ -18,6 +18,9 @@ function log()
 let scope = {};
 Cu.import("resource://gre/modules/PermissionSettings.jsm", scope);
 
+var windowMediator = Cc["@mozilla.org/appshell/window-mediator;1"]
+                     .getService(Ci.nsIWindowMediator);
+
 const TEST_URL =
   "http://mochi.test:8888/browser/dom/tests/browser/test-webapps-permissions.html";
 const TEST_MANIFEST_URL =
@@ -57,6 +60,14 @@ function test() {
   registerCleanupFunction(function () {
     gWindow = null;
     gBrowser.removeTab(tab);
+
+    // The installation may have created a XUL alert window
+    // (see webappsUI.installationSuccessNotification).
+    // It need to be closed before the test finishes.
+    var browsers = windowMediator.getEnumerator('alert:alert');
+      while (browsers.hasMoreElements()) {
+      browsers.getNext().close();
+    }
   });
 
   browser.addEventListener("DOMContentLoaded", function onLoad(event) {
@@ -91,6 +102,7 @@ function test() {
         for (let permName in installedPermsToTest) {
           testPerm(permName, installedPermsToTest[permName]);
         }
+
         // uninstall checks
         uninstallApp();
       };