server-lib bugfix: need scopingRoot

ampproject · Sep 28, 2021 · ef101d8 · ef101d8
1 parent 95ba4b8
commit ef101d8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/test/htmlelement/querySelectorAll.test.ts b/src/test/htmlelement/querySelectorAll.test.ts
@@ -39,6 +39,23 @@ test('test Element.querySelectorAll on id selectors', (t) => {
   t.deepEqual(document.querySelectorAll(`#${DIV_ID}`), [div]);
 });
 
+// TODO: create better solution for parameterizing server tests.
+test.serial('server=true: test Element.querySelectorAll on id selectors', (t) => {
+  process.env.SERVER = 'true';
+  try {
+    const document = createTestingDocument();
+    const testEl = document.createElement('test-el');
+    const id = 'TEST_EL_ID';
+    testEl.setAttribute('id', id);
+    document.appendChild(testEl);
+
+    const result = document.querySelectorAll(`#${id}`);
+    t.deepEqual(result, [testEl]);
+  } finally {
+    delete process.env.SERVER;
+  }
+});
+
 test('test Element.querySelectorAll on class selectors', (t) => {
   const { document, div } = t.context;
 

diff --git a/src/worker-thread/dom/Node.ts b/src/worker-thread/dom/Node.ts
@@ -52,11 +52,11 @@ export abstract class Node {
     this.nodeType = nodeType;
     this.nodeName = nodeName;
     this.ownerDocument = ownerDocument || this;
+    this[TransferrableKeys.scopingRoot] = this;
     if (process.env.SERVER) {
       return;
     }
 
-    this[TransferrableKeys.scopingRoot] = this;
     this[TransferrableKeys.index] = overrideIndex ? storeOverrideNodeMapping(this, overrideIndex) : storeNodeMapping(this);
     this[TransferrableKeys.transferredFormat] = [this[TransferrableKeys.index]];
   }