corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 425001 - Tests for bugs 400731 and 431826 rely on timers and are therefore fragile. TEST ONLY FIX.

Browse Source 
Replace with DOMContentLoaded listeners, since onload doesn't work for error pages.
This commit is contained in:
Johnathan Nightingale
2009-04-21 16:17:14 -04:00
parent af20b69833
commit 6253a8fe44
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
browser/components/safebrowsing/content/test/browser_bug400731.js
View File

@@ -10,11 +10,13 @@ function test() {
// Navigate to malware site. Can't use an onload listener here since
// error pages don't fire onload
window.addEventListener("DOMContentLoaded", testMalware, true);
newBrowser.contentWindow.location = 'http://www.mozilla.com/firefox/its-an-attack.html';
window.setTimeout(testMalware, 2000);
}
function testMalware() {
window.removeEventListener("DOMContentLoaded", testMalware, true);
// Confirm that "Ignore this warning" is visible - bug 422410
var el = newBrowser.contentDocument.getElementById("ignoreWarningButton");
ok(el, "Ignore warning button should be present for malware");
@@ -23,11 +25,13 @@ function testMalware() {
is(style.display, "-moz-box", "Ignore Warning button should be display:-moz-box for malware");
// Now launch the phishing test
window.addEventListener("DOMContentLoaded", testPhishing, true);
newBrowser.contentWindow.location = 'http://www.mozilla.com/firefox/its-a-trap.html';
window.setTimeout(testPhishing, 2000);
}
function testPhishing() {
window.removeEventListener("DOMContentLoaded", testPhishing, true);
var el = newBrowser.contentDocument.getElementById("ignoreWarningButton");
ok(el, "Ignore warning button should be present for phishing");