fix unit tests

QwikDev · Aug 23, 2024 · c22ec87 · c22ec87
1 parent ea46d47
commit c22ec87
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/packages/qwik/src/core/v2/tests/container.spec.tsx b/packages/qwik/src/core/v2/tests/container.spec.tsx
@@ -329,7 +329,9 @@ describe('serializer v2', () => {
  expect(qrl1._devOnlySymbolRef).toEqual((obj[1] as any)._devOnlySymbolRef);
  expect(qrl2.$hash$).toEqual(obj[2].$hash$);
  expect(qrl2.$captureRef$).toEqual(obj[2].$captureRef$);
- expect(qrl2._devOnlySymbolRef).toEqual((obj[2] as any)._devOnlySymbolRef);
+ expect(qrl2._devOnlySymbolRef.toString()).toEqual(
+ (obj[2] as any)._devOnlySymbolRef.toString()
+ );
  });
  });
 

diff --git a/packages/qwik/src/core/v2/tests/render-api.spec.tsx b/packages/qwik/src/core/v2/tests/render-api.spec.tsx
@@ -488,8 +488,8 @@ describe('render api', () => {
  const document = createDocument(result.html);
  const qwikFuncScriptElements = document.querySelectorAll('script[q\\:func=qwik/json]');
  expect(qwikFuncScriptElements).toHaveLength(1);
- expect(qwikFuncScriptElements[0].textContent).toEqual(
- 'document.currentScript.closest("[q\\\\:container]").qFuncs=[(p0)=>p0.value]'
+ expect(qwikFuncScriptElements[0].textContent).toMatch(
+ /document\["qFuncs_(\w{11})"\]=\[\(p0\)=>p0\.value\]/
  );
  });
  });

diff --git a/packages/qwik/src/server/v2-ssr-container.ts b/packages/qwik/src/server/v2-ssr-container.ts
@@ -88,6 +88,7 @@ import {
  vNodeData_openFragment,
  type VNodeData,
 } from './v2-vnode-data';
+import { QInstance } from '../core/util/markers';
 
 export function ssrCreateContainer(
  opts: {
@@ -204,6 +205,7 @@ class SSRContainer extends _SharedContainer implements ISSRContainer {
  private unclaimedProjections: Array<ISsrComponentFrame | string | JSXChildren> = [];
  unclaimedProjectionComponentFrameQueue: Array<ISsrComponentFrame> = [];
  private cleanupQueue: CleanupQueue = [];
+ private instanceHash = hash();
 
  constructor(opts: Required<Required<Parameters<typeof ssrCreateContainer>>[0]>) {
  super(
@@ -296,19 +298,18 @@ class SSRContainer extends _SharedContainer implements ISSRContainer {
  if (this.tag == 'html') {
  this.write('<!DOCTYPE html>');
  }
- let qRender = isDev ? 'ssr-dev' : 'ssr';
- if (this.renderOptions.containerAttributes?.[QRenderAttr]) {
- qRender = `${this.renderOptions.containerAttributes[QRenderAttr]}-${qRender}`;
- }
+
+ const qRender = this.renderOptions.containerAttributes?.[QRenderAttr];
  const containerAttributes: Record<string, string> = {
  ...this.renderOptions.containerAttributes,
  [QRuntimeAttr]: '2',
  [QContainerAttr]: QContainerValue.PAUSED,
  [QVersionAttr]: this.$version$ ?? 'dev',
- [QRenderAttr]: qRender,
+ [QRenderAttr]: (qRender ? qRender + '-' : '') + (isDev ? 'ssr-dev' : 'ssr'),
  [QBaseAttr]: this.buildBase,
  [QLocaleAttr]: this.$locale$,
  [QManifestHashAttr]: this.resolvedManifest.manifest.manifestHash,
+ [QInstance]: this.instanceHash,
  };
 
  const containerAttributeArray = Object.entries(containerAttributes).reduce<string[]>(
@@ -757,7 +758,7 @@ class SSRContainer extends _SharedContainer implements ISSRContainer {
  scriptAttrs.push('nonce', this.renderOptions.serverData.nonce);
  }
  this.openElement('script', scriptAttrs);
- this.write(Q_FUNCS_PREFIX);
+ this.write(Q_FUNCS_PREFIX.replace('HASH', this.instanceHash));
  this.write('[');
  this.writeArray(fns, ',');
  this.write(']');
@@ -1133,3 +1134,7 @@ const unsafeAttrCharRE = /[>/="'\u0009\u000a\u000c\u0020]/; // eslint-disable-li
 function isSSRUnsafeAttr(name: string): boolean {
  return unsafeAttrCharRE.test(name);
 }
+
+function hash() {
+ return Math.random().toString(36).slice(2);
+}