Merge pull request #58 from w3c/submission/DavidBruant/DOMEvents

Move @DavidBruant's DOM Events tests into position.
web-platform-tests · Oct 6, 2013 · 2b482dc · 2b482dc
2 parents 32f48c4 + 67db80b
commit 2b482dc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/...Paris/DavidBruant/event-phases-order.html → DOMEvents/event-phases-order.html b/...Paris/DavidBruant/event-phases-order.html → DOMEvents/event-phases-order.html
@@ -4,8 +4,6 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
-<button type="button" id="test">Start test</button>
-
 <script>
     var t = async_test("Event phases order");
 
@@ -28,4 +26,4 @@
 
     <div id="parent">
         <div id="child"></div>
-    </div>
+    </div>
diff --git a/...g-in-listener-and-window-error-event.html → ...g-in-listener-and-window-error-event.html b/...g-in-listener-and-window-error-event.html → ...g-in-listener-and-window-error-event.html
@@ -1,23 +1,21 @@
 <!DOCTYPE html>
-<!-- Submitted from TestTWF Paris -->
 <meta charset="UTF-8">
 <title>Throwing in event listener generates an error event on the window object</title>
 
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
-<button type="button" id="test">Start test</button>
 
 <script>
     var t = async_test("Throwing in event listener generates an error event on the window object");
 
     var errorEvent = false;
 
-    window.addEventListener('error', function(e){
+    window.onerror = function(e) {
         errorEvent = e;
-    });
+    }
 
-    document.addEventListener('DOMContentLoaded', function(){
+    document.addEventListener('DOMContentLoaded', t.step_func(function(){
         var element = document.getElementById('bim');
 
         element.addEventListener('click', function(){
@@ -26,10 +24,10 @@
 
         element.click();
 
-        assert_true(typeof errorEvent === 'object');
+        assert_equals(typeof errorEvent, 'string');
         t.done();
-    });
+    }));
 </script>
 
 <div id="bim">
-</div>
+</div>
diff --git a/...n-listener-when-all-have-not-run-yet.html → ...n-listener-when-all-have-not-run-yet.html b/...n-listener-when-all-have-not-run-yet.html → ...n-listener-when-all-have-not-run-yet.html
@@ -1,12 +1,10 @@
 <!DOCTYPE html>
-<!-- Submitted from TestTWF Paris -->
 <meta charset="UTF-8">
 <title>Throwing in event listener</title>
 
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
-<button type="button" id="test">Start test</button>
 
 <script>
     var t = async_test("Throwing in event listener");
@@ -29,4 +27,4 @@
 </script>
 
 <div id="bim">
-</div>
+</div>