wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 739217 - Part 6: Browser social replacements of synchronous isVisited with asynchronous isURIVisited. r=mak, r=jaws

Browse Source
This commit is contained in:
Andres Hernandez 2013-02-04 17:14:47 -06:00
parent f7e8b249ba
commit af271cd9c3
3 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/base/content/test/social/browser_social_chatwindow.js
View File

@ -191,7 +191,7 @@ var tests = {
chats.selectedChat.close();
}
ok(!chats.selectedChat, "chats are all closed");
ensureSocialUrlNotRemembered(chatUrl);
gURLsNotRemembered.push(chatUrl);
port.close();
next();
break;

2
browser/base/content/test/social/browser_social_mozSocial_API.js
View File

@ -53,7 +53,7 @@ var tests = {
case "got-panel-message":
ok(true, "got panel message");
// Check the panel isn't in our history.
ensureSocialUrlNotRemembered(e.data.location);
gURLsNotRemembered.push(e.data.location);
break;
case "got-social-panel-visibility":
if (e.data.result == "shown") {

41
browser/base/content/test/social/head.js
View File

@ -2,6 +2,15 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "Promise",
"resource://gre/modules/commonjs/sdk/core/promise.js");
XPCOMUtils.defineLazyModuleGetter(this, "Task",
"resource://gre/modules/Task.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
"resource://gre/modules/PlacesUtils.jsm");
function waitForCondition(condition, nextTest, errorMsg) {
var tries = 0;
var interval = setInterval(function() {
@ -19,28 +28,38 @@ function waitForCondition(condition, nextTest, errorMsg) {
// Check that a specified (string) URL hasn't been "remembered" (ie, is not
// in history, will not appear in about:newtab or auto-complete, etc.)
function ensureSocialUrlNotRemembered(url) {
let gh = Cc["@mozilla.org/browser/global-history;2"]
.getService(Ci.nsIGlobalHistory2);
function promiseSocialUrlNotRemembered(url) {
let deferred = Promise.defer();
let uri = Services.io.newURI(url, null, null);
ok(!gh.isVisited(uri), "social URL " + url + " should not be in global history");
PlacesUtils.asyncHistory.isURIVisited(uri, function(aURI, aIsVisited) {
ok(!aIsVisited, "social URL " + url + " should not be in global history");
deferred.resolve();
});
return deferred.promise;
}
let gURLsNotRemembered = [];
function runSocialTestWithProvider(manifest, callback) {
let SocialService = Cu.import("resource://gre/modules/SocialService.jsm", {}).SocialService;
let manifests = Array.isArray(manifest) ? manifest : [manifest];
// Check that none of the provider's content ends up in history.
registerCleanupFunction(function () {
manifests.forEach(function (m) {
function finishCleanUp() {
for (let i = 0; i < manifests.length; i++) {
let m = manifests[i];
for (let what of ['sidebarURL', 'workerURL', 'iconURL']) {
if (m[what]) {
ensureSocialUrlNotRemembered(m[what]);
yield promiseSocialUrlNotRemembered(m[what]);
}
}
});
});
};
}
for (let i = 0; i < gURLsNotRemembered.length; i++) {
yield promiseSocialUrlNotRemembered(gURLsNotRemembered[i]);
}
gURLsNotRemembered = [];
}
info("runSocialTestWithProvider: " + manifests.toSource());
@ -48,7 +67,7 @@ function runSocialTestWithProvider(manifest, callback) {
function finishIfDone(callFinish) {
finishCount++;
if (finishCount == manifests.length)
finish();
Task.spawn(finishCleanUp).then(finish);
}
function removeAddedProviders(cleanup) {
manifests.forEach(function (m) {