chore: update test

vuejs · Oct 25, 2024 · bff9e91 · bff9e91
1 parent 52b0b73
commit bff9e91
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 39 deletions.
diff --git a/packages/runtime-core/__tests__/hmr.spec.ts b/packages/runtime-core/__tests__/hmr.spec.ts
@@ -14,7 +14,6 @@ import {
 import * as runtimeTest from '@vue/runtime-test'
 import { createApp, registerRuntimeCompiler } from '@vue/runtime-test'
 import { baseCompile } from '@vue/compiler-core'
-import { createSSRApp } from '@vue/runtime-dom'
 
 declare var __VUE_HMR_RUNTIME__: HMRRuntime
 const { createRecord, rerender, reload } = __VUE_HMR_RUNTIME__
@@ -895,41 +894,4 @@ describe('hot module replacement', () => {
     await timeout()
     expect(serializeInner(root)).toBe('<div>bar</div>')
   })
-
-  /**
-   * @vitest-environment jsdom
-   */
-  test('reload child wrapped in KeepAlive', async () => {
-    const id = 'child-reload'
-    const Child: ComponentOptions = {
-      __hmrId: id,
-      render: compileToFunction(`<div>foo</div>`),
-    }
-    createRecord(id, Child)
-
-    const appId = 'test-app-id'
-    const App: ComponentOptions = {
-      __hmrId: appId,
-      components: { Child },
-      render: compileToFunction(`
-        <div>
-        <KeepAlive>
-          <Child />
-        </KeepAlive>
-      </div>
-      `),
-    }
-
-    const root = document.createElement('div')
-    root.innerHTML = runtimeTest.renderToString(h(App))
-    createSSRApp(App).mount(root)
-    expect(root.innerHTML).toBe('<div><div>foo</div></div>')
-
-    reload(id, {
-      __hmrId: id,
-      render: compileToFunction(`<div>bar</div>`),
-    })
-    await timeout()
-    expect(root.innerHTML).toBe('<div><div>bar</div></div>')
-  })
 })
diff --git a/packages/runtime-core/__tests__/hydration.spec.ts b/packages/runtime-core/__tests__/hydration.spec.ts
@@ -31,10 +31,14 @@ import {
   withCtx,
   withDirectives,
 } from '@vue/runtime-dom'
+import type { HMRRuntime } from '../src/hmr'
+
 import { type SSRContext, renderToString } from '@vue/server-renderer'
 import { PatchFlags, normalizeStyle } from '@vue/shared'
 import { vShowOriginalDisplay } from '../../runtime-dom/src/directives/vShow'
-import { expect } from 'vitest'
+
+declare var __VUE_HMR_RUNTIME__: HMRRuntime
+const { createRecord, reload } = __VUE_HMR_RUNTIME__
 
 function mountWithHydration(html: string, render: () => any) {
   const container = document.createElement('div')
@@ -1725,6 +1729,40 @@ describe('SSR hydration', () => {
     }
   })
 
+  test('hmr reload child wrapped in KeepAlive', async () => {
+    const id = 'child-reload'
+    const Child = {
+      __hmrId: id,
+      template: `<div>foo</div>`,
+    }
+    createRecord(id, Child)
+
+    const appId = 'test-app-id'
+    const App = {
+      __hmrId: appId,
+      components: { Child },
+      template: `
+      <div>
+        <KeepAlive>
+          <Child />
+        </KeepAlive>
+      </div>
+      `,
+    }
+
+    const root = document.createElement('div')
+    root.innerHTML = await renderToString(h(App))
+    createSSRApp(App).mount(root)
+    expect(root.innerHTML).toBe('<div><div>foo</div></div>')
+
+    reload(id, {
+      __hmrId: id,
+      template: `<div>bar</div>`,
+    })
+    await nextTick()
+    expect(root.innerHTML).toBe('<div><div>bar</div></div>')
+  })
+
   describe('mismatch handling', () => {
     test('text node', () => {
       const { container } = mountWithHydration(`foo`, () => 'bar')