Bug 970290 - Wait "testready" instead of "load" event.
author"Kan-Ru Chen (陳侃如)" <kanru@kanru.info>
Thu, 20 Feb 2014 10:25:14 +0800
changeset 169997 4b54d3adf4c2f0afd4e6ae44b60fb7702c619ec5
parent 169996 7c01cbcd31ebdeeb74233349d9b76191ee0d07ad
child 169998 043571a8d55f88dc3ef5ec70b6a0228be20f5ea2
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
bugs970290
milestone30.0a1
Bug 970290 - Wait "testready" instead of "load" event.
dom/browser-element/mochitest/test_browserElement_NoPref.html
dom/browser-element/mochitest/test_browserElement_NoWhitelist.html
testing/mochitest/b2g.json
--- a/dom/browser-element/mochitest/test_browserElement_NoPref.html
+++ b/dom/browser-element/mochitest/test_browserElement_NoPref.html
@@ -36,14 +36,14 @@ function runTest() {
   iframe.addEventListener('load', function() {
     ok(true, 'Got iframe load event.');
     SimpleTest.finish();
   });
 
   iframe.src = browserElementTestHelpers.emptyPage1;
 }
 
-addEventListener('load', function() { SimpleTest.executeSoon(runTest); });
+addEventListener('testready', runTest);
 
 </script>
 
 </body>
 </html>
--- a/dom/browser-element/mochitest/test_browserElement_NoWhitelist.html
+++ b/dom/browser-element/mochitest/test_browserElement_NoWhitelist.html
@@ -37,14 +37,14 @@ function runTest() {
   iframe.addEventListener('load', function() {
     ok(true, 'Got iframe load event.');
     SimpleTest.finish();
   });
 
   iframe.src = browserElementTestHelpers.emptyPage1;
 }
 
-addEventListener('load', function() { SimpleTest.executeSoon(runTest); });
+addEventListener('testready', runTest);
 
 </script>
 
 </body>
 </html>
--- a/testing/mochitest/b2g.json
+++ b/testing/mochitest/b2g.json
@@ -244,19 +244,16 @@
     "dom/browser-element/mochitest/test_browserElement_inproc_OpenMixedProcess.html":"",
     "dom/browser-element/mochitest/test_browserElement_inproc_OpenNamed.html":"",
     "dom/browser-element/mochitest/test_browserElement_inproc_OpenWindow.html":"",
     "dom/browser-element/mochitest/test_browserElement_inproc_OpenWindowDifferentOrigin.html":"",
     "dom/browser-element/mochitest/test_browserElement_inproc_OpenWindowInFrame.html":"",
     "dom/browser-element/mochitest/test_browserElement_inproc_OpenWindowRejected.html":"",
     "dom/browser-element/mochitest/test_browserElement_inproc_SecurityChange.html":"",
     "dom/browser-element/mochitest/test_browserElement_inproc_TargetBlank.html":"",
-	
-    "dom/browser-element/mochitest/test_browserElement_NoPref.html":"bug 970290 - Should not send mozbrowserloadstart event.",
-    "dom/browser-element/mochitest/test_browserElement_NoWhitelist.html":"bug 970290 - Should not send mozbrowserloadstart event.",
 
     "dom/browser-element/mochitest/test_browserElement_oop_AppFramePermission.html":"",
     "dom/browser-element/mochitest/test_browserElement_oop_AppWindowNamespace.html":"",
     "dom/browser-element/mochitest/test_browserElement_oop_Auth.html":"",
     "dom/browser-element/mochitest/test_browserElement_oop_BrowserWindowNamespace.html":"",
     "dom/browser-element/mochitest/test_browserElement_oop_ErrorSecurity.html":"",
     "dom/browser-element/mochitest/test_browserElement_oop_FrameWrongURI.html":"",
     "dom/browser-element/mochitest/test_browserElement_oop_OpenMixedProcess.html":"",