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 1053969 - get more social tests working with e10s. r=mixedpuppy

Browse Source
This commit is contained in:
Mark Hammond 2014-09-17 14:52:44 +10:00
parent 990d98d873
commit c256240af4
5 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
browser/base/content/test/social/browser.ini
View File

@ -1,5 +1,5 @@
[DEFAULT]
skip-if = buildapp == "mulet" || e10s # Bug 915547 (social providers don't install)
skip-if = buildapp == "mulet"
support-files =
blocklist.xml
checked.jpg
@ -26,21 +26,31 @@ support-files =
unchecked.jpg
[browser_aboutHome_activation.js]
skip-if = e10s # Bug 915547 (social providers don't install)
[browser_addons.js]
skip-if = e10s # Bug 915547 (social providers don't install)
[browser_blocklist.js]
skip-if = e10s # Bug 915547 (social providers don't install)
[browser_share.js]
skip-if = e10s # Bug 915547 (social providers don't install)
[browser_social_activation.js]
skip-if = e10s # Bug 915547 (social providers don't install)
[browser_social_chatwindow.js]
skip-if = e10s # Bug 915547 (social providers don't install)
[browser_social_chatwindow_resize.js]
skip-if = e10s # Bug 915547 (social providers don't install)
[browser_social_chatwindowfocus.js]
skip-if = e10s # Bug 915547 (social providers don't install)
[browser_social_errorPage.js]
[browser_social_flyout.js]
[browser_social_isVisible.js]
[browser_social_marks.js]
skip-if = e10s # Bug 915547 (social providers don't install)
[browser_social_multiprovider.js]
[browser_social_multiworker.js]
[browser_social_perwindowPB.js]
[browser_social_sidebar.js]
[browser_social_status.js]
skip-if = e10s # Bug 915547 (social providers don't install)
[browser_social_window.js]
[browser_social_workercrash.js]

11
browser/base/content/test/social/browser_social_errorPage.js
View File

@ -36,7 +36,10 @@ function goOnline(callback) {
function openPanel(url, panelCallback, loadCallback) {
// open a flyout
SocialFlyout.open(url, 0, panelCallback);
SocialFlyout.panel.firstChild.addEventListener("load", function panelLoad() {
SocialFlyout.panel.firstChild.addEventListener("load", function panelLoad(evt) {
if (evt.target != SocialFlyout.panel.firstChild.contentDocument) {
return;
}
SocialFlyout.panel.firstChild.removeEventListener("load", panelLoad, true);
loadCallback();
}, true);
@ -145,8 +148,10 @@ var tests = {
todo_is(panelCallbackCount, 0, "Bug 833207 - should be no callback when error page loads.");
ok(panel.firstChild.contentDocument.location.href.indexOf("about:socialerror?")==0, "is on social error page");
gc();
SocialFlyout.unload();
next();
executeSoon(function() {
SocialFlyout.unload();
next();
});
});
}
);

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

@ -73,7 +73,7 @@ var tests = {
testButtonDisabledOnActivate: function(next) {
// starting on about:blank page, share should be visible but disabled when
// adding provider
is(gBrowser.contentDocument.location.href, "about:blank");
is(gBrowser.selectedTab.linkedBrowser.currentURI.spec, "about:blank");
SocialService.addProvider(manifest2, function(provider) {
is(provider.origin, manifest2.origin, "provider is installed");
let id = SocialMarks._toolbarHelper.idFromOrigin(manifest2.origin);

5
browser/base/content/test/social/browser_social_multiprovider.js
View File

@ -84,7 +84,10 @@ function checkUIStateMatchesProvider(provider) {
function onSidebarLoad(callback) {
let sbrowser = document.getElementById("social-sidebar-browser");
sbrowser.addEventListener("load", function load() {
sbrowser.addEventListener("load", function load(evt) {
if (evt.target != sbrowser.contentDocument) {
return;
}
sbrowser.removeEventListener("load", load, true);
// give the load a chance to finish before pulling the rug (ie. calling
// next)

1
toolkit/components/social/test/browser/browser.ini
View File

@ -16,7 +16,6 @@ support-files =
[browser_workerAPI.js]
[browser_SocialProvider.js]
skip-if = e10s
[browser_notifications.js]
# These tests are currently unreliable on ASAN builds with remote frameworkers.