From 655ac4f94a6ef5dfc34a3eab9f1fd57720d72538 Mon Sep 17 00:00:00 2001 From: Gijs Kruitbosch Date: Mon, 17 Nov 2014 22:14:52 +0000 Subject: [PATCH] Bug 1080801 - fix browser_bug633691.js to work in e10s mode, r=MattN --- browser/base/content/test/general/browser.ini | 1 - browser/base/content/test/general/browser_bug633691.js | 9 ++++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/browser/base/content/test/general/browser.ini b/browser/base/content/test/general/browser.ini index 612d09a350ef..e0806b3a4b98 100644 --- a/browser/base/content/test/general/browser.ini +++ b/browser/base/content/test/general/browser.ini @@ -248,7 +248,6 @@ skip-if = e10s # Bug 1093677 - automated form submission from the test doesn't s [browser_bug623893.js] [browser_bug624734.js] [browser_bug633691.js] -skip-if = e10s # Bug ?????? - test directly manipulates content (eg, var expertDiv = gBrowser.contentDocument.getElementById("expertContent");) [browser_bug647886.js] skip-if = buildapp == 'mulet' || e10s # Bug 1093373 - Relies on browser.sessionHistory [browser_bug655584.js] diff --git a/browser/base/content/test/general/browser_bug633691.js b/browser/base/content/test/general/browser_bug633691.js index 17ce7fcdc8b9..3173e4bf4e69 100644 --- a/browser/base/content/test/general/browser_bug633691.js +++ b/browser/base/content/test/general/browser_bug633691.js @@ -6,12 +6,15 @@ function test() { waitForExplicitFinish(); gBrowser.selectedTab = gBrowser.addTab(); // Open a html page with about:certerror in an iframe - window.content.addEventListener("load", testIframeCert, true); + gBrowser.selectedTab.linkedBrowser.addEventListener("load", testIframeCert, true); content.location = "data:text/html,"; } -function testIframeCert() { - window.content.removeEventListener("load", testIframeCert, true); +function testIframeCert(e) { + if (e.target.location.href == "about:blank") { + return; + } + gBrowser.selectedTab.linkedBrowser.removeEventListener("load", testIframeCert, true); // Confirm that the expert section is hidden var doc = gBrowser.contentDocument.getElementsByTagName('iframe')[0].contentDocument; var eC = doc.getElementById("expertContent");