fixed issue with content in light dom exceptioning (#329)

* fixed issue with content in light dom exceptioning * comments++ to polymer.dom and simpler traversal * deleted commented code
Polymer · Jun 23, 2016 · 0a56c4d · 0a56c4d
1 parent 1aff4fb
commit 0a56c4d
Show file tree

Hide file tree

Showing 8 changed files with 94 additions and 29 deletions.
diff --git a/bower.json b/bower.json
@@ -33,7 +33,7 @@
     "stacky": "^1.3.0",
     "test-fixture": "polymerelements/test-fixture#^1.0.0"
   },
-  "version": "4.3.0",
+  "version": "4.3.1",
   "devDependencies": {
     "polymer": "Polymer/polymer#^1.5.0",
     "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.22"

diff --git a/browser.js b/browser.js
diff --git a/browser.js.map b/browser.js.map
diff --git a/browser/mocha/replace.js b/browser/mocha/replace.js
@@ -76,6 +76,17 @@ extendInterfaces('replace', function(context, teardown) {
             }
 
             if (instanceParent) {
+              // Polymer's shady dom implementation goes through the insertion
+              // points and checks their parents. If the parent of a content
+              // tag has been stamped already, then Polymer.dom has to be aware
+              // of this content tag's parent. Additionally,
+              // Polymer.dom.appendChild does not seem to actually append the
+              // content nodes into the document fragment, so node.appendChild
+              // must also be called to actually insert the node.
+              if (instanceNode.tagName == 'CONTENT') {
+                Polymer.dom(instanceParent).appendChild(instanceNode);
+              }
+
               instanceParent.appendChild(instanceNode);
             }
 
@@ -84,26 +95,18 @@ extendInterfaces('replace', function(context, teardown) {
               instanceParent = instanceNode;
               templateNode = templateNode.firstChild;
 
-            // traverse laterally if you cannot traverse down
-            } else if (templateNode.nextSibling) {
-              templateNode = templateNode.nextSibling;
-
-            // if the parent is the dom, we are done
-            } else if (templateNode.parentNode === dom) {
-              instanceParent = instanceNode.parentNode;
-              return instanceParent;
-
             // traverse up
             } else {
               // traverse up until you can move laterally
               while (!templateNode.nextSibling) {
-                templateNode = templateNode.parentNode;
-                instanceParent = instanceParent.parentNode;
-
                 // stop traversing up if we are at the top
-                if (templateNode === dom) {
+                if (templateNode.parentNode === dom) {
                   return instanceParent;
+                } else {
+                  instanceParent = instanceParent.parentNode;
                 }
+
+                templateNode = templateNode.parentNode;
               }
 
               // traverse laterally

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "web-component-tester",
-  "version": "4.3.0",
+  "version": "4.3.1",
   "description": "web-component-tester makes testing your web components a breeze!",
   "keywords": [
     "browser",

diff --git a/test/fixtures/integration/multiple-replace/projection-element-2.html b/test/fixtures/integration/multiple-replace/projection-element-2.html
@@ -0,0 +1,10 @@
+<dom-module id="projection-element-2">
+  <template>
+    <content></content>
+  </template>
+  <script>
+    Polymer({
+      is: 'projection-element-2'
+    });
+  </script>
+</dom-module>
diff --git a/test/fixtures/integration/multiple-replace/projection-element.html b/test/fixtures/integration/multiple-replace/projection-element.html
@@ -0,0 +1,14 @@
+<link rel="import" href="projection-element-2.html">
+
+<dom-module id="projection-element">
+  <template>
+    <projection-element-2 id="customElement">
+      <content></content>
+    </projection-element-2>
+  </template>
+  <script>
+    Polymer({
+      is: 'projection-element'
+    });
+  </script>
+</dom-module>
diff --git a/test/fixtures/integration/multiple-replace/tests.html b/test/fixtures/integration/multiple-replace/tests.html
@@ -5,6 +5,8 @@
   <script src="../../../../browser.js"></script>
   <link rel="import" href="dom-if-element.html">
   <link rel="import" href="exception-fixture.html">
+  <link rel="import" href="projection-element.html">
+  <link rel="import" href="../../../../../paper-input/paper-input.html">
 </head>
 <body>
   <test-fixture id="DomIfTemplate">
@@ -19,6 +21,14 @@
     </template>
   </test-fixture>
 
+  <test-fixture id="ProjectionFixture">
+    <template>
+      <projection-element>
+        <div id="helloWorld">Hello World</div>
+      </projection-element>
+    </template>
+  </test-fixture>
+
   <script>
   'use strict';
 
@@ -89,6 +99,31 @@
       assert.equal(element4.nodeName, 'F');
     });
   });
+
+  describe('testing projected element replacement', function() {
+    var setupCorrectly = true;
+    var customElementChildren;
+
+    before(function() {
+      try {
+        replace('non-present-element').with('a-a');
+      } catch (err) {
+        setupCorrectly = false;
+      }
+
+      var template = fixture('ProjectionFixture');
+      customElementChildren = template.$.customElement.children;
+    });
+
+    after(function () {
+
+    });
+
+    it('double replace test', function() {
+      assert.isOk(setupCorrectly);
+      assert.equal(customElementChildren.length, 1);
+    });
+  });
   </script>
 
 </body>