diff options
Diffstat (limited to 'toolkit/mozapps/extensions/test/browser/browser_uninstalling.js')
-rw-r--r-- | toolkit/mozapps/extensions/test/browser/browser_uninstalling.js | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/toolkit/mozapps/extensions/test/browser/browser_uninstalling.js b/toolkit/mozapps/extensions/test/browser/browser_uninstalling.js index a9329e496..9fcb9de66 100644 --- a/toolkit/mozapps/extensions/test/browser/browser_uninstalling.js +++ b/toolkit/mozapps/extensions/test/browser/browser_uninstalling.js @@ -117,7 +117,7 @@ add_test(function() { ok(!!(aAddon.pendingOperations & AddonManager.PENDING_UNINSTALL), "Add-on should be pending uninstall"); - button = gDocument.getAnonymousElementByAttribute(item, "anonid", "restart-btn"); + var button = gDocument.getAnonymousElementByAttribute(item, "anonid", "restart-btn"); isnot(button, null, "Should have a restart button"); ok(!button.hidden, "Restart button should not be hidden"); button = gDocument.getAnonymousElementByAttribute(item, "anonid", "undo-btn"); @@ -128,7 +128,7 @@ add_test(function() { // Force XBL to apply item.clientTop; - ok(!(aAddon.pendingOperations & AddonManager.PENDING_UNINSTALL), "Add-on should not be pending uninstall"); + ok(aAddon.pendingOperations & AddonManager.PENDING_UNINSTALL, "Add-on should be pending uninstall"); button = gDocument.getAnonymousElementByAttribute(item, "anonid", "remove-btn"); isnot(button, null, "Should have a remove button"); ok(!button.disabled, "Button should not be disabled"); @@ -166,10 +166,10 @@ add_test(function() { is(item.getAttribute("pending"), "uninstall", "Add-on should be uninstalling"); - ok(aAddon.pendingOperations & AddonManager.PENDING_UNINSTALL, "Add-on should be pending uninstall"); + ok(!(aAddon.pendingOperations & AddonManager.PENDING_UNINSTALL), "Add-on should not be pending uninstall"); ok(!aAddon.isActive, "Add-on should be inactive"); - button = gDocument.getAnonymousElementByAttribute(item, "anonid", "restart-btn"); + var button = gDocument.getAnonymousElementByAttribute(item, "anonid", "restart-btn"); isnot(button, null, "Should have a restart button"); ok(button.hidden, "Restart button should be hidden"); button = gDocument.getAnonymousElementByAttribute(item, "anonid", "undo-btn"); @@ -224,7 +224,7 @@ add_test(function() { ok(aAddon.pendingOperations & AddonManager.PENDING_UNINSTALL, "Add-on should be pending uninstall"); ok(!aAddon.isActive, "Add-on should be inactive"); - button = gDocument.getAnonymousElementByAttribute(item, "anonid", "restart-btn"); + var button = gDocument.getAnonymousElementByAttribute(item, "anonid", "restart-btn"); isnot(button, null, "Should have a restart button"); ok(button.hidden, "Restart button should be hidden"); button = gDocument.getAnonymousElementByAttribute(item, "anonid", "undo-btn"); @@ -285,7 +285,7 @@ add_test(function() { ok(!!(aAddon.pendingOperations & AddonManager.PENDING_UNINSTALL), "Add-on should be pending uninstall"); - button = gDocument.getAnonymousElementByAttribute(item, "anonid", "restart-btn"); + var button = gDocument.getAnonymousElementByAttribute(item, "anonid", "restart-btn"); isnot(button, null, "Should have a restart button"); ok(!button.hidden, "Restart button should not be hidden"); button = gDocument.getAnonymousElementByAttribute(item, "anonid", "undo-btn"); @@ -345,7 +345,7 @@ add_test(function() { ok(aAddon.pendingOperations & AddonManager.PENDING_UNINSTALL, "Add-on should be pending uninstall"); ok(!aAddon.isActive, "Add-on should be inactive"); - button = gDocument.getAnonymousElementByAttribute(item, "anonid", "restart-btn"); + var button = gDocument.getAnonymousElementByAttribute(item, "anonid", "restart-btn"); isnot(button, null, "Should have a restart button"); ok(button.hidden, "Restart button should be hidden"); button = gDocument.getAnonymousElementByAttribute(item, "anonid", "undo-btn"); @@ -408,7 +408,7 @@ add_test(function() { ok(!!(aAddon.pendingOperations & AddonManager.PENDING_UNINSTALL), "Add-on should be pending uninstall"); ok(!aAddon.isActive, "Add-on should be inactive"); - button = gDocument.getAnonymousElementByAttribute(item, "anonid", "restart-btn"); + var button = gDocument.getAnonymousElementByAttribute(item, "anonid", "restart-btn"); isnot(button, null, "Should have a restart button"); ok(button.hidden, "Restart button should be hidden"); button = gDocument.getAnonymousElementByAttribute(item, "anonid", "undo-btn"); @@ -452,7 +452,7 @@ add_test(function() { EventUtils.synthesizeMouseAtCenter(item, { clickCount: 1 }, gManagerWindow); EventUtils.synthesizeMouseAtCenter(item, { clickCount: 2 }, gManagerWindow); wait_for_view_load(gManagerWindow, function() { - is(get_current_view(gManagerWindow).id, "detail-view", "Should be in the detail view"); + is(gDocument.getElementById("view-port").selectedPanel.id, "detail-view", "Should be in the detail view"); var button = gDocument.getElementById("detail-uninstall-btn"); isnot(button, null, "Should have a remove button"); @@ -516,7 +516,7 @@ add_test(function() { EventUtils.synthesizeMouseAtCenter(item, { clickCount: 1 }, gManagerWindow); EventUtils.synthesizeMouseAtCenter(item, { clickCount: 2 }, gManagerWindow); wait_for_view_load(gManagerWindow, function() { - is(get_current_view(gManagerWindow).id, "detail-view", "Should be in the detail view"); + is(gDocument.getElementById("view-port").selectedPanel.id, "detail-view", "Should be in the detail view"); var button = gDocument.getElementById("detail-uninstall-btn"); isnot(button, null, "Should have a remove button"); @@ -583,7 +583,7 @@ add_test(function() { EventUtils.synthesizeMouseAtCenter(item, { clickCount: 1 }, gManagerWindow); EventUtils.synthesizeMouseAtCenter(item, { clickCount: 2 }, gManagerWindow); wait_for_view_load(gManagerWindow, function() { - is(get_current_view(gManagerWindow).id, "detail-view", "Should be in the detail view"); + is(gDocument.getElementById("view-port").selectedPanel.id, "detail-view", "Should be in the detail view"); var button = gDocument.getElementById("detail-uninstall-btn"); isnot(button, null, "Should have a remove button"); @@ -659,7 +659,7 @@ add_test(function() { ok(!!(aAddon.pendingOperations & AddonManager.PENDING_UNINSTALL), "Add-on should be pending uninstall"); - button = gDocument.getAnonymousElementByAttribute(item, "anonid", "restart-btn"); + var button = gDocument.getAnonymousElementByAttribute(item, "anonid", "restart-btn"); isnot(button, null, "Should have a restart button"); ok(!button.hidden, "Restart button should not be hidden"); button = gDocument.getAnonymousElementByAttribute(item, "anonid", "undo-btn"); @@ -808,6 +808,7 @@ add_test(function() { item.clientTop; is(item.getAttribute("pending"), "uninstall", "Add-on should be uninstalling"); + ok(aAddon.pendingOperations & AddonManager.PENDING_UNINSTALL, "Add-on should be pending uninstall"); ok(!aAddon.isActive, "Add-on should be inactive"); @@ -1048,7 +1049,7 @@ add_test(function() { ok(aAddon.pendingOperations & AddonManager.PENDING_UNINSTALL, "Add-on should be pending uninstall"); ok(!aAddon.isActive, "Add-on should be inactive"); - button = gDocument.getAnonymousElementByAttribute(item, "anonid", "restart-btn"); + var button = gDocument.getAnonymousElementByAttribute(item, "anonid", "restart-btn"); isnot(button, null, "Should have a restart button"); ok(button.hidden, "Restart button should be hidden"); button = gDocument.getAnonymousElementByAttribute(item, "anonid", "undo-btn"); @@ -1068,7 +1069,7 @@ add_test(function() { is(aAddon, null, "Add-on should no longer be installed"); is(aAddon2, null, "Second add-on should no longer be installed"); - open_manager("addons://list/extension", function(aWindow) { + open_manager(null, function(aWindow) { gManagerWindow = aWindow; gDocument = gManagerWindow.document; gCategoryUtilities = new CategoryUtilities(gManagerWindow); |