From 1f1d211c85efab86237f097d05bc705f5df25877 Mon Sep 17 00:00:00 2001
From: Russell Bicknell <bicknellr@google.com>
Date: Fri, 11 Dec 2015 16:50:12 -0800
Subject: [PATCH 01/12] Fix `activeElement` for ShadowRoot: focused elements in
 light DOM of host are now returned.

---
 src/ShadowDOM/wrappers/Document.js      |   1 -
 src/ShadowDOM/wrappers/ShadowRoot.js    |  11 +-
 tests/ShadowDOM/html/activeElement.html | 136 +++++++++++++++++++++---
 3 files changed, 131 insertions(+), 17 deletions(-)

diff --git a/src/ShadowDOM/wrappers/Document.js b/src/ShadowDOM/wrappers/Document.js
index 5ebe24537..4ceffaa0c 100644
--- a/src/ShadowDOM/wrappers/Document.js
+++ b/src/ShadowDOM/wrappers/Document.js
@@ -59,7 +59,6 @@
 
     // Loop while activeElement is not a shallow child of this document.
     while (!this.contains(activeElement)) {
-      var lastHost = activeElement;
       // Iterate until we hit activeElement's containing ShadowRoot (which
       // isn't this one) or document.
       while (activeElement.parentNode) {
diff --git a/src/ShadowDOM/wrappers/ShadowRoot.js b/src/ShadowDOM/wrappers/ShadowRoot.js
index 915462ef4..d868014d1 100644
--- a/src/ShadowDOM/wrappers/ShadowRoot.js
+++ b/src/ShadowDOM/wrappers/ShadowRoot.js
@@ -80,8 +80,15 @@
 
       var activeElement = wrap(unwrappedActiveElement);
 
-      // Loop while activeElement is not a shallow child of this ShadowRoot.
-      while (!this.contains(activeElement)) {
+      // If the active element is this ShadowRoot's host, this ShadowRoot
+      // has no active element.
+      if (activeElement === this.host) {
+        return null;
+      }
+
+      // Loop while activeElement is not a shallow descendant of this ShadowRoot
+      // or this ShadowRoot's host.
+      while (!this.contains(activeElement) && !this.host.contains(activeElement)) {
         // Iterate until we hit activeElement's containing ShadowRoot (which
         // isn't this one) or document.
         while (activeElement.parentNode) {
diff --git a/tests/ShadowDOM/html/activeElement.html b/tests/ShadowDOM/html/activeElement.html
index 6ec9aa0d1..f79b24de5 100644
--- a/tests/ShadowDOM/html/activeElement.html
+++ b/tests/ShadowDOM/html/activeElement.html
@@ -57,6 +57,9 @@
       var r_1;
         // light
           var r_1_l;
+            // shadow
+              var r_1_l_0;
+              var r_1_l_1;
         // shadow
           var r_1_0;
             // light
@@ -85,6 +88,8 @@
         r_0_1_l = r_0_1.querySelector('[shadow-template-id=x-shadow-host-root-0-1-light]');
     r_1 = r.shadowRoot.querySelector('[shadow-template-id=x-shadow-host-root-1]');
       r_1_l = r_1.querySelector('[shadow-template-id=x-shadow-host-root-1-light]');
+        r_1_l_0 = r_1_l.shadowRoot.querySelector('[shadow-template-id=x-shadow-host-root-1-light-0]');
+        r_1_l_1 = r_1_l.shadowRoot.querySelector('[shadow-template-id=x-shadow-host-root-1-light-1]');
       r_1_0 = r_1.shadowRoot.querySelector('[shadow-template-id=x-shadow-host-root-1-0]');
         r_1_0_l = r_1_0.querySelector('[shadow-template-id=x-shadow-host-root-1-0-light]');
       r_1_1 = r_1.shadowRoot.querySelector('[shadow-template-id=x-shadow-host-root-1-1]');
@@ -94,11 +99,6 @@
   });
 
   teardown(function() {
-    assert.equal(r_0_0.shadowRoot.activeElement, null);
-    assert.equal(r_0_1.shadowRoot.activeElement, null);
-    assert.equal(r_1_0.shadowRoot.activeElement, null);
-    assert.equal(r_1_1.shadowRoot.activeElement, null);
-
     document.body.removeChild(r);
   });
 
@@ -120,16 +120,24 @@
     assert.equal(doc.activeElement, r);
     assert.equal(r.shadowRoot.activeElement, null);
     assert.equal(r_0.shadowRoot.activeElement, null);
+    assert.equal(r_0_0.shadowRoot.activeElement, null);
+    assert.equal(r_0_1.shadowRoot.activeElement, null);
     assert.equal(r_1.shadowRoot.activeElement, null);
+    assert.equal(r_1_0.shadowRoot.activeElement, null);
+    assert.equal(r_1_1.shadowRoot.activeElement, null);
   });
 
   test('r_l.focus()', function() {
     r_l.focus();
 
     assert.equal(doc.activeElement, r_l);
-    assert.equal(r.shadowRoot.activeElement, null);
+    assert.equal(r.shadowRoot.activeElement, r_l);
     assert.equal(r_0.shadowRoot.activeElement, null);
+    assert.equal(r_0_0.shadowRoot.activeElement, null);
+    assert.equal(r_0_1.shadowRoot.activeElement, null);
     assert.equal(r_1.shadowRoot.activeElement, null);
+    assert.equal(r_1_0.shadowRoot.activeElement, null);
+    assert.equal(r_1_1.shadowRoot.activeElement, null);
   });
 
   test('r_0.focus()', function() {
@@ -138,7 +146,11 @@
     assert.equal(doc.activeElement, r);
     assert.equal(r.shadowRoot.activeElement, r_0);
     assert.equal(r_0.shadowRoot.activeElement, null);
+    assert.equal(r_0_0.shadowRoot.activeElement, null);
+    assert.equal(r_0_1.shadowRoot.activeElement, null);
     assert.equal(r_1.shadowRoot.activeElement, null);
+    assert.equal(r_1_0.shadowRoot.activeElement, null);
+    assert.equal(r_1_1.shadowRoot.activeElement, null);
   });
 
   test('r_0_l.focus()', function() {
@@ -146,8 +158,12 @@
 
     assert.equal(doc.activeElement, r);
     assert.equal(r.shadowRoot.activeElement, r_0_l);
-    assert.equal(r_0.shadowRoot.activeElement, null);
+    assert.equal(r_0.shadowRoot.activeElement, r_0_l);
+    assert.equal(r_0_0.shadowRoot.activeElement, null);
+    assert.equal(r_0_1.shadowRoot.activeElement, null);
     assert.equal(r_1.shadowRoot.activeElement, null);
+    assert.equal(r_1_0.shadowRoot.activeElement, null);
+    assert.equal(r_1_1.shadowRoot.activeElement, null);
   });
 
   test('r_0_0.focus()', function() {
@@ -156,7 +172,11 @@
     assert.equal(doc.activeElement, r);
     assert.equal(r.shadowRoot.activeElement, r_0);
     assert.equal(r_0.shadowRoot.activeElement, r_0_0);
+    assert.equal(r_0_0.shadowRoot.activeElement, null);
+    assert.equal(r_0_1.shadowRoot.activeElement, null);
     assert.equal(r_1.shadowRoot.activeElement, null);
+    assert.equal(r_1_0.shadowRoot.activeElement, null);
+    assert.equal(r_1_1.shadowRoot.activeElement, null);
   });
 
   test('r_0_0_l.focus()', function() {
@@ -165,7 +185,11 @@
     assert.equal(doc.activeElement, r);
     assert.equal(r.shadowRoot.activeElement, r_0);
     assert.equal(r_0.shadowRoot.activeElement, r_0_0_l);
+    assert.equal(r_0_0.shadowRoot.activeElement, r_0_0_l);
+    assert.equal(r_0_1.shadowRoot.activeElement, null);
     assert.equal(r_1.shadowRoot.activeElement, null);
+    assert.equal(r_1_0.shadowRoot.activeElement, null);
+    assert.equal(r_1_1.shadowRoot.activeElement, null);
   });
 
   test('r_0_1.focus()', function() {
@@ -174,7 +198,11 @@
     assert.equal(doc.activeElement, r);
     assert.equal(r.shadowRoot.activeElement, r_0);
     assert.equal(r_0.shadowRoot.activeElement, r_0_1);
+    assert.equal(r_0_0.shadowRoot.activeElement, null);
+    assert.equal(r_0_1.shadowRoot.activeElement, null);
     assert.equal(r_1.shadowRoot.activeElement, null);
+    assert.equal(r_1_0.shadowRoot.activeElement, null);
+    assert.equal(r_1_1.shadowRoot.activeElement, null);
   });
 
   test('r_0_1_l.focus()', function() {
@@ -183,7 +211,11 @@
     assert.equal(doc.activeElement, r);
     assert.equal(r.shadowRoot.activeElement, r_0);
     assert.equal(r_0.shadowRoot.activeElement, r_0_1_l);
+    assert.equal(r_0_0.shadowRoot.activeElement, null);
+    assert.equal(r_0_1.shadowRoot.activeElement, r_0_1_l);
     assert.equal(r_1.shadowRoot.activeElement, null);
+    assert.equal(r_1_0.shadowRoot.activeElement, null);
+    assert.equal(r_1_1.shadowRoot.activeElement, null);
   });
 
   test('r_1.focus()', function() {
@@ -192,7 +224,11 @@
     assert.equal(doc.activeElement, r);
     assert.equal(r.shadowRoot.activeElement, r_1);
     assert.equal(r_0.shadowRoot.activeElement, null);
+    assert.equal(r_0_0.shadowRoot.activeElement, null);
+    assert.equal(r_0_1.shadowRoot.activeElement, null);
     assert.equal(r_1.shadowRoot.activeElement, null);
+    assert.equal(r_1_0.shadowRoot.activeElement, null);
+    assert.equal(r_1_1.shadowRoot.activeElement, null);
   });
 
   test('r_1_l.focus()', function() {
@@ -201,7 +237,39 @@
     assert.equal(doc.activeElement, r);
     assert.equal(r.shadowRoot.activeElement, r_1_l);
     assert.equal(r_0.shadowRoot.activeElement, null);
-    assert.equal(r_1_l.shadowRoot.activeElement, null);
+    assert.equal(r_0_0.shadowRoot.activeElement, null);
+    assert.equal(r_0_1.shadowRoot.activeElement, null);
+    assert.equal(r_1.shadowRoot.activeElement, r_1_l);
+    assert.equal(r_1_0.shadowRoot.activeElement, null);
+    assert.equal(r_1_1.shadowRoot.activeElement, null);
+  });
+
+  test('r_1_l_0.focus()', function() {
+    r_1_l_0.focus();
+
+    assert.equal(doc.activeElement, r);
+    assert.equal(r.shadowRoot.activeElement, r_1_l);
+    assert.equal(r_0.shadowRoot.activeElement, null);
+    assert.equal(r_0_0.shadowRoot.activeElement, null);
+    assert.equal(r_0_1.shadowRoot.activeElement, null);
+    assert.equal(r_1.shadowRoot.activeElement, r_1_l);
+    assert.equal(r_1_l.shadowRoot.activeElement, r_1_l_0);
+    assert.equal(r_1_0.shadowRoot.activeElement, null);
+    assert.equal(r_1_1.shadowRoot.activeElement, null);
+  });
+
+  test('r_1_l_1.focus()', function() {
+    r_1_l_1.focus();
+
+    assert.equal(doc.activeElement, r);
+    assert.equal(r.shadowRoot.activeElement, r_1_l);
+    assert.equal(r_0.shadowRoot.activeElement, null);
+    assert.equal(r_0_0.shadowRoot.activeElement, null);
+    assert.equal(r_0_1.shadowRoot.activeElement, null);
+    assert.equal(r_1.shadowRoot.activeElement, r_1_l);
+    assert.equal(r_1_l.shadowRoot.activeElement, r_1_l_1);
+    assert.equal(r_1_0.shadowRoot.activeElement, null);
+    assert.equal(r_1_1.shadowRoot.activeElement, null);
   });
 
   test('r_1_0.focus()', function() {
@@ -210,7 +278,11 @@
     assert.equal(doc.activeElement, r);
     assert.equal(r.shadowRoot.activeElement, r_1);
     assert.equal(r_0.shadowRoot.activeElement, null);
+    assert.equal(r_0_0.shadowRoot.activeElement, null);
+    assert.equal(r_0_1.shadowRoot.activeElement, null);
     assert.equal(r_1.shadowRoot.activeElement, r_1_0);
+    assert.equal(r_1_0.shadowRoot.activeElement, null);
+    assert.equal(r_1_1.shadowRoot.activeElement, null);
   });
 
   test('r_1_0_l.focus()', function() {
@@ -219,7 +291,11 @@
     assert.equal(doc.activeElement, r);
     assert.equal(r.shadowRoot.activeElement, r_1);
     assert.equal(r_0.shadowRoot.activeElement, null);
+    assert.equal(r_0_0.shadowRoot.activeElement, null);
+    assert.equal(r_0_1.shadowRoot.activeElement, null);
     assert.equal(r_1.shadowRoot.activeElement, r_1_0_l);
+    assert.equal(r_1_0.shadowRoot.activeElement, r_1_0_l);
+    assert.equal(r_1_1.shadowRoot.activeElement, null);
   });
 
   test('r_1_1.focus()', function() {
@@ -228,7 +304,11 @@
     assert.equal(doc.activeElement, r);
     assert.equal(r.shadowRoot.activeElement, r_1);
     assert.equal(r_0.shadowRoot.activeElement, null);
+    assert.equal(r_0_0.shadowRoot.activeElement, null);
+    assert.equal(r_0_1.shadowRoot.activeElement, null);
     assert.equal(r_1.shadowRoot.activeElement, r_1_1);
+    assert.equal(r_1_0.shadowRoot.activeElement, null);
+    assert.equal(r_1_1.shadowRoot.activeElement, null);
   });
 
   test('r_1_1_l.focus()', function() {
@@ -237,7 +317,11 @@
     assert.equal(doc.activeElement, r);
     assert.equal(r.shadowRoot.activeElement, r_1);
     assert.equal(r_0.shadowRoot.activeElement, null);
+    assert.equal(r_0_0.shadowRoot.activeElement, null);
+    assert.equal(r_0_1.shadowRoot.activeElement, null);
     assert.equal(r_1.shadowRoot.activeElement, r_1_1_l);
+    assert.equal(r_1_0.shadowRoot.activeElement, null);
+    assert.equal(r_1_1.shadowRoot.activeElement, r_1_1_l);
   });
 });
 
@@ -249,13 +333,17 @@
   <div>
     <div>
       <div shadow-template-id="x-shadow-host-root-0">
-        <div shadow-template-id="x-shadow-host-root-0-light"></div>
+        <div>
+          <div shadow-template-id="x-shadow-host-root-0-light"></div>
+        </div>
       </div>
     </div>
   </div>
   <div>
     <div shadow-template-id="x-shadow-host-root-1">
-      <div shadow-template-id="x-shadow-host-root-1-light"></div>
+      <div>
+        <div shadow-template-id="x-shadow-host-root-1-light"></div>
+      </div>
     </div>
   </div>
 </template>
@@ -266,7 +354,11 @@
   <content></content>
   <div>
     <div shadow-template-id="x-shadow-host-root-0-0">
-      <div shadow-template-id="x-shadow-host-root-0-0-light"></div>
+      <div>
+        <div>
+          <div shadow-template-id="x-shadow-host-root-0-0-light"></div>
+        </div>
+      </div>
     </div>
   </div>
   <div shadow-template-id="x-shadow-host-root-0-1">
@@ -292,21 +384,37 @@
   <content></content>
   <div>
     <div shadow-template-id="x-shadow-host-root-1-0">
-      <div shadow-template-id="x-shadow-host-root-1-0-light"></div>
+      <div>
+        <div>
+          <div shadow-template-id="x-shadow-host-root-1-0-light"></div>
+        </div>
+      </div>
     </div>
   </div>
   <div>
     <div>
       <div>
         <div shadow-template-id="x-shadow-host-root-1-1">
-          <div shadow-template-id="x-shadow-host-root-1-1-light"></div>
+          <div>
+            <div shadow-template-id="x-shadow-host-root-1-1-light"></div>
+          </div>
         </div>
       </div>
     </div>
   </div>
 </template>
 
-<template id="x-shadow-host-root-1-light"></template>
+<template id="x-shadow-host-root-1-light">
+  <content></content>
+  <div shadow-template-id="x-shadow-host-root-1-light-0"></div>
+  <div>
+    <div shadow-template-id="x-shadow-host-root-1-light-1"></div>
+  </div>
+</template>
+
+<template id="x-shadow-host-root-1-light-0"></template>
+
+<template id="x-shadow-host-root-1-light-1"></template>
 
 <template id="x-shadow-host-root-1-0">
   <content></content>

From f101d3dcb57575a24a2cb688435f235ce6db4236 Mon Sep 17 00:00:00 2001
From: Daniel Freedman <dfreedm@google.com>
Date: Tue, 15 Dec 2015 11:43:25 -0800
Subject: [PATCH 02/12] Fix safari 9 webgl wrappers

Safari 9 added moved all the good stuff from WebGLRenderingContext to a new
prototype, WebGLRenderingContextBase, which exposed to window.

This change mixes the WebGLRenderingContextBase properties and methods into
WebGLRenderingContext

Fixes #414
---
 src/ShadowDOM/wrappers.js                       |  1 +
 src/ShadowDOM/wrappers/WebGLRenderingContext.js | 11 +++++++++++
 tests/ShadowDOM/js/HTMLCanvasElement.js         |  1 +
 3 files changed, 13 insertions(+)

diff --git a/src/ShadowDOM/wrappers.js b/src/ShadowDOM/wrappers.js
index 82768244b..e0738364a 100644
--- a/src/ShadowDOM/wrappers.js
+++ b/src/ShadowDOM/wrappers.js
@@ -431,6 +431,7 @@ window.ShadowDOMPolyfill = {};
     });
   }
 
+  scope.addForwardingProperties = addForwardingProperties;
   scope.assert = assert;
   scope.constructorTable = constructorTable;
   scope.defineGetter = defineGetter;
diff --git a/src/ShadowDOM/wrappers/WebGLRenderingContext.js b/src/ShadowDOM/wrappers/WebGLRenderingContext.js
index 1ec867cbe..c912b14b7 100644
--- a/src/ShadowDOM/wrappers/WebGLRenderingContext.js
+++ b/src/ShadowDOM/wrappers/WebGLRenderingContext.js
@@ -11,6 +11,7 @@
 (function(scope) {
   'use strict';
 
+  var addForwardingProperties = scope.addForwardingProperties;
   var mixin = scope.mixin;
   var registerWrapper = scope.registerWrapper;
   var setWrapper = scope.setWrapper;
@@ -24,6 +25,7 @@
   if (!OriginalWebGLRenderingContext)
     return;
 
+
   function WebGLRenderingContext(impl) {
     setWrapper(impl, this);
   }
@@ -44,6 +46,15 @@
     }
   });
 
+  // WebKit has two additional prototypes in the chain for WebGLRenderingContext which are not exposed on `window`: WebGLRenderingContextBase and CanvasRenderingContextBase.
+  // CanvasRenderingContextBase has only one getter `canvas`, which is taken care of already, so we skip it.
+
+  var OriginalWebGLRenderingContextBase = Object.getPrototypeOf(OriginalWebGLRenderingContext.prototype);
+
+  if (OriginalWebGLRenderingContextBase !== Object.prototype) {
+    addForwardingProperties(OriginalWebGLRenderingContextBase, WebGLRenderingContext.prototype);
+  }
+
   // Blink/WebKit has broken DOM bindings. Usually we would create an instance
   // of the object and pass it into registerWrapper as a "blueprint" but
   // creating WebGL contexts is expensive and might fail so we use a dummy
diff --git a/tests/ShadowDOM/js/HTMLCanvasElement.js b/tests/ShadowDOM/js/HTMLCanvasElement.js
index d8de9d510..4a2d67e68 100644
--- a/tests/ShadowDOM/js/HTMLCanvasElement.js
+++ b/tests/ShadowDOM/js/HTMLCanvasElement.js
@@ -113,6 +113,7 @@ suite('HTMLCanvasElement', function() {
     try {
       gl = canvas.getContext('webgl');
     } catch (ex) {
+      console.error(ex);
     }
     // IE10 does not have WebGL.
     // Chrome returns null if the graphics card is not supported

From 0608ce84c6286b01c1b73f734f112dadecc74e7a Mon Sep 17 00:00:00 2001
From: Daniel Freedman <dfreedm@google.com>
Date: Tue, 15 Dec 2015 11:46:42 -0800
Subject: [PATCH 03/12] [skip ci] remove extra space

---
 src/ShadowDOM/wrappers/WebGLRenderingContext.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/ShadowDOM/wrappers/WebGLRenderingContext.js b/src/ShadowDOM/wrappers/WebGLRenderingContext.js
index c912b14b7..223a36052 100644
--- a/src/ShadowDOM/wrappers/WebGLRenderingContext.js
+++ b/src/ShadowDOM/wrappers/WebGLRenderingContext.js
@@ -25,7 +25,6 @@
   if (!OriginalWebGLRenderingContext)
     return;
 
-
   function WebGLRenderingContext(impl) {
     setWrapper(impl, this);
   }

From 82964dec42a7f6af70142b1bbf3bc4ca16bf1bcf Mon Sep 17 00:00:00 2001
From: Daniel Freedman <dfreedm@google.com>
Date: Fri, 13 Nov 2015 16:22:57 -0800
Subject: [PATCH 04/12] Fix WebComponents tests status

- Removed some unnecessary tests
- Accounted for some platform oddities
- Disabled MutationObserver tests for platforms with native MutationObserver

Results:
- 100% green in firefox and chrome
- HTMLTemplateElement errors in CustomElements tests (missing import)
- Expected ShadowDOM webgl errors in Safari 9
---
 bower.json                                    |  2 +-
 src/HTMLImports/base.js                       |  1 +
 .../html/HTMLImportsLoaded-native.html        | 16 +++---
 .../html/dynamic-loaded-detail.html           | 51 -------------------
 tests/HTMLImports/html/template-script.html   | 30 -----------
 tests/HTMLImports/runner.html                 |  3 +-
 tests/ShadowCSS/html/combinators.html         |  2 +-
 tests/ShadowDOM/js/events.js                  |  2 +
 tests/Template/html/Template.html             |  4 +-
 tests/Template/tests.html                     |  4 +-
 tests/WeakMap/tests.html                      |  8 ++-
 .../html/ce-import-upgrade-async.html         |  4 +-
 .../WebComponents/html/ce-import-upgrade.html |  4 +-
 tests/runner.html                             | 12 +++--
 14 files changed, 42 insertions(+), 101 deletions(-)
 delete mode 100644 tests/HTMLImports/html/dynamic-loaded-detail.html
 delete mode 100644 tests/HTMLImports/html/template-script.html

diff --git a/bower.json b/bower.json
index bdef97a57..8ff26d674 100644
--- a/bower.json
+++ b/bower.json
@@ -16,6 +16,6 @@
   "license": "BSD",
   "ignore": [],
   "devDependencies": {
-    "web-component-tester": "~3.3.10"
+    "web-component-tester": "3.4"
   }
 }
diff --git a/src/HTMLImports/base.js b/src/HTMLImports/base.js
index 5c20e08ec..c1929e9a7 100644
--- a/src/HTMLImports/base.js
+++ b/src/HTMLImports/base.js
@@ -139,6 +139,7 @@ function watchImportsLoad(callback, doc) {
   if (importCount) {
     for (var i=0, imp; i<importCount && (imp=imports[i]); i++) {
       if (isImportLoaded(imp)) {
+        newImports.push(this);
         parsedCount++;
         checkDone();
       } else {
diff --git a/tests/HTMLImports/html/HTMLImportsLoaded-native.html b/tests/HTMLImports/html/HTMLImportsLoaded-native.html
index e59295b84..09af6239b 100644
--- a/tests/HTMLImports/html/HTMLImportsLoaded-native.html
+++ b/tests/HTMLImports/html/HTMLImportsLoaded-native.html
@@ -12,20 +12,22 @@
   <head>
     <title>HTMLImportsLoaded, native</title>
     <script>WCT = {waitFor: function(cb){ cb() }}</script>
+    <script>
+      var loaded = false;
+      addEventListener('HTMLImportsLoaded', function(e) {
+        loaded = true;
+      });
+    </script>
     <script src="../../../src/HTMLImports/HTMLImports.js"></script>
     <script src="../../../../web-component-tester/browser.js"></script>
   </head>
   <body>
     <link rel="import" href="imports/import-1.html">
     <script>
-      test('HTMLImportsLoaded fires with native imports', function(done) {
-        if (!HTMLImports.useNative) {
-          return done();
+      test('HTMLImportsLoaded fires with native imports', function() {
+        if (HTMLImports.useNative) {
+          assert.isTrue(loaded);
         }
-        addEventListener('HTMLImportsLoaded', function(e) {
-          chai.assert.ok(true, 'HTMLImportsLoaded');
-          done();
-        });
       });
     </script>
   </body>
diff --git a/tests/HTMLImports/html/dynamic-loaded-detail.html b/tests/HTMLImports/html/dynamic-loaded-detail.html
deleted file mode 100644
index bd182cfab..000000000
--- a/tests/HTMLImports/html/dynamic-loaded-detail.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!doctype html>
-<!--
-    @license
-    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-    Code distributed by Google as part of the polymer project is also
-    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
--->
-<html>
-  <head>
-    <title>HTML Imports Dynamic</title>
-    <script src="../../../src/HTMLImports/HTMLImports.js"></script>
-    <script src="../../../../web-component-tester/browser.js"></script>
-  </head>
-  <body>
-
-    <script>
-      var loads = 0;
-      document.addEventListener('DOMContentLoaded', function() {
-        // some time later
-        setTimeout(function() {
-          var div = document.createElement('div');
-          div.innerHTML = '<link rel="import" href="imports/load-1.html">' +
-              '<link rel="import" href="imports/load-2.html">';
-          document.body.appendChild(div);
-          var ports = document.querySelectorAll('link[rel=import]');
-          for (var i=0, l=ports.length, n; (i<l) && (n=ports[i]); i++) {
-            n.addEventListener('load', function(e) {
-              loads++;
-            });
-          }
-        });
-      });
-
-      test('dynamic loaded details', function(done) {
-        HTMLImports.whenReady(function(detail) {
-          chai.assert.equal(detail.allImports.length, 2);
-          chai.assert.equal(detail.errorImports.length, 0);
-          chai.assert.equal(detail.loadedImports.length, 2);
-
-          chai.expect(detail.loadedImports[0].href).to.contain('imports/load-1.html');
-          chai.expect(detail.loadedImports[1].href).to.contain('imports/load-2.html');
-
-          done();
-        });
-      });
-    </script>
-  </body>
-</html>
diff --git a/tests/HTMLImports/html/template-script.html b/tests/HTMLImports/html/template-script.html
deleted file mode 100644
index 7c64825d6..000000000
--- a/tests/HTMLImports/html/template-script.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!doctype html>
-<!--
-    @license
-    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-    Code distributed by Google as part of the polymer project is also
-    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
--->
-<html>
-  <head>
-    <title>template script test</title>
-    <script src="../../../src/HTMLImports/HTMLImports.js"></script>
-    <script src="../../../../web-component-tester/browser.js"></script>
-    <link rel="import" href="imports/template-import.html">
-  </head>
-  <body>
-    <script>
-      test('scripts inside templates execute', function() {
-        var link = document.querySelector('link');
-        var template = link.import.querySelector('template');
-        chai.assert.ok(template, 'found import template');
-        var content = template.content || template;
-        document.body.appendChild(content.cloneNode(true));
-        chai.assert.ok(window.executedTemplateScript, 'executedTemplateScript');
-      });
-    </script>
-  </body>
-</html>
diff --git a/tests/HTMLImports/runner.html b/tests/HTMLImports/runner.html
index a1f816afc..8a43c60ad 100644
--- a/tests/HTMLImports/runner.html
+++ b/tests/HTMLImports/runner.html
@@ -14,6 +14,7 @@
 <!-- HTMLImports -->
 <script>
   WCT = {
+    environmentImports: [],
     waitFor: function(callback) {
       this.HTMLImports.whenReady(callback);
     }
@@ -36,11 +37,9 @@
   'html/dynamic.html',
   'html/dynamic-all-imports-detail.html',
   'html/dynamic-errors-detail.html',
-  'html/dynamic-loaded-detail.html',
   'html/csp.html',
   'html/customevent-detail.html',
   'html/encoding.html',
-  'html/template-script.html',
   'html/HTMLImportsLoaded-native.html',
   ];
   // NOTE: The MO polyfill does not function on disconnected documents
diff --git a/tests/ShadowCSS/html/combinators.html b/tests/ShadowCSS/html/combinators.html
index 6357ebe0b..a14330d5c 100644
--- a/tests/ShadowCSS/html/combinators.html
+++ b/tests/ShadowCSS/html/combinators.html
@@ -14,7 +14,7 @@
   <title>Using combinators styling</title>
   <script src="../../../../web-component-tester/browser.js"></script>
 
-  <script src="../../../webcomponents.js"></script>
+  <script src="../../../webcomponents.js" shadow="polyfill"></script>
   <script src="register.js"></script>
   <style shim-shadowdom>
     x-foo ^ .foo {
diff --git a/tests/ShadowDOM/js/events.js b/tests/ShadowDOM/js/events.js
index 89191c6c8..d3814aff4 100644
--- a/tests/ShadowDOM/js/events.js
+++ b/tests/ShadowDOM/js/events.js
@@ -1418,6 +1418,8 @@ test('retarget order (multiple shadow roots)', function() {
     };
 
     var error = new Error(msg);
+    // tell WCT to ignore this error
+    error.ignore = true;
     document.addEventListener('click', f = function(e) {
       throw error;
     });
diff --git a/tests/Template/html/Template.html b/tests/Template/html/Template.html
index be9836891..f3379b42b 100644
--- a/tests/Template/html/Template.html
+++ b/tests/Template/html/Template.html
@@ -59,10 +59,12 @@
 
         s = '-<->-"-&-';
         var escaped = '-&lt;-&gt;-"-&amp;-';
+        var div = document.createElement('div');
+        div.innerHTML = s
         imp.innerHTML = s;
         // innerHTML is properly escaped
         chai.assert.equal(imp.innerHTML, escaped);
-        chai.assert.equal(imp.content.childNodes.length, 1);
+        chai.assert.equal(imp.content.childNodes.length, div.childNodes.length);
         done();
       });
     </script>
diff --git a/tests/Template/tests.html b/tests/Template/tests.html
index b0e13385b..743f23002 100644
--- a/tests/Template/tests.html
+++ b/tests/Template/tests.html
@@ -56,10 +56,12 @@
 
           s = '-<->-"-&-';
           var escaped = '-&lt;-&gt;-"-&amp;-';
+          var div = document.createElement('div');
           imp.innerHTML = s;
+          div.innerHTML = s;
           // innerHTML is properly escaped
           assert.equal(imp.innerHTML, escaped);
-          assert.equal(imp.content.childNodes.length, 1);
+          assert.equal(imp.content.childNodes.length, div.childNodes.length);
         });
       });
     </script>
diff --git a/tests/WeakMap/tests.html b/tests/WeakMap/tests.html
index 72aec3042..d40426e9d 100644
--- a/tests/WeakMap/tests.html
+++ b/tests/WeakMap/tests.html
@@ -32,7 +32,13 @@
       var o2 = function(){};
       var o3 = window;
 
-      wm.set(o1, 37).set(o2, 'aoeui');
+      // IE 11 WeakMap does not chain
+      if (wm.name || !/Trident/.test(navigator.userAgent)) {
+        wm.set(o1, 37).set(o2, 'aoeui');
+      } else {
+        wm.set(o1, 37);
+        wm.set(o2, 'aoeui');
+      }
 
       assert.equal(wm.get(o1), 37);
       assert.equal(wm.get(o2), 'aoeui');
diff --git a/tests/WebComponents/html/ce-import-upgrade-async.html b/tests/WebComponents/html/ce-import-upgrade-async.html
index e5b13f631..122801a26 100644
--- a/tests/WebComponents/html/ce-import-upgrade-async.html
+++ b/tests/WebComponents/html/ce-import-upgrade-async.html
@@ -26,7 +26,9 @@
           // order expected
           assert.deepEqual(a1DocsList, ['a1-instance.html', 'a1-reference.html']);
           // style applied at upgrade time
-          assert.isTrue(styleAppliedToDocument);
+          if (!HTMLImports.useNative) {
+            assert.isTrue(styleAppliedToDocument);
+          }
           done();
         }
 
diff --git a/tests/WebComponents/html/ce-import-upgrade.html b/tests/WebComponents/html/ce-import-upgrade.html
index c43a55fa1..6f3a43843 100644
--- a/tests/WebComponents/html/ce-import-upgrade.html
+++ b/tests/WebComponents/html/ce-import-upgrade.html
@@ -25,7 +25,9 @@
         // order expected
         assert.deepEqual(a1DocsList, ['a1-instance.html', 'a1-reference.html']);
         // style applied at upgrade time
-        assert.isTrue(styleAppliedToDocument);
+        if (!HTMLImports.useNative) {
+          assert.isTrue(styleAppliedToDocument);
+        }
       });
     </script>
   </body>
diff --git a/tests/runner.html b/tests/runner.html
index d2603ed74..3ea3d93ba 100644
--- a/tests/runner.html
+++ b/tests/runner.html
@@ -15,14 +15,18 @@
 <script src="../../web-component-tester/browser.js"></script>
 
 <script>
-  WCT.loadSuites([
+  var suites = [
     'WeakMap/tests.html',
-    'MutationObserver/tests.html',
-    'HTMLImports/runner.html',
     'Template/runner.html',
+    'HTMLImports/runner.html',
     'CustomElements/runner.html',
     'ShadowDOM/runner.html',
     'ShadowCSS/runner.html',
     'WebComponents/runner.html'
-  ]);
+  ];
+  // MutationObserver tests can be false-failing with native MO
+  if (!window.MutationObserver) {
+    suites.splice(1, 0, 'MutationObserver/tests.html');
+  }
+  WCT.loadSuites(suites);
 </script>

From 2255a95a3f717927e92008df8f968137f34aa392 Mon Sep 17 00:00:00 2001
From: Daniel Freedman <dfreedm@google.com>
Date: Mon, 16 Nov 2015 15:58:36 -0800
Subject: [PATCH 05/12] actually dispatch the event :P

---
 tests/WebComponents/html/dom.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/WebComponents/html/dom.html b/tests/WebComponents/html/dom.html
index 886c6de2b..7d32d7e1a 100644
--- a/tests/WebComponents/html/dom.html
+++ b/tests/WebComponents/html/dom.html
@@ -102,7 +102,6 @@
     test('dispatch and prevent', function() {
       var el = document.createElement('div');
       document.body.appendChild(el);
-      var e = new CustomEvent('foo', {cancelable: true, bubbles: true});
       var fn = function(e) {
         e.preventDefault();
       };
@@ -113,6 +112,8 @@
       };
       el.addEventListener('foo', fn);
       document.body.addEventListener('foo', check);
+      var e = new CustomEvent('foo', {cancelable: true, bubbles: true});
+      el.dispatchEvent(e);
       assert.isTrue(e.defaultPrevented);
     });
   });

From d95b11d68fa0b1c3f90f8657383f35827d73ac3e Mon Sep 17 00:00:00 2001
From: Daniel Freedman <dfreedm@google.com>
Date: Wed, 18 Nov 2015 10:10:24 -0800
Subject: [PATCH 06/12] simpler travis config

---
 .travis.yml | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 86007f00b..1a215dba6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +1,18 @@
 language: node_js
 sudo: false
-matrix:
-  include:
-  - node_js: stable
-    script: xvfb-run wct
-    addons:
-      firefox: latest
-      apt:
-        sources:
-        - google-chrome
-        packages:
-        - google-chrome-stable
-  - node_js: node
-    script:
-    - |
-      if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then
-        wct -s 'default'
-      fi
+node_js: 4
+addons:
+  firefox: '42.0'
+  apt:
+    sources:
+    - google-chrome
+    packages:
+    - google-chrome-stable
 before_script:
 - export PATH=$PWD/node_modules/.bin:$PATH
+script:
+- xvfb-run wct
+- "if [ \"${TRAVIS_PULL_REQUEST}\" = \"false\" ]; then wct -s 'default'; fi"
 env:
   global:
   - secure: c0kVrjNDtqd06Gyg4Xi3iopr0KCz1k0LbZeL+TCbnyCdmAE7m9FcJASWvM2Zr7d774hTiMSi0Z79SlV6XZhLN2pi4EsbdEpsnVeAXXH/GYzDKgpXbdfD/nQv4n1nMXL6XSaZkAX7WwgmrjzJ9cXQJYV9vNHIBRcGoVRRyCFx9v4=

From 698e8e429dc1bf1919ba646e195b79080778c32d Mon Sep 17 00:00:00 2001
From: Daniel Freedman <dfreedm@google.com>
Date: Thu, 19 Nov 2015 14:10:34 -0800
Subject: [PATCH 07/12] [skip ci] update travis config to firefox latest

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1a215dba6..09b06bab6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: node_js
 sudo: false
 node_js: 4
 addons:
-  firefox: '42.0'
+  firefox: latest
   apt:
     sources:
     - google-chrome

From 3efad399c084d90b895850e936e4323ccdef7ed8 Mon Sep 17 00:00:00 2001
From: Daniel Freedman <dfreedm@google.com>
Date: Tue, 15 Dec 2015 15:26:57 -0800
Subject: [PATCH 08/12] Use WCT 4

Fix travis for building on modern node
Fix Template HTMLImports loading dependence in wct 4
---
 .travis.yml                   | 7 ++++---
 bower.json                    | 2 +-
 package.json                  | 5 ++++-
 tests/HTMLImports/runner.html | 1 -
 tests/Template/imports.html   | 7 +++++++
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 09b06bab6..4e4ccbff1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,15 @@
 language: node_js
 sudo: false
-node_js: 4
+node_js: stable
 addons:
   firefox: latest
   apt:
     sources:
     - google-chrome
+    - ubuntu-toolchain-r-test
     packages:
     - google-chrome-stable
-before_script:
-- export PATH=$PWD/node_modules/.bin:$PATH
+    - g++-4.8
 script:
 - xvfb-run wct
 - "if [ \"${TRAVIS_PULL_REQUEST}\" = \"false\" ]; then wct -s 'default'; fi"
@@ -17,3 +17,4 @@ env:
   global:
   - secure: c0kVrjNDtqd06Gyg4Xi3iopr0KCz1k0LbZeL+TCbnyCdmAE7m9FcJASWvM2Zr7d774hTiMSi0Z79SlV6XZhLN2pi4EsbdEpsnVeAXXH/GYzDKgpXbdfD/nQv4n1nMXL6XSaZkAX7WwgmrjzJ9cXQJYV9vNHIBRcGoVRRyCFx9v4=
   - secure: Mo+AVRGUmlDENnZ2GioF5pU62WhyLUMnPlSqzeodZzJoAnwcNr9VnHiRCgQBLnHCZwjbMv6C0vhWopY7lN9w77vlS5vr8MDZKjYT/YRl9jk0+hStJ+diSS9MD+FnNNerXe+V+WA6NYVHno3vdWRqDDMYzCdH/pyLukkuKdMFaAU=
+  - CXX=g++-4.8
diff --git a/bower.json b/bower.json
index 8ff26d674..9cee35af4 100644
--- a/bower.json
+++ b/bower.json
@@ -16,6 +16,6 @@
   "license": "BSD",
   "ignore": [],
   "devDependencies": {
-    "web-component-tester": "3.4"
+    "web-component-tester": "^4.0.1"
   }
 }
diff --git a/package.json b/package.json
index e62ee5af9..1661f2c55 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,9 @@
   "bugs": {
     "url": "https://github.com/webcomponents/webcomponentsjs/issues"
   },
+  "scripts": {
+    "test": "wct"
+  },
   "homepage": "http://webcomponents.org",
   "devDependencies": {
     "gulp": "^3.8.8",
@@ -23,6 +26,6 @@
     "gulp-header": "^1.1.1",
     "gulp-uglify": "^1.0.1",
     "run-sequence": "^1.0.1",
-    "web-component-tester": "^3"
+    "web-component-tester": "^4.0.1"
   }
 }
diff --git a/tests/HTMLImports/runner.html b/tests/HTMLImports/runner.html
index 8a43c60ad..8c21423b5 100644
--- a/tests/HTMLImports/runner.html
+++ b/tests/HTMLImports/runner.html
@@ -14,7 +14,6 @@
 <!-- HTMLImports -->
 <script>
   WCT = {
-    environmentImports: [],
     waitFor: function(callback) {
       this.HTMLImports.whenReady(callback);
     }
diff --git a/tests/Template/imports.html b/tests/Template/imports.html
index 591b38c33..a51cfc568 100644
--- a/tests/Template/imports.html
+++ b/tests/Template/imports.html
@@ -13,6 +13,13 @@
     <title>Template with HTMLImports Test</title>
     <script src="../../src/Template/Template.js"></script>
     <script src="../../src/HTMLImports/HTMLImports.js"></script>
+    <script>
+      WCT = {
+        waitFor: function(callback) {
+          this.HTMLImports.whenReady(callback);
+        }
+      };
+    </script>
     <script src="../../../web-component-tester/browser.js"></script>
   </head>
   <body>

From 2dae0fb8140624a35ce15aac23e375cc289f9172 Mon Sep 17 00:00:00 2001
From: Daniel Freedman <dfreedm@google.com>
Date: Tue, 15 Dec 2015 15:33:30 -0800
Subject: [PATCH 09/12] put the PATH munging back

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 4e4ccbff1..309eae8c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,8 @@ addons:
     packages:
     - google-chrome-stable
     - g++-4.8
+before_script:
+- export PATH=$PWD/node_modules/.bin:$PATH
 script:
 - xvfb-run wct
 - "if [ \"${TRAVIS_PULL_REQUEST}\" = \"false\" ]; then wct -s 'default'; fi"

From eff142429ece1b0baf47873e7ad4cd4647afb66b Mon Sep 17 00:00:00 2001
From: Daniel Freedman <dfreedm@google.com>
Date: Tue, 15 Dec 2015 17:04:18 -0800
Subject: [PATCH 10/12] use node 4 for now

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 309eae8c2..dbc98cc41 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 sudo: false
-node_js: stable
+node_js: 4
 addons:
   firefox: latest
   apt:

From d405e3c2faced418f6b05ff18c6b4fd25c9d75ee Mon Sep 17 00:00:00 2001
From: Daniel Freedman <dfreedm@google.com>
Date: Tue, 15 Dec 2015 17:07:44 -0800
Subject: [PATCH 11/12] use travis sauce_connect

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index dbc98cc41..bafba95ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ language: node_js
 sudo: false
 node_js: 4
 addons:
+  sauce_connect: true
   firefox: latest
   apt:
     sources:

From 5f1284369eb57e94ca4e88d5d71ceaeb65d1c569 Mon Sep 17 00:00:00 2001
From: Daniel Freedman <dfreedm@google.com>
Date: Tue, 15 Dec 2015 17:25:55 -0800
Subject: [PATCH 12/12] prepare for release v0.7.20

---
 bower.json   | 2 +-
 package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bower.json b/bower.json
index 9cee35af4..8bcb0c1c9 100644
--- a/bower.json
+++ b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "webcomponentsjs",
   "main": "webcomponents.js",
-  "version": "0.7.19",
+  "version": "0.7.20",
   "homepage": "http://webcomponents.org",
   "authors": [
     "The Polymer Authors"
diff --git a/package.json b/package.json
index 1661f2c55..c1262d7d2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webcomponents.js",
-  "version": "0.7.19",
+  "version": "0.7.20",
   "description": "webcomponents.js",
   "main": "webcomponents.js",
   "directories": {