minor test cleanup

googlearchive · Aug 5, 2014 · 2bc71b7 · 2bc71b7
1 parent fa005c1
commit 2bc71b7
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 9 deletions.
diff --git a/test/html/dedupe.html b/test/html/dedupe.html
@@ -24,7 +24,6 @@
   <body>
     <script>
       addEventListener('HTMLImportsLoaded', function() {
-        console.log('ready');
         chai.assert.equal(dedupe, 1, 'import loaded');
         done();
       });

diff --git a/test/html/dynamic-elements.html b/test/html/dynamic-elements.html
@@ -12,7 +12,7 @@
 
   <script>
     document.addEventListener('asyncElementsAdded', function() {
-      HTMLImports.whenImportsReady(function() {
+      HTMLImports.whenReady(function() {
         chai.assert.isTrue(window.asyncScript, 'async added script ran');
         var computed = getComputedStyle(document.querySelector('#asyncStyled'));
         chai.assert.equal(computed.backgroundColor, 'rgb(255, 0, 0)', 'async added style applied');

diff --git a/test/html/dynamic.html b/test/html/dynamic.html
@@ -24,7 +24,7 @@
               chai.assert.ok(e.target.import);
             });
           }
-          HTMLImports.whenImportsReady(function() {
+          HTMLImports.whenReady(function() {
             chai.assert.equal(loads, 2);
             done();
           });

diff --git a/test/html/load-404.html b/test/html/load-404.html
@@ -16,7 +16,7 @@
   <body>
     <script>
       var loaded = false;
-      document.addEventListener('HTMLImportsLoaded', function() {
+      addEventListener('HTMLImportsLoaded', function() {
         loaded = true;
         check();
       });

diff --git a/test/html/load.html b/test/html/load.html
@@ -26,11 +26,7 @@
     <script src="../../html-imports.js"></script>
     <link rel="import" href="imports/load-1.html" onload="importLoaded(event)">
     <link rel="import" href="imports/load-2.html" onload="importLoaded(event)">
-    <!-- TODO(sorvell): note, native imports currently fires onload for 404
-    documents. This doesn't really make sense, check spec. 
-    See: https://code.google.com/p/chromium/issues/detail?id=336609
-    -->
-    <link rel="import" href="imports/404.html" onload="importError(event)" onerror="importError(event)">
+    <link rel="import" id="willError" href="imports/404.html" onerror="importError(event)">
   </head>
   <body>
     <div id="test1" class="red">Test</div>