Bug 1000315 - Part 8: Various tests skip uninstall prompt. r=sicking

2024-09-13 09:24:08 -07:00 · 2014-06-12 09:53:54 -07:00 · 2014-06-12 09:53:54 -07:00 · 965c41bed7
commit 965c41bed7
parent 6029ad93ef
25 changed files with 64 additions and 25 deletions
--- a/content/base/test/csp/test_bug949549.html
+++ b/content/base/test/csp/test_bug949549.html
@ -54,10 +54,12 @@
  }

  function cleanup() {
-    let req = navigator.mozApps.mgmt.uninstall(app);
-    req.onsuccess = function () {
-      SimpleTest.finish();
-    };
+    SpecialPowers.autoConfirmAppUninstall(function () {
+      let req = navigator.mozApps.mgmt.uninstall(app);
+      req.onsuccess = function () {
+        SimpleTest.finish();
+      };
+    });
  }

  setupTest();
--- a/dom/datastore/tests/test_app_install.html
+++ b/dom/datastore/tests/test_app_install.html
@ -54,6 +54,9 @@
    SpecialPowers.autoConfirmAppInstall(continueTest);
    yield undefined;

+    SpecialPowers.autoConfirmAppUninstall(continueTest);
+    yield undefined;
+
    var request = navigator.mozApps.install(gHostedManifestURL);
    request.onerror = cbError;
    request.onsuccess = continueTest;
--- a/dom/datastore/tests/test_arrays.html
+++ b/dom/datastore/tests/test_arrays.html
@ -95,7 +95,8 @@

    // No confirmation needed when an app is installed
    function() {
-      SpecialPowers.autoConfirmAppInstall(runTest);
+      SpecialPowers.autoConfirmAppInstall(() =>
+        SpecialPowers.autoConfirmAppUninstall(runTest));
    },

    // Installing the app
--- a/dom/datastore/tests/test_basic.html
+++ b/dom/datastore/tests/test_basic.html
@ -95,7 +95,8 @@

    // No confirmation needed when an app is installed
    function() {
-      SpecialPowers.autoConfirmAppInstall(runTest);
+      SpecialPowers.autoConfirmAppInstall(() =>
+        SpecialPowers.autoConfirmAppUninstall(runTest));
    },

    // Installing the app
--- a/dom/datastore/tests/test_basic_worker.html
+++ b/dom/datastore/tests/test_basic_worker.html
@ -95,7 +95,8 @@

    // No confirmation needed when an app is installed
    function() {
-      SpecialPowers.autoConfirmAppInstall(runTest);
+      SpecialPowers.autoConfirmAppInstall(() =>
+        SpecialPowers.autoConfirmAppUninstall(runTest));
    },

    // Installing the app
--- a/dom/datastore/tests/test_bug1008044.html
+++ b/dom/datastore/tests/test_bug1008044.html
@ -96,7 +96,8 @@

    // No confirmation needed when an app is installed
    function() {
-      SpecialPowers.autoConfirmAppInstall(runTest);
+      SpecialPowers.autoConfirmAppInstall(() =>
+        SpecialPowers.autoConfirmAppUninstall(runTest));
    },

    // Installing the app
--- a/dom/datastore/tests/test_bug924104.html
+++ b/dom/datastore/tests/test_bug924104.html
@ -95,7 +95,8 @@

    // No confirmation needed when an app is installed
    function() {
-      SpecialPowers.autoConfirmAppInstall(runTest);
+      SpecialPowers.autoConfirmAppInstall(() =>
+        SpecialPowers.autoConfirmAppUninstall(runTest));
    },

    // Installing the app
--- a/dom/datastore/tests/test_bug957086.html
+++ b/dom/datastore/tests/test_bug957086.html
@ -112,6 +112,11 @@
    // Run tests in app
    testApp,

+    // No confirmation needed when an app is installed
+    function() {
+      SpecialPowers.autoConfirmAppUninstall(runTest);
+    },
+
    // Uninstall the app
    uninstallApp
  ];
--- a/dom/datastore/tests/test_bug976311.html
+++ b/dom/datastore/tests/test_bug976311.html
@ -100,7 +100,8 @@

    // No confirmation needed when an app is installed
    function() {
-      SpecialPowers.autoConfirmAppInstall(runTest);
+      SpecialPowers.autoConfirmAppInstall(() =>
+        SpecialPowers.autoConfirmAppUninstall(runTest));
    },

    // Installing the app1
--- a/dom/datastore/tests/test_bug986056.html
+++ b/dom/datastore/tests/test_bug986056.html
@ -92,7 +92,8 @@

    // No confirmation needed when an app is installed
    function() {
-      SpecialPowers.autoConfirmAppInstall(runTest);
+      SpecialPowers.autoConfirmAppInstall(() =>
+        SpecialPowers.autoConfirmAppUninstall(runTest));
    },

    // Installing the app1
--- a/dom/datastore/tests/test_certifiedApp.html
+++ b/dom/datastore/tests/test_certifiedApp.html
@ -102,7 +102,8 @@

    // No confirmation needed when an app is installed
    function() {
-      SpecialPowers.autoConfirmAppInstall(runTest);
+      SpecialPowers.autoConfirmAppInstall(() =>
+        SpecialPowers.autoConfirmAppUninstall(runTest));
    },

    // Installing the app
--- a/dom/datastore/tests/test_changes.html
+++ b/dom/datastore/tests/test_changes.html
@ -138,7 +138,8 @@

    // No confirmation needed when an app is installed
    function() {
-      SpecialPowers.autoConfirmAppInstall(runTest);
+      SpecialPowers.autoConfirmAppInstall(() =>
+        SpecialPowers.autoConfirmAppUninstall(runTest));
    },

    // Installing the app1
--- a/dom/datastore/tests/test_duplicate.html
+++ b/dom/datastore/tests/test_duplicate.html
@ -95,7 +95,8 @@

    // No confirmation needed when an app is installed
    function() {
-      SpecialPowers.autoConfirmAppInstall(runTest);
+      SpecialPowers.autoConfirmAppInstall(() =>
+        SpecialPowers.autoConfirmAppUninstall(runTest));
    },

    // Installing the app
--- a/dom/datastore/tests/test_keys.html
+++ b/dom/datastore/tests/test_keys.html
@ -95,7 +95,8 @@

    // No confirmation needed when an app is installed
    function() {
-      SpecialPowers.autoConfirmAppInstall(runTest);
+      SpecialPowers.autoConfirmAppInstall(() =>
+        SpecialPowers.autoConfirmAppUninstall(runTest));
    },

    // Installing the app
--- a/dom/datastore/tests/test_notify_system_message.html
+++ b/dom/datastore/tests/test_notify_system_message.html
@ -89,7 +89,9 @@
    function() {
      SpecialPowers.setAllAppsLaunchable(true);
      // No confirmation needed when an app is installed.
-      SpecialPowers.autoConfirmAppInstall(runTest);
+      SpecialPowers.autoConfirmAppInstall(() => {
+        SpecialPowers.autoConfirmAppUninstall(runTest);
+      });
    },

    function() {
--- a/dom/datastore/tests/test_oop.html
+++ b/dom/datastore/tests/test_oop.html
@ -96,7 +96,8 @@

    // No confirmation needed when an app is installed
    function() {
-      SpecialPowers.autoConfirmAppInstall(runTest);
+      SpecialPowers.autoConfirmAppInstall(() =>
+        SpecialPowers.autoConfirmAppUninstall(runTest));
    },

    // Installing the app
--- a/dom/datastore/tests/test_oop_events.html
+++ b/dom/datastore/tests/test_oop_events.html
@ -124,7 +124,8 @@

    // No confirmation needed when an app is installed
    function() {
-      SpecialPowers.autoConfirmAppInstall(runTest);
+      SpecialPowers.autoConfirmAppInstall(() =>
+        SpecialPowers.autoConfirmAppUninstall(runTest));
    },

    // Installing the apps
--- a/dom/datastore/tests/test_readonly.html
+++ b/dom/datastore/tests/test_readonly.html
@ -40,6 +40,9 @@
    SpecialPowers.autoConfirmAppInstall(continueTest);
    yield undefined;

+    SpecialPowers.autoConfirmAppUninstall(continueTest);
+    yield undefined;
+
    var request = navigator.mozApps.install(gHostedManifestURL);
    request.onerror = cbError;
    request.onsuccess = continueTest;
--- a/dom/datastore/tests/test_sync.html
+++ b/dom/datastore/tests/test_sync.html
@ -94,7 +94,8 @@

    // No confirmation needed when an app is installed
    function() {
-      SpecialPowers.autoConfirmAppInstall(runTest);
+      SpecialPowers.autoConfirmAppInstall(() =>
+        SpecialPowers.autoConfirmAppUninstall(runTest));
    },

    // Installing the app
--- a/dom/datastore/tests/test_sync_worker.html
+++ b/dom/datastore/tests/test_sync_worker.html
@ -94,7 +94,8 @@

    // No confirmation needed when an app is installed
    function() {
-      SpecialPowers.autoConfirmAppInstall(runTest);
+      SpecialPowers.autoConfirmAppInstall(() =>
+        SpecialPowers.autoConfirmAppUninstall(runTest));
    },

    // Installing the app
--- a/dom/datastore/tests/test_transactions.html
+++ b/dom/datastore/tests/test_transactions.html
@ -95,7 +95,8 @@

    // No confirmation needed when an app is installed
    function() {
-      SpecialPowers.autoConfirmAppInstall(runTest);
+      SpecialPowers.autoConfirmAppInstall(() =>
+        SpecialPowers.autoConfirmAppUninstall(runTest));
    },

    // Installing the app
--- a/dom/tests/mochitest/localstorage/test_app_uninstall.html
+++ b/dom/tests/mochitest/localstorage/test_app_uninstall.html
@ -183,7 +183,9 @@ function browserLoadEvent() {

 addLoadEvent(() =>
  SpecialPowers.pushPrefEnv({set: [['dom.mozBrowserFramesEnabled', true]]}, () =>
-    SpecialPowers.autoConfirmAppInstall(runTest)
+    SpecialPowers.autoConfirmAppInstall(() =>
+      SpecialPowers.autoConfirmAppUninstall(runTest)
+    )
  )
 );

--- a/dom/tests/mochitest/localstorage/test_clear_browser_data.html
+++ b/dom/tests/mochitest/localstorage/test_clear_browser_data.html
@ -197,7 +197,9 @@ function checks() {

 addLoadEvent(() =>
  SpecialPowers.pushPrefEnv({set: [['dom.mozBrowserFramesEnabled', true]]}, () =>
-    SpecialPowers.autoConfirmAppInstall(runTest)
+    SpecialPowers.autoConfirmAppInstall(() =>
+      SpecialPowers.autoConfirmAppUninstall(runTest)
+    )
  )
 );

--- a/extensions/cookie/test/test_app_uninstall_cookies.html
+++ b/extensions/cookie/test/test_app_uninstall_cookies.html
@ -172,7 +172,9 @@ function checkCookie() {

 SpecialPowers.pushPrefEnv({set: [['network.cookie.cookieBehavior', 0]]}, () =>
  SpecialPowers.autoConfirmAppInstall(() =>
-    navigator.mozApps.install(gManifestURL, null).onsuccess = onInstall
+    SpecialPowers.autoConfirmAppUninstall(() =>
+      navigator.mozApps.install(gManifestURL, null).onsuccess = onInstall
+    )
  )
 );
 </script>
--- a/extensions/cookie/test/test_app_uninstall_permissions.html
+++ b/extensions/cookie/test/test_app_uninstall_permissions.html
@ -103,7 +103,9 @@ function onInstall() {
 }

 SpecialPowers.autoConfirmAppInstall(() =>
-  navigator.mozApps.install(gManifestURL, null).onsuccess = onInstall
+  SpecialPowers.autoConfirmAppUninstall(() =>
+    navigator.mozApps.install(gManifestURL, null).onsuccess = onInstall
+  )
 );

 </script>