summaryrefslogtreecommitdiffstats
path: root/toolkit/mozapps/extensions/test/browser/browser_newaddon.js
diff options
context:
space:
mode:
Diffstat (limited to 'toolkit/mozapps/extensions/test/browser/browser_newaddon.js')
-rw-r--r--toolkit/mozapps/extensions/test/browser/browser_newaddon.js104
1 files changed, 29 insertions, 75 deletions
diff --git a/toolkit/mozapps/extensions/test/browser/browser_newaddon.js b/toolkit/mozapps/extensions/test/browser/browser_newaddon.js
index d450828ba..a460d79d8 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_newaddon.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_newaddon.js
@@ -6,16 +6,13 @@
var gProvider;
-function loadPage(aURL, aCallback, aBackground = false) {
- let tab = gBrowser.addTab();
- if (!aBackground)
- gBrowser.selectedTab = tab;
- let browser = tab.linkedBrowser;
- browser.loadURI(aURL);
- browser.addEventListener("AddonDisplayed", function(event) {
- browser.removeEventListener("AddonDisplayed", arguments.callee, false);
-
- aCallback(tab);
+function loadPage(aURL, aCallback) {
+ gBrowser.selectedTab = gBrowser.addTab();
+ gBrowser.loadURI(aURL);
+ gBrowser.addEventListener("AddonDisplayed", function(event) {
+ gBrowser.removeEventListener("AddonDisplayed", arguments.callee, false);
+
+ aCallback(gBrowser.selectedTab);
});
}
@@ -29,15 +26,13 @@ function test() {
name: "Test 1",
version: "5.3",
userDisabled: true,
- seen: false,
operationsRequiringRestart: AddonManager.OP_NEEDS_RESTART_NONE
}, {
id: "addon2@tests.mozilla.org",
name: "Test 2",
version: "7.1",
creator: "Dave Townsend",
- userDisabled: true,
- seen: false
+ userDisabled: true
}]);
run_next_test();
@@ -59,19 +54,16 @@ add_test(function() {
is(doc.getElementById("buttonDeck").selectedPanel, doc.getElementById("continuePanel"),
"Should be showing the right buttons");
- AddonManager.getAddonByID("addon1@tests.mozilla.org", function(aAddon) {
- ok(aAddon.seen, "Add-on should have been marked as seen");
+ EventUtils.synthesizeMouseAtCenter(doc.getElementById("continue-button"),
+ {}, aTab.linkedBrowser.contentWindow);
- EventUtils.synthesizeMouseAtCenter(doc.getElementById("continue-button"),
- {}, aTab.linkedBrowser.contentWindow);
-
- is(gBrowser.tabs.length, 1, "Page should have been closed");
+ is(gBrowser.tabs.length, 1, "Page should have been closed");
+ AddonManager.getAddonByID("addon1@tests.mozilla.org", function(aAddon) {
ok(aAddon.userDisabled, "Add-on should not have been enabled");
ok(!aAddon.isActive, "Add-on should not be running");
- aAddon.seen = false;
run_next_test();
});
});
@@ -89,23 +81,19 @@ add_test(function() {
is(doc.getElementById("buttonDeck").selectedPanel, doc.getElementById("continuePanel"),
"Should be showing the right buttons");
- AddonManager.getAddonByID("addon1@tests.mozilla.org", function(aAddon) {
- ok(aAddon.seen, "Add-on should have been marked as seen");
+ EventUtils.synthesizeMouseAtCenter(doc.getElementById("allow"),
+ {}, aTab.linkedBrowser.contentWindow);
- EventUtils.synthesizeMouseAtCenter(doc.getElementById("allow"),
- {}, aTab.linkedBrowser.contentWindow);
+ EventUtils.synthesizeMouseAtCenter(doc.getElementById("continue-button"),
+ {}, aTab.linkedBrowser.contentWindow);
- EventUtils.synthesizeMouseAtCenter(doc.getElementById("continue-button"),
- {}, aTab.linkedBrowser.contentWindow);
-
- is(gBrowser.tabs.length, 1, "Page should have been closed");
+ is(gBrowser.tabs.length, 1, "Page should have been closed");
+ AddonManager.getAddonByID("addon1@tests.mozilla.org", function(aAddon) {
ok(!aAddon.userDisabled, "Add-on should now have been enabled");
ok(aAddon.isActive, "Add-on should now be running");
- aAddon.userDisabled = true;
- aAddon.seen = false;
run_next_test();
});
});
@@ -124,19 +112,16 @@ add_test(function() {
is(doc.getElementById("buttonDeck").selectedPanel, doc.getElementById("continuePanel"),
"Should be showing the right buttons");
- AddonManager.getAddonByID("addon2@tests.mozilla.org", function(aAddon) {
- ok(aAddon.seen, "Add-on should have been marked as seen");
-
- EventUtils.synthesizeMouseAtCenter(doc.getElementById("continue-button"),
- {}, aTab.linkedBrowser.contentWindow);
+ EventUtils.synthesizeMouseAtCenter(doc.getElementById("continue-button"),
+ {}, aTab.linkedBrowser.contentWindow);
- is(gBrowser.tabs.length, 1, "Page should have been closed");
+ is(gBrowser.tabs.length, 1, "Page should have been closed");
+ AddonManager.getAddonByID("addon2@tests.mozilla.org", function(aAddon) {
ok(aAddon.userDisabled, "Add-on should not have been enabled");
ok(!aAddon.isActive, "Add-on should not be running");
- aAddon.seen = false;
run_next_test();
});
});
@@ -155,18 +140,16 @@ add_test(function() {
is(doc.getElementById("buttonDeck").selectedPanel, doc.getElementById("continuePanel"),
"Should be showing the right buttons");
- AddonManager.getAddonByID("addon2@tests.mozilla.org", function(aAddon) {
- ok(aAddon.seen, "Add-on should have been marked as seen");
-
- EventUtils.synthesizeMouseAtCenter(doc.getElementById("allow"),
- {}, aTab.linkedBrowser.contentWindow);
+ EventUtils.synthesizeMouseAtCenter(doc.getElementById("allow"),
+ {}, aTab.linkedBrowser.contentWindow);
- EventUtils.synthesizeMouseAtCenter(doc.getElementById("continue-button"),
- {}, aTab.linkedBrowser.contentWindow);
+ EventUtils.synthesizeMouseAtCenter(doc.getElementById("continue-button"),
+ {}, aTab.linkedBrowser.contentWindow);
- is(doc.getElementById("buttonDeck").selectedPanel, doc.getElementById("restartPanel"),
- "Should be showing the right buttons");
+ is(doc.getElementById("buttonDeck").selectedPanel, doc.getElementById("restartPanel"),
+ "Should be showing the right buttons");
+ AddonManager.getAddonByID("addon2@tests.mozilla.org", function(aAddon) {
ok(!aAddon.userDisabled, "Add-on should now have been enabled");
ok(!aAddon.isActive, "Add-on should not be running");
@@ -197,36 +180,7 @@ add_test(function() {
is(gBrowser.tabs.length, 1, "Page should have been closed");
- aAddon.seen = false;
run_next_test();
});
});
});
-
-// Tests that opening the page in the background doesn't mark as seen
-add_test(function() {
- loadPage("about:newaddon?id=addon1@tests.mozilla.org", function(aTab) {
- var doc = aTab.linkedBrowser.contentDocument;
- is(doc.getElementById("name").value, "Test 1 5.3", "Should say the right name");
-
- is_element_hidden(doc.getElementById("author"), "Should be no author displayed");
- is_element_hidden(doc.getElementById("location"), "Should be no location displayed");
-
- is(doc.getElementById("buttonDeck").selectedPanel, doc.getElementById("continuePanel"),
- "Should be showing the right buttons");
-
- AddonManager.getAddonByID("addon1@tests.mozilla.org", function(aAddon) {
- ok(!aAddon.seen, "Add-on should not have been marked as seen.");
-
- gBrowser.selectedTab = aTab;
-
- waitForFocus(function() {
- ok(aAddon.seen, "Add-on should have been marked as seen after focusing the tab.");
-
- gBrowser.removeTab(aTab);
-
- run_next_test();
- }, aTab.linkedBrowser.contentWindow);
- });
- }, true);
-});
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-14 16:13:30 +0000