Merge pull request #40 from PolymerElements/shady-dom-flush

valdrinkoshi · web-flow · commit 242e4ed15b0e · 2016-12-07T09:41:34.000-08:00
force synchrony for ShadyDOM
diff --git a/bower.json b/bower.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "web-component-tester": "^4.0.0",
     "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0",
-    "webcomponentsjs-v1": "webcomponents/webcomponentsjs#v1-polymer-edits"
+    "webcomponentsjs-v1": "webcomponents/webcomponentsjs#v1"
   },
   "main": "test-fixture.html",
   "ignore": []
diff --git a/test-fixture.html b/test-fixture.html
@@ -235,11 +235,18 @@
 
     forcePolyfillAttachedStateSynchrony: function () {
       // Force synchrony in attachedCallback and detachedCallback where
-      // implemented, in the event that we are dealing with the async Web
-      // Components Polyfill.
-      if (window.CustomElements && window.CustomElements.takeRecords) {
+      // implemented, in the event that we are dealing with one of these async
+      // polyfills:
+      // 1. Web Components CustomElements polyfill (v1 or v0).
+      if (window.customElements && window.customElements.flush) {
+        window.customElements.flush();
+      } else if (window.CustomElements && window.CustomElements.takeRecords) {
         window.CustomElements.takeRecords();
       }
+      // 2. ShadyDOM polyfill.
+      if (window.ShadyDOM) {
+        window.ShadyDOM.flush();
+      }
     },
 
     collectElementChildren: function (parent) {
diff --git a/test/index.html b/test/index.html
@@ -15,15 +15,15 @@
     <script src="../../webcomponentsjs/webcomponents-lite.js"></script>
     <script src="../../web-component-tester/browser.js"></script>
 
-    <link rel="import" href="../../polymer/polymer.html">
-
   </head>
   <body>
     <script>
       WCT.loadSuites([
-        'test-fixture.html',
-        'test-fixture-v1.html',
-        'handle-multiple-registrations.html'
+        'test-fixture.html', // shady
+        'test-fixture.html?dom=shadow', // shadow
+        'test-fixture-v1.html?wc-shadydom=true&wc-ce=true', // shady
+        'test-fixture-v1.html', // shadow
+        'handle-multiple-registrations.html',
       ]);
     </script>
   </body>
diff --git a/test/test-fixture-v1.html b/test/test-fixture-v1.html
@@ -12,6 +12,12 @@
 <head>
   <title>test-fixture</title>
 
+  <script>
+    // Save original HTMLElement constructor since customElements v1 polyfill
+    // overrides it https://github.com/webcomponents/webcomponentsjs/issues/623
+    var _HTMLElement = window.HTMLElement;
+  </script>
+
   <script src="../../webcomponentsjs-v1/webcomponents-lite.js"></script>
   <script src="../../web-component-tester/browser.js"></script>
 
@@ -173,7 +179,7 @@
 
     describe('for a dom with a single root element', function () {
       it('returns a reference to the root element', function () {
-        expect(el).to.be.instanceOf(HTMLElement);
+        expect(el).to.be.instanceOf(_HTMLElement);
       });
     });
 
@@ -192,8 +198,8 @@
 
       it('returns an array of root elements', function () {
         expect(els).to.be.instanceOf(Array);
-        expect(els[0]).to.be.instanceOf(HTMLElement);
-        expect(els[1]).to.be.instanceOf(HTMLElement);
+        expect(els[0]).to.be.instanceOf(_HTMLElement);
+        expect(els[1]).to.be.instanceOf(_HTMLElement);
       });
     });
 
@@ -211,10 +217,10 @@
 
       it('returns an array with elements grouped by template', function () {
         expect(groups).to.be.instanceOf(Array);
-        expect(groups[0]).to.be.instanceOf(HTMLElement);
+        expect(groups[0]).to.be.instanceOf(_HTMLElement);
         expect(groups[1]).to.be.instanceOf(Array);
-        expect(groups[1][0]).to.be.instanceOf(HTMLElement);
-        expect(groups[1][1]).to.be.instanceOf(HTMLElement);
+        expect(groups[1][0]).to.be.instanceOf(_HTMLElement);
+        expect(groups[1][1]).to.be.instanceOf(_HTMLElement);
       });
     });
 
@@ -228,7 +234,7 @@
       });
 
       it('returns a single element if the template has a single child', function() {
-        expect(el).to.be.instanceOf(HTMLElement);
+        expect(el).to.be.instanceOf(_HTMLElement);
       });
 
       it('returns multiple elements if the template has multiple children', function() {
