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 792304 - Move the disabling of test_contextmenu.html on OS X 10.8 out of the test and into the manifest, and expand it to disabling the test for all OS X versions other than 10.6

Browse Source 
--HG--
extra : rebase_source : 81cab3517ca12b9f69b7c3867949b81df986102c
This commit is contained in:
Phil Ringnalda 2015-01-18 17:18:20 -08:00
parent 558e8c0479
commit 1d8b9c525f
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/base/content/test/general/mochitest.ini
View File

@ -29,7 +29,7 @@ support-files =
[test_bug364677.html]
[test_bug395533.html]
[test_contextmenu.html]
skip-if = toolkit == "gtk2" || toolkit == "gtk3" # disabled on Linux due to bug 513558
skip-if = toolkit == "gtk2" || toolkit == "gtk3" || (os == 'mac' && os_version != '10.6') # disabled on Linux due to bug 513558, on Mac after 10.6 due to bug 792304
[test_contextmenu_input.html]
skip-if = toolkit == "gtk2" || toolkit == "gtk3" # disabled on Linux due to bug 513558
[test_feed_discovery.html]

18
browser/base/content/test/general/test_contextmenu.html
View File

@ -852,20 +852,14 @@ function waitForEvents(event)
}
}
const isOSXMtnLion = navigator.userAgent.indexOf("Mac OS X 10.8") != -1;
SpecialPowers.setBoolPref("plugins.click_to_play", true);
setTestPluginEnabledState(Ci.nsIPluginTag.STATE_CLICKTOPLAY);
if (isOSXMtnLion) {
todo(false, "Mountain Lion doesn't like this test (bug 792304)");
} else {
SpecialPowers.setBoolPref("plugins.click_to_play", true);
setTestPluginEnabledState(Ci.nsIPluginTag.STATE_CLICKTOPLAY);
var subwindow = window.open("./subtst_contextmenu.html", "contextmenu-subtext", "width=600,height=800");
subwindow.addEventListener("MozAfterPaint", waitForEvents, false);
subwindow.onload = waitForEvents;
var subwindow = window.open("./subtst_contextmenu.html", "contextmenu-subtext", "width=600,height=800");
subwindow.addEventListener("MozAfterPaint", waitForEvents, false);
subwindow.onload = waitForEvents;
SimpleTest.waitForExplicitFinish();
}
SimpleTest.waitForExplicitFinish();
</script>
</pre>
</body>