Test polyfills

valdrinkoshi · valdrinkoshi · commit 2c5bce48eba2 · 2016-12-06T16:16:52.000-08:00
diff --git a/test-fixture.html b/test-fixture.html
@@ -235,12 +235,15 @@
 
     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();
       }
-      // Force synchrony in ShadyDOM in case we are dealing with the polyfill.
+      // 2. ShadyDOM polyfill.
       if (window.ShadyDOM) {
         window.ShadyDOM.flush();
       }
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
@@ -21,6 +21,10 @@
 <body>
   <script>
     (function() {
+      // Flag to enable takeRecords/flush for CustomElements v1 polyfill.
+      // https://github.com/webcomponents/custom-elements#differences-from-spec
+      customElements.enableFlush = true;
+
       function XCustom() {
         if (window.Reflect) {
           return Reflect.construct(HTMLElement, [], XCustom)
