refactor(tests): port keepalive e2e tests to unit test

diff --git a/packages-private/vapor-e2e-test/__tests__/keepalive.spec.ts b/packages-private/vapor-e2e-test/__tests__/keepalive.spec.ts
deleted file mode 100644 (file)
index ab0607a..0000000
--- a/packages-private/vapor-e2e-test/__tests__/keepalive.spec.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import path from 'node:path'
-import {
-  E2E_TIMEOUT,
-  setupPuppeteer,
-} from '../../../packages/vue/__tests__/e2e/e2eUtils'
-import connect from 'connect'
-import sirv from 'sirv'
-const { page, html, click, value, enterValue } = setupPuppeteer()
-
-describe('vapor keepalive', () => {
-  let server: any
-  const port = '8197'
-  beforeAll(() => {
-    server = connect()
-      .use(sirv(path.resolve(import.meta.dirname, '../dist')))
-      .listen(port)
-    process.on('SIGTERM', () => server && server.close())
-  })
-
-  beforeEach(async () => {
-    const baseUrl = `http://localhost:${port}/keepalive/`
-    await page().goto(baseUrl)
-    await page().waitForSelector('#app')
-  })
-
-  afterAll(() => {
-    server.close()
-  })
-
-  test(
-    'render vdom component',
-    async () => {
-      const testSelector = '.render-vdom-component'
-      const btnShow = `${testSelector} .btn-show`
-      const btnToggle = `${testSelector} .btn-toggle`
-      const container = `${testSelector} > div`
-      const inputSelector = `${testSelector} input`
-
-      let calls = await page().evaluate(() => {
-        return (window as any).getCalls()
-      })
-      expect(calls).toStrictEqual(['mounted', 'activated'])
-
-      expect(await html(container)).toBe('<input type="text">')
-      expect(await value(inputSelector)).toBe('vdom')
-
-      // change input value
-      await enterValue(inputSelector, 'changed')
-      expect(await value(inputSelector)).toBe('changed')
-
-      // deactivate
-      await click(btnToggle)
-      expect(await html(container)).toBe('')
-      calls = await page().evaluate(() => {
-        return (window as any).getCalls()
-      })
-      expect(calls).toStrictEqual(['deactivated'])
-
-      // activate
-      await click(btnToggle)
-      expect(await html(container)).toBe('<input type="text">')
-      expect(await value(inputSelector)).toBe('changed')
-      calls = await page().evaluate(() => {
-        return (window as any).getCalls()
-      })
-      expect(calls).toStrictEqual(['activated'])
-
-      // unmount keepalive
-      await click(btnShow)
-      expect(await html(container)).toBe('')
-      calls = await page().evaluate(() => {
-        return (window as any).getCalls()
-      })
-      expect(calls).toStrictEqual(['deactivated', 'unmounted'])
-
-      // mount keepalive
-      await click(btnShow)
-      expect(await html(container)).toBe('<input type="text">')
-      expect(await value(inputSelector)).toBe('vdom')
-      calls = await page().evaluate(() => {
-        return (window as any).getCalls()
-      })
-      expect(calls).toStrictEqual(['mounted', 'activated'])
-    },
-    E2E_TIMEOUT,
-  )
-})

diff --git a/packages-private/vapor-e2e-test/index.html b/packages-private/vapor-e2e-test/index.html
index 7ae09c3b669efcd424fda9cf2ef8e3cf714d7481..3d5d2f932a8b3812741a2eb25988add0c8f6c942 100644 (file)
--- a/packages-private/vapor-e2e-test/index.html
+++ b/packages-private/vapor-e2e-test/index.html
@@ -1,6 +1,5 @@
 <a href="/interop/">VDOM / Vapor interop</a>
 <a href="/todomvc/">Vapor TodoMVC</a>
-<a href="/keepalive/">Vapor KeepAlive</a>
 <a href="/transition/">Vapor Transition</a>
 <a href="/transition-group/">Vapor TransitionGroup</a>
 
@@ -9,4 +8,4 @@
     display: block;
     margin: 10px;
   }
-</style>
+</style>
\ No newline at end of file

diff --git a/packages-private/vapor-e2e-test/keepalive/App.vue b/packages-private/vapor-e2e-test/keepalive/App.vue
deleted file mode 100644 (file)
index c388228..0000000
--- a/packages-private/vapor-e2e-test/keepalive/App.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-<script vapor>
-import { ref } from 'vue'
-import VdomComp from './components/VdomComp.vue'
-
-window.calls = []
-window.getCalls = () => {
-  const ret = window.calls.slice()
-  window.calls = []
-  return ret
-}
-
-const show = ref(true)
-const toggle = ref(true)
-</script>
-
-<template>
-  <div class="render-vdom-component">
-    <button class="btn-show" @click="show = !show">show</button>
-    <button class="btn-toggle" @click="toggle = !toggle">toggle</button>
-    <div>
-      <KeepAlive v-if="show">
-        <VdomComp v-if="toggle"></VdomComp>
-      </KeepAlive>
-    </div>
-  </div>
-</template>

diff --git a/packages-private/vapor-e2e-test/keepalive/components/VdomComp.vue b/packages-private/vapor-e2e-test/keepalive/components/VdomComp.vue
deleted file mode 100644 (file)
index 4c539e9..0000000
--- a/packages-private/vapor-e2e-test/keepalive/components/VdomComp.vue
+++ /dev/null
@@ -1,20 +0,0 @@
-<script setup>
-import { onActivated, onDeactivated, onMounted, onUnmounted, ref } from 'vue'
-const msg = ref('vdom')
-
-onMounted(() => {
-  window.calls.push('mounted')
-})
-onActivated(() => {
-  window.calls.push('activated')
-})
-onDeactivated(() => {
-  window.calls.push('deactivated')
-})
-onUnmounted(() => {
-  window.calls.push('unmounted')
-})
-</script>
-<template>
-  <input type="text" v-model="msg" />
-</template>

diff --git a/packages-private/vapor-e2e-test/keepalive/index.html b/packages-private/vapor-e2e-test/keepalive/index.html
deleted file mode 100644 (file)
index 79052a0..0000000
--- a/packages-private/vapor-e2e-test/keepalive/index.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<script type="module" src="./main.ts"></script>
-<div id="app"></div>

diff --git a/packages-private/vapor-e2e-test/keepalive/main.ts b/packages-private/vapor-e2e-test/keepalive/main.ts
deleted file mode 100644 (file)
index bc6b491..0000000
--- a/packages-private/vapor-e2e-test/keepalive/main.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { createVaporApp, vaporInteropPlugin } from 'vue'
-import App from './App.vue'
-
-createVaporApp(App).use(vaporInteropPlugin).mount('#app')

diff --git a/packages-private/vapor-e2e-test/vite.config.ts b/packages-private/vapor-e2e-test/vite.config.ts
index 931794ca84110b630f50867541e951d580605b12..f50fccea3cee448746785d46ced5fafcaa12925d 100644 (file)
--- a/packages-private/vapor-e2e-test/vite.config.ts
+++ b/packages-private/vapor-e2e-test/vite.config.ts
@@ -14,7 +14,6 @@ export default defineConfig({
       input: {
         interop: resolve(import.meta.dirname, 'interop/index.html'),
         todomvc: resolve(import.meta.dirname, 'todomvc/index.html'),
-        keepalive: resolve(import.meta.dirname, 'keepalive/index.html'),
         transition: resolve(import.meta.dirname, 'transition/index.html'),
         transitionGroup: resolve(
           import.meta.dirname,

diff --git a/packages/runtime-vapor/__tests__/components/KeepAlive.spec.ts b/packages/runtime-vapor/__tests__/components/KeepAlive.spec.ts
index 754d83ac68075b2287e0746df6efab6e7473c4a9..53d47651bbbed166f56b00361f532d6397fad725 100644 (file)
--- a/packages/runtime-vapor/__tests__/components/KeepAlive.spec.ts
+++ b/packages/runtime-vapor/__tests__/components/KeepAlive.spec.ts
@@ -1,4 +1,5 @@
 import {
+  h,
   nextTick,
   onActivated,
   onBeforeMount,
@@ -8,6 +9,8 @@ import {
   reactive,
   ref,
   shallowRef,
+  vModelText,
+  withDirectives,
 } from 'vue'
 import type { LooseRawProps, VaporComponent } from '../../src/component'
 import { makeRender } from '../_utils'
@@ -18,10 +21,12 @@ import {
   createDynamicComponent,
   createIf,
   createTemplateRefSetter,
+  createVaporApp,
   defineVaporComponent,
   renderEffect,
   setText,
   template,
+  vaporInteropPlugin,
 } from '../../src'
 
 const define = makeRender()
@@ -1186,4 +1191,107 @@ describe('VaporKeepAlive', () => {
     expect(deactivatedHome).toHaveBeenCalledTimes(0)
     expect(unmountedHome).toHaveBeenCalledTimes(1)
   })
+
+  describe('vdom interop', () => {
+    test('render vdom component', async () => {
+      const VdomComp = {
+        setup() {
+          const msg = ref('vdom')
+          onBeforeMount(() => oneHooks.beforeMount())
+          onMounted(() => oneHooks.mounted())
+          onActivated(() => oneHooks.activated())
+          onDeactivated(() => oneHooks.deactivated())
+          onUnmounted(() => oneHooks.unmounted())
+          return () => {
+            return withDirectives(
+              h(
+                'input',
+                {
+                  type: 'text',
+                  'onUpdate:modelValue': ($event: any) => (msg.value = $event),
+                },
+                [],
+              ),
+              [[vModelText, msg.value]],
+            )
+          }
+        },
+      }
+
+      const show = ref(true)
+      const toggle = ref(true)
+
+      const App = defineVaporComponent({
+        setup() {
+          const n0 = createIf(
+            () => show.value,
+            () => {
+              const n5 = createComponent(
+                VaporKeepAlive,
+                null,
+                {
+                  default: () => {
+                    const n2 = createIf(
+                      () => toggle.value,
+                      () => {
+                        const n4 = createComponent(VdomComp)
+                        return n4
+                      },
+                    )
+                    return n2
+                  },
+                },
+                true,
+              )
+              return n5
+            },
+          )
+          return n0
+        },
+      })
+
+      const container = document.createElement('div')
+      document.body.appendChild(container)
+      const app = createVaporApp(App)
+      app.use(vaporInteropPlugin)
+      app.mount(container)
+
+      expect(container.innerHTML).toBe(`<input type="text"><!--if--><!--if-->`)
+      assertHookCalls(oneHooks, [1, 1, 1, 0, 0])
+
+      let inputEl = container.firstChild as HTMLInputElement
+      expect(inputEl.value).toBe('vdom')
+
+      inputEl.value = 'changed'
+      inputEl.dispatchEvent(new Event('input'))
+      await nextTick()
+
+      // deactivate
+      toggle.value = false
+      await nextTick()
+      expect(container.innerHTML).toBe(`<!--if--><!--if-->`)
+      assertHookCalls(oneHooks, [1, 1, 1, 1, 0])
+
+      // activate
+      toggle.value = true
+      await nextTick()
+      expect(container.innerHTML).toBe(`<input type="text"><!--if--><!--if-->`)
+      assertHookCalls(oneHooks, [1, 1, 2, 1, 0])
+      expect(inputEl.value).toBe('changed')
+
+      // unmount keepalive
+      show.value = false
+      await nextTick()
+      expect(container.innerHTML).toBe(`<!--if-->`)
+      assertHookCalls(oneHooks, [1, 1, 2, 2, 1])
+
+      // mount keepalive
+      show.value = true
+      await nextTick()
+      expect(container.innerHTML).toBe(`<input type="text"><!--if--><!--if-->`)
+      assertHookCalls(oneHooks, [2, 2, 3, 2, 1])
+      inputEl = container.firstChild as HTMLInputElement
+      expect(inputEl.value).toBe('vdom')
+    })
+  })
 })