Bug 1279034 Add Addon.setEnabled() for a.m.o r=rhelmer,smaug

MozReview-Commit-ID: 6mvHMWinkle

--HG--
extra : rebase_source : 6d6f564d50dbcea8850c3fd6117351c2efe2cb6c
This commit is contained in:
Andrew Swan 2016-06-24 12:54:18 -07:00
parent d448beedaf
commit ba6d7750b6
5 changed files with 80 additions and 0 deletions

View File

@ -26,6 +26,7 @@ interface Addon {
readonly attribute boolean isActive;
Promise<boolean> uninstall();
Promise<void> setEnabled(boolean value);
};
[ChromeOnly, JSImplementation="dummy"]

View File

@ -2930,6 +2930,18 @@ var AddonManagerInternal = {
});
},
addonSetEnabled(target, id, value) {
return new Promise((resolve, reject) => {
AddonManager.getAddonByID(id, addon => {
if (!addon) {
reject({message: `No such addon ${id}`});
}
addon.userDisabled = !value;
resolve();
});
});
},
addonInstallDoInstall(target, id) {
let state = this.installs.get(id);
if (!state) {

View File

@ -151,6 +151,10 @@ Addon.prototype = {
uninstall: WebAPITask(function*() {
return yield APIBroker.sendRequest("addonUninstall", this.id);
}),
setEnabled: WebAPITask(function* (value) {
return yield APIBroker.sendRequest("addonSetEnabled", this.id, value);
}),
};
const INSTALL_EVENTS = [

View File

@ -68,6 +68,7 @@ skip-if = require_signing
[browser_webapi.js]
[browser_webapi_access.js]
[browser_webapi_addon_listener.js]
[browser_webapi_enable.js]
[browser_webapi_install.js]
[browser_webapi_uninstall.js]

View File

@ -0,0 +1,62 @@
const TESTPAGE = `${SECURE_TESTROOT}webapi_addon_listener.html`;
Services.prefs.setBoolPref("extensions.webapi.testing", true);
registerCleanupFunction(() => {
Services.prefs.clearUserPref("extensions.webapi.testing");
});
function* getListenerEvents(browser) {
let result = yield ContentTask.spawn(browser, null, function*() {
return content.document.getElementById("result").textContent;
});
return result.split('\n').map(JSON.parse);
}
const ID = "test@tests.mozilla.org";
let provider = new MockProvider(false);
provider.createAddons([
{
id: ID,
name: "Test add-on",
operationsRequiringRestart: AddonManager.OP_NEED_RESTART_NONE,
},
]);
// Test disable and enable from content
add_task(function* () {
yield BrowserTestUtils.withNewTab(TESTPAGE, function*(browser) {
let addon = yield promiseAddonByID(ID);
isnot(addon, null, "Test addon exists");
is(addon.userDisabled, false, "addon is enabled");
// Disable the addon from content.
yield ContentTask.spawn(browser, null, function* () {
return content.navigator.mozAddonManager
.getAddonByID("test@tests.mozilla.org")
.then(addon => { addon.setEnabled(false); });
});
let events = yield getListenerEvents(browser);
let expected = [
{id: ID, needsRestart: false, event: "onDisabling"},
{id: ID, needsRestart: false, event: "onDisabled"},
];
Assert.deepEqual(events, expected, "Got expected disable events");
// Enable the addon from content.
yield ContentTask.spawn(browser, null, function* () {
return content.navigator.mozAddonManager
.getAddonByID("test@tests.mozilla.org")
.then(addon => { addon.setEnabled(true); });
});
events = yield getListenerEvents(browser);
expected = expected.concat([
{id: ID, needsRestart: false, event: "onEnabling"},
{id: ID, needsRestart: false, event: "onEnabled"},
]);
Assert.deepEqual(events, expected, "Got expected enable events");
});
});