mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backed out changeset bf0dfd39ebac (bug 862314) for intermittent mochitest b-c failures.

This commit is contained in:
Ryan VanderMeulen 2013-05-09 08:07:06 -04:00
Родитель d26cadac5c
Коммит 2fe3f54246
3 изменённых файлов: 68 добавлений и 184 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

213
browser/base/content/test/social/browser_social_activation.js
Просмотреть файл

@ -42,9 +42,7 @@ function postTestCleanup(callback) {
}
function addBuiltinManifest(manifest) {
let prefname = getManifestPrefname(manifest);
setBuiltinManifestPref(prefname, manifest);
return prefname;
setManifestPref("social.manifest."+manifest.origin, manifest);
}
function addTab(url, callback) {
@ -82,78 +80,6 @@ function activateIFrameProvider(domain, callback) {
});
}
function waitForProviderLoad(cb) {
Services.obs.addObserver(function providerSet(subject, topic, data) {
Services.obs.removeObserver(providerSet, "social:provider-set");
info("social:provider-set observer was notified");
waitForCondition(function() {
let sbrowser = document.getElementById("social-sidebar-browser");
return Social.provider.profile &&
Social.provider.profile.displayName &&
sbrowser.docShellIsActive;
}, function() {
// executeSoon to let the browser UI observers run first
executeSoon(cb);
},
"waitForProviderLoad: provider profile was not set");
}, "social:provider-set", false);
}
function getAddonItemInList(aId, aList) {
var item = aList.firstChild;
while (item) {
if ("mAddon" in item && item.mAddon.id == aId) {
aList.ensureElementIsVisible(item);
return item;
}
item = item.nextSibling;
}
return null;
}
function clickAddonRemoveButton(tab, aCallback) {
AddonManager.getAddonsByTypes(["service"], function(aAddons) {
let addon = aAddons[0];
let doc = tab.linkedBrowser.contentDocument;
let list = doc.getElementById("addon-list");
let item = getAddonItemInList(addon.id, list);
isnot(item, null, "Should have found the add-on in the list");
var button = doc.getAnonymousElementByAttribute(item, "anonid", "remove-btn");
isnot(button, null, "Should have a remove button");
ok(!button.disabled, "Button should not be disabled");
EventUtils.synthesizeMouseAtCenter(button, { }, doc.defaultView);
// Force XBL to apply
item.clientTop;
is(item.getAttribute("pending"), "uninstall", "Add-on should be uninstalling");
executeSoon(function() { aCallback(addon); });
});
}
function activateOneProvider(manifest, finishActivation, aCallback) {
activateProvider(manifest.origin, function() {
waitForProviderLoad(function() {
ok(!SocialUI.activationPanel.hidden, "activation panel is showing");
is(Social.provider.origin, manifest.origin, "new provider is active");
checkSocialUI();
if (finishActivation)
document.getElementById("social-activation-button").click();
else
document.getElementById("social-undoactivation-button").click();
executeSoon(aCallback);
});
});
}
let gTestDomains = ["https://example.com", "https://test1.example.com", "https://test2.example.com"];
let gProviders = [
{
@ -213,26 +139,41 @@ var tests = {
testActivationFirstProvider: function(next) {
Services.prefs.setCharPref("social.whitelist", gTestDomains.join(","));
// first up we add a manifest entry for a single provider.
activateOneProvider(gProviders[0], false, function() {
// we deactivated leaving no providers left, so Social is disabled.
ok(!Social.provider, "should be no provider left after disabling");
activateProvider(gTestDomains[0], function() {
ok(!SocialUI.activationPanel.hidden, "activation panel should be showing");
is(Social.provider.origin, gTestDomains[0], "new provider is active");
checkSocialUI();
Services.prefs.clearUserPref("social.whitelist");
next();
// hit "undo"
document.getElementById("social-undoactivation-button").click();
executeSoon(function() {
// we deactivated leaving no providers left, so Social is disabled.
ok(!Social.provider, "should be no provider left after disabling");
checkSocialUI();
Services.prefs.clearUserPref("social.whitelist");
next();
})
});
},
testActivationBuiltin: function(next) {
let prefname = addBuiltinManifest(gProviders[0]);
let prefname = getManifestPrefname(gProviders[0]);
setBuiltinManifestPref(prefname, gProviders[0]);
is(SocialService.getOriginActivationType(gTestDomains[0]), "builtin", "manifest is builtin");
// first up we add a manifest entry for a single provider.
activateOneProvider(gProviders[0], false, function() {
// we deactivated leaving no providers left, so Social is disabled.
ok(!Social.provider, "should be no provider left after disabling");
activateProvider(gTestDomains[0], function() {
ok(!SocialUI.activationPanel.hidden, "activation panel should be showing");
is(Social.provider.origin, gTestDomains[0], "new provider is active");
checkSocialUI();
resetBuiltinManifestPref(prefname);
next();
});
// hit "undo"
document.getElementById("social-undoactivation-button").click();
executeSoon(function() {
// we deactivated leaving no providers left, so Social is disabled.
ok(!Social.provider, "should be no provider left after disabling");
checkSocialUI();
resetBuiltinManifestPref(prefname);
next();
})
}, true);
},
testActivationMultipleProvider: function(next) {
@ -247,14 +188,20 @@ var tests = {
Social.provider = Social.providers[1];
checkSocialUI();
// activate the last provider.
let prefname = addBuiltinManifest(gProviders[2]);
activateOneProvider(gProviders[2], false, function() {
// we deactivated - the first provider should be enabled.
is(Social.provider.origin, Social.providers[1].origin, "original provider should have been reactivated");
addBuiltinManifest(gProviders[2]);
activateProvider(gTestDomains[2], function() {
ok(!SocialUI.activationPanel.hidden, "activation panel should be showing");
is(Social.provider.origin, gTestDomains[2], "new provider is active");
checkSocialUI();
Services.prefs.clearUserPref("social.whitelist");
resetBuiltinManifestPref(prefname);
next();
// hit "undo"
document.getElementById("social-undoactivation-button").click();
executeSoon(function() {
// we deactivated - the first provider should be enabled.
is(Social.provider.origin, Social.providers[1].origin, "original provider should have been reactivated");
checkSocialUI();
Services.prefs.clearUserPref("social.whitelist");
next();
});
});
});
});
@ -269,75 +216,23 @@ var tests = {
// activate the last provider.
addBuiltinManifest(gProviders[2]);
activateProvider(gTestDomains[2], function() {
waitForProviderLoad(function() {
ok(!SocialUI.activationPanel.hidden, "activation panel is showing");
is(Social.provider.origin, gTestDomains[2], "new provider is active");
ok(!SocialUI.activationPanel.hidden, "activation panel should be showing");
is(Social.provider.origin, gTestDomains[2], "new provider is active");
checkSocialUI();
// A bit contrived, but set a new provider current while the
// activation ui is up.
Social.provider = Social.providers[1];
// hit "undo"
document.getElementById("social-undoactivation-button").click();
executeSoon(function() {
// we deactivated - the same provider should be enabled.
is(Social.provider.origin, Social.providers[1].origin, "original provider still be active");
checkSocialUI();
// A bit contrived, but set a new provider current while the
// activation ui is up.
Social.provider = Social.providers[1];
// hit "undo"
document.getElementById("social-undoactivation-button").click();
executeSoon(function() {
// we deactivated - the same provider should be enabled.
is(Social.provider.origin, Social.providers[1].origin, "original provider still be active");
checkSocialUI();
Services.prefs.clearUserPref("social.whitelist");
next();
});
Services.prefs.clearUserPref("social.whitelist");
next();
});
});
});
});
},
testAddonManagerDoubleInstall: function(next) {
Services.prefs.setCharPref("social.whitelist", gTestDomains.join(","));
// Create a new tab and load about:addons
let blanktab = gBrowser.addTab();
gBrowser.selectedTab = blanktab;
BrowserOpenAddonsMgr('addons://list/service');
is(blanktab, gBrowser.selectedTab, "Current tab should be blank tab");
gBrowser.selectedBrowser.addEventListener("load", function tabLoad() {
gBrowser.selectedBrowser.removeEventListener("load", tabLoad, true);
let browser = blanktab.linkedBrowser;
is(browser.currentURI.spec, "about:addons", "about:addons should load into blank tab.");
addBuiltinManifest(gProviders[0]);
activateOneProvider(gProviders[0], true, function() {
gBrowser.removeTab(gBrowser.selectedTab);
tabsToRemove.pop();
// uninstall the provider
clickAddonRemoveButton(blanktab, function(addon) {
checkSocialUI();
activateOneProvider(gProviders[0], true, function() {
// after closing the addons tab, verify provider is still installed
gBrowser.tabContainer.addEventListener("TabClose", function onTabClose() {
gBrowser.tabContainer.removeEventListener("TabClose", onTabClose);
AddonManager.getAddonsByTypes(["service"], function(aAddons) {
is(aAddons.length, 1, "there can be only one");
Services.prefs.clearUserPref("social.whitelist");
next();
});
});
// verify only one provider in list
AddonManager.getAddonsByTypes(["service"], function(aAddons) {
is(aAddons.length, 1, "there can be only one");
let doc = blanktab.linkedBrowser.contentDocument;
let list = doc.getElementById("addon-list");
is(list.childNodes.length, 1, "only one addon is displayed");
gBrowser.removeTab(blanktab);
});
});
});
});
}, true);
}
}

4
browser/base/content/test/social/social_activate.html
Просмотреть файл

@ -12,8 +12,8 @@ var data = {
"icon64URL": "chrome://branding/content/icon64.png",
// at least one of these must be defined
"sidebarURL": "/browser/browser/base/content/test/social/social_sidebar.html",
"workerURL": "/browser/browser/base/content/test/social/social_worker.js",
"workerURL": "/browser/browser/base/content/test/social/social_sidebar.html",
"sidebarURL": "/browser/browser/base/content/test/social/social_worker.js",
// should be available for display purposes
"description": "A short paragraph about this provider",

35
toolkit/components/social/SocialService.jsm
Просмотреть файл

@ -501,6 +501,7 @@ this.SocialService = {
},
installProvider: function(aDOMDocument, data, installCallback) {
let sourceURI = aDOMDocument.location.href;
let installOrigin = aDOMDocument.nodePrincipal.origin;
let id = getAddonIDFromOrigin(installOrigin);
@ -509,21 +510,6 @@ this.SocialService = {
throw new Error("installProvider: provider with origin [" +
installOrigin + "] is blocklisted");
AddonManager.getAddonByID(id, function(aAddon) {
if (aAddon && aAddon.userDisabled) {
aAddon.cancelUninstall();
aAddon.userDisabled = false;
}
schedule(function () {
this._installProvider(aDOMDocument, data, installCallback);
}.bind(this));
}.bind(this));
},
_installProvider: function(aDOMDocument, data, installCallback) {
let sourceURI = aDOMDocument.location.href;
let installOrigin = aDOMDocument.nodePrincipal.origin;
let installType = this.getOriginActivationType(installOrigin);
let manifest;
if (data) {
@ -862,7 +848,6 @@ function AddonInstaller(sourceURI, aManifest, installCallback) {
aManifest.updateDate = Date.now();
// get the existing manifest for installDate
let manifest = SocialServiceInternal.getManifestByOrigin(aManifest.origin);
let isNewInstall = !manifest;
if (manifest && manifest.installDate)
aManifest.installDate = manifest.installDate;
else
@ -871,19 +856,15 @@ function AddonInstaller(sourceURI, aManifest, installCallback) {
this.sourceURI = sourceURI;
this.install = function() {
let addon = this.addon;
if (isNewInstall) {
AddonManagerPrivate.callInstallListeners("onExternalInstall", null, addon, null, false);
AddonManagerPrivate.callAddonListeners("onInstalling", addon, false);
}
AddonManagerPrivate.callInstallListeners("onExternalInstall", null, addon, null, false);
AddonManagerPrivate.callAddonListeners("onInstalling", addon, false);
let string = Cc["@mozilla.org/supports-string;1"].
createInstance(Ci.nsISupportsString);
string.data = JSON.stringify(aManifest);
Services.prefs.setComplexValue(getPrefnameFromOrigin(aManifest.origin), Ci.nsISupportsString, string);
if (isNewInstall) {
AddonManagerPrivate.callAddonListeners("onInstalled", addon);
}
AddonManagerPrivate.callAddonListeners("onInstalled", addon);
installCallback(aManifest);
};
this.cancel = function() {
@ -1119,6 +1100,14 @@ AddonWrapper.prototype = {
},
cancelUninstall: function() {
let prefName = getPrefnameFromOrigin(this.manifest.origin);
if (Services.prefs.prefHasUserValue(prefName))
throw new Error(this.manifest.name + " is not marked to be uninstalled");
// ensure we're set into prefs
let string = Cc["@mozilla.org/supports-string;1"].
createInstance(Ci.nsISupportsString);
string.data = JSON.stringify(this.manifest);
Services.prefs.setComplexValue(prefName, Ci.nsISupportsString, string);
this._pending -= AddonManager.PENDING_UNINSTALL;
AddonManagerPrivate.callAddonListeners("onOperationCancelled", this);
}