From: Evan You <evan@vuejs.org>
Date: Mon, 9 Dec 2024 23:34:23 +0000 (+0800)
Subject: test(vapor): skip todo tests
X-Git-Tag: v3.6.0-alpha.1~16^2~183
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab6f75d1daff0e94149654b73951b0dcfd567058;p=thirdparty%2Fvuejs%2Fcore.git

test(vapor): skip todo tests
---

diff --git a/packages/runtime-vapor/__tests__/apiCreateSelector.spec.ts b/packages/runtime-vapor/__tests__/apiCreateSelector.spec.ts
index 033751f229..87dbf5aba5 100644
--- a/packages/runtime-vapor/__tests__/apiCreateSelector.spec.ts
+++ b/packages/runtime-vapor/__tests__/apiCreateSelector.spec.ts
@@ -1,10 +1,10 @@
 import { ref } from '@vue/reactivity'
 import { makeRender } from './_utils'
-import { createFor, createSelector, nextTick, renderEffect } from '../src/_old'
+// import { createFor, createSelector, nextTick, renderEffect } from '../src'
 
 const define = makeRender()
 
-describe('api: createSelector', () => {
+describe.todo('api: createSelector', () => {
   test('basic', async () => {
     let calledTimes = 0
     let expectedCalledTimes = 0
diff --git a/packages/runtime-vapor/__tests__/apiCreateVaporApp.spec.ts b/packages/runtime-vapor/__tests__/apiCreateVaporApp.spec.ts
index 4f8c47901f..faa7606755 100644
--- a/packages/runtime-vapor/__tests__/apiCreateVaporApp.spec.ts
+++ b/packages/runtime-vapor/__tests__/apiCreateVaporApp.spec.ts
@@ -11,13 +11,13 @@ import {
   resolveComponent,
   resolveDirective,
   withDirectives,
-} from '../src/_old'
-import { warn } from '../src/_old/warning'
+} from '../src'
+import { warn } from '@vue/runtime-dom'
 import { makeRender } from './_utils'
 
 const define = makeRender()
 
-describe('api: createVaporApp', () => {
+describe.todo('api: createVaporApp', () => {
   test('mount', () => {
     const Comp = defineComponent({
       props: {
diff --git a/packages/runtime-vapor/__tests__/apiExpose.spec.ts b/packages/runtime-vapor/__tests__/apiExpose.spec.ts
index 1b27c48618..e5b482c5fb 100644
--- a/packages/runtime-vapor/__tests__/apiExpose.spec.ts
+++ b/packages/runtime-vapor/__tests__/apiExpose.spec.ts
@@ -1,17 +1,17 @@
 import { ref, shallowRef } from '@vue/reactivity'
-import { createComponent } from '../src/_old/apiCreateComponent'
+import { createComponent } from '../src/component'
 import { setRef } from '../src/dom/templateRef'
 import { makeRender } from './_utils'
 import {
   type ComponentInternalInstance,
   getCurrentInstance,
-} from '../src/_old/component'
-import { defineComponent } from '../src/_old/apiDefineComponent'
+} from '../src/component'
+import { defineVaporComponent } from '../src/apiDefineComponent'
 
 const define = makeRender()
-describe('api: expose', () => {
+describe.todo('api: expose', () => {
   test('via setup context', () => {
-    const Child = defineComponent({
+    const Child = defineVaporComponent({
       setup(_, { expose }) {
         expose({
           foo: 1,
@@ -40,7 +40,7 @@ describe('api: expose', () => {
 
   test('via setup context (expose empty)', () => {
     let childInstance: ComponentInternalInstance | null = null
-    const Child = defineComponent({
+    const Child = defineVaporComponent({
       setup(_) {
         childInstance = getCurrentInstance()
       },
diff --git a/packages/runtime-vapor/__tests__/apiInject.spec.ts b/packages/runtime-vapor/__tests__/apiInject.spec.ts
index 1bde97b6d0..b601f155d9 100644
--- a/packages/runtime-vapor/__tests__/apiInject.spec.ts
+++ b/packages/runtime-vapor/__tests__/apiInject.spec.ts
@@ -13,13 +13,13 @@ import {
   ref,
   renderEffect,
   setText,
-} from '../src/_old'
+} from '../src'
 import { makeRender } from './_utils'
 
 const define = makeRender<any>()
 
 // reference: https://vue-composition-api-rfc.netlify.com/api.html#provide-inject
-describe('api: provide/inject', () => {
+describe.todo('api: provide/inject', () => {
   it('string keys', () => {
     const Provider = define({
       setup() {
diff --git a/packages/runtime-vapor/__tests__/apiLifecycle.spec.ts b/packages/runtime-vapor/__tests__/apiLifecycle.spec.ts
index f2f3a6b284..724918f7fe 100644
--- a/packages/runtime-vapor/__tests__/apiLifecycle.spec.ts
+++ b/packages/runtime-vapor/__tests__/apiLifecycle.spec.ts
@@ -24,13 +24,13 @@ import {
   renderEffect,
   setText,
   template,
-} from '../src/_old'
+} from '../src'
 import { makeRender } from './_utils'
 import { ITERATE_KEY } from '@vue/reactivity'
 
 const define = makeRender<any>()
 
-describe('api: lifecycle hooks', () => {
+describe.todo('api: lifecycle hooks', () => {
   it('onBeforeMount', () => {
     const fn = vi.fn(() => {
       expect(host.innerHTML).toBe(``)
diff --git a/packages/runtime-vapor/__tests__/apiSetupContext.spec.ts b/packages/runtime-vapor/__tests__/apiSetupContext.spec.ts
index 91da73e2a6..4ffcf35cf8 100644
--- a/packages/runtime-vapor/__tests__/apiSetupContext.spec.ts
+++ b/packages/runtime-vapor/__tests__/apiSetupContext.spec.ts
@@ -14,12 +14,12 @@ import {
   setInheritAttrs,
   template,
   watchEffect,
-} from '../src/_old'
+} from '../src'
 import { makeRender } from './_utils'
 
 const define = makeRender()
 
-describe('api: setup context', () => {
+describe.todo('api: setup context', () => {
   it('should expose return values to template render context', () => {
     const { html } = define({
       setup() {
diff --git a/packages/runtime-vapor/__tests__/apiSetupHelpers.spec.ts b/packages/runtime-vapor/__tests__/apiSetupHelpers.spec.ts
index 6c56af6e04..42c7c3e060 100644
--- a/packages/runtime-vapor/__tests__/apiSetupHelpers.spec.ts
+++ b/packages/runtime-vapor/__tests__/apiSetupHelpers.spec.ts
@@ -1,4 +1,4 @@
-import type { SetupContext } from '../src/_old/component'
+import type { SetupContext } from '../src/component'
 import {
   createComponent,
   defineComponent,
@@ -6,12 +6,12 @@ import {
   template,
   useAttrs,
   useSlots,
-} from '../src/_old'
+} from '../src'
 import { makeRender } from './_utils'
 
 const define = makeRender<any>()
 
-describe('SFC <script setup> helpers', () => {
+describe.todo('SFC <script setup> helpers', () => {
   test.todo('should warn runtime usage', () => {})
 
   test('useSlots / useAttrs (no args)', () => {
diff --git a/packages/runtime-vapor/__tests__/apiWatch.spec.ts b/packages/runtime-vapor/__tests__/apiWatch.spec.ts
index 821e703aa0..0ed45e46aa 100644
--- a/packages/runtime-vapor/__tests__/apiWatch.spec.ts
+++ b/packages/runtime-vapor/__tests__/apiWatch.spec.ts
@@ -6,9 +6,9 @@ import {
   ref,
   watchEffect,
   watchSyncEffect,
-} from '../src/_old'
+} from '../src'
 
-describe('watchEffect and onWatcherCleanup', () => {
+describe.todo('watchEffect and onWatcherCleanup', () => {
   test('basic', async () => {
     let dummy = 0
     let source: Ref<number>
diff --git a/packages/runtime-vapor/__tests__/componentAttrs.spec.ts b/packages/runtime-vapor/__tests__/componentAttrs.spec.ts
index 1efef9cd58..78404b3c61 100644
--- a/packages/runtime-vapor/__tests__/componentAttrs.spec.ts
+++ b/packages/runtime-vapor/__tests__/componentAttrs.spec.ts
@@ -7,12 +7,12 @@ import {
   setText,
   template,
   watchEffect,
-} from '../src/_old'
+} from '../src'
 import { makeRender } from './_utils'
 
 const define = makeRender<any>()
 
-describe('attribute fallthrough', () => {
+describe.todo('attribute fallthrough', () => {
   it('should allow attrs to fallthrough', async () => {
     const t0 = template('<div>')
     const { component: Child } = define({
diff --git a/packages/runtime-vapor/__tests__/componentEmits.spec.ts b/packages/runtime-vapor/__tests__/componentEmits.spec.ts
index 6c9a22f71a..5ab6f53108 100644
--- a/packages/runtime-vapor/__tests__/componentEmits.spec.ts
+++ b/packages/runtime-vapor/__tests__/componentEmits.spec.ts
@@ -9,13 +9,13 @@ import {
   defineComponent,
   nextTick,
   onBeforeUnmount,
-} from '../src/_old'
-import { isEmitListener } from '../src/_old/componentEmits'
+} from '../src'
+import { isEmitListener } from '../src/componentEmits'
 import { makeRender } from './_utils'
 
 const define = makeRender()
 
-describe('component: emit', () => {
+describe.todo('component: emit', () => {
   test('trigger handlers', () => {
     const { render } = define({
       setup(_, { emit }) {
diff --git a/packages/runtime-vapor/__tests__/componentExpose.spec.ts b/packages/runtime-vapor/__tests__/componentExpose.spec.ts
index 95af649a4b..47415b749d 100644
--- a/packages/runtime-vapor/__tests__/componentExpose.spec.ts
+++ b/packages/runtime-vapor/__tests__/componentExpose.spec.ts
@@ -4,7 +4,7 @@ import { type Ref, ref } from '@vue/reactivity'
 
 const define = makeRender()
 
-describe('component expose', () => {
+describe.todo('component expose', () => {
   test('should work', async () => {
     const expxosedObj = { foo: 1 }
     const { render } = define({
diff --git a/packages/runtime-vapor/__tests__/componentSlots.spec.ts b/packages/runtime-vapor/__tests__/componentSlots.spec.ts
index 3be95c833e..2cdf8fe730 100644
--- a/packages/runtime-vapor/__tests__/componentSlots.spec.ts
+++ b/packages/runtime-vapor/__tests__/componentSlots.spec.ts
@@ -15,7 +15,7 @@ import {
   setText,
   template,
   withDestructure,
-} from '../src/_old'
+} from '../src'
 import { makeRender } from './_utils'
 
 const define = makeRender<any>()
@@ -40,7 +40,7 @@ function renderWithSlots(slots: any): any {
   return instance
 }
 
-describe('component: slots', () => {
+describe.todo('component: slots', () => {
   test('initSlots: instance.slots should be set correctly', () => {
     let instance: any
     const Comp = defineComponent({
diff --git a/packages/runtime-vapor/__tests__/directives/vModel.spec.ts b/packages/runtime-vapor/__tests__/directives/vModel.spec.ts
index a592784c9a..8ee22607fe 100644
--- a/packages/runtime-vapor/__tests__/directives/vModel.spec.ts
+++ b/packages/runtime-vapor/__tests__/directives/vModel.spec.ts
@@ -9,7 +9,7 @@ import {
   vModelDynamic,
   vModelSelect,
   withDirectives,
-} from '../../src/_old'
+} from '../../src'
 import { makeRender } from '../_utils'
 import { nextTick } from '@vue/runtime-dom'
 
diff --git a/packages/runtime-vapor/__tests__/directives/vShow.spec.ts b/packages/runtime-vapor/__tests__/directives/vShow.spec.ts
index 59cac9b8d2..92565e5dc1 100644
--- a/packages/runtime-vapor/__tests__/directives/vShow.spec.ts
+++ b/packages/runtime-vapor/__tests__/directives/vShow.spec.ts
@@ -5,7 +5,7 @@ import {
   template,
   vShow,
   withDirectives,
-} from '../../src/_old'
+} from '../../src'
 import { nextTick, ref } from 'vue'
 import { describe, expect, test } from 'vitest'
 import { makeRender } from '../_utils'
@@ -29,7 +29,7 @@ const createDemo = (defaultValue: boolean) =>
     return n0
   })
 
-describe('directive: v-show', () => {
+describe.todo('directive: v-show', () => {
   test('basic', async () => {
     const { host } = createDemo(true).render()
     const btn = host.querySelector('button')
diff --git a/packages/runtime-vapor/__tests__/dom/prop.spec.ts b/packages/runtime-vapor/__tests__/dom/prop.spec.ts
index 6b2f03558c..513abe525e 100644
--- a/packages/runtime-vapor/__tests__/dom/prop.spec.ts
+++ b/packages/runtime-vapor/__tests__/dom/prop.spec.ts
@@ -10,24 +10,17 @@ import {
   setValue,
 } from '../../src/dom/prop'
 import { setStyle } from '../../src/dom/style'
-import {
-  ComponentInternalInstance,
-  setCurrentInstance,
-} from '../../src/_old/component'
+import { VaporComponentInstance } from '../../src/component'
+import { currentInstance, simpleSetCurrentInstance } from '@vue/runtime-dom'
 import { getMetadata, recordPropMetadata } from '../../src/componentMetadata'
-import { getCurrentScope } from '@vue/reactivity'
 
 let removeComponentInstance = NOOP
 beforeEach(() => {
-  const instance = new ComponentInternalInstance((() => {}) as any, {}, null)
-  const reset = setCurrentInstance(instance)
-  const prev = getCurrentScope()
-  instance.scope.on()
+  const instance = new VaporComponentInstance({}, {}, null)
+  const prev = currentInstance
+  simpleSetCurrentInstance(instance)
   removeComponentInstance = () => {
-    instance.scope.prevScope = prev
-    instance.scope.off()
-    reset()
-    removeComponentInstance = NOOP
+    simpleSetCurrentInstance(prev)
   }
 })
 afterEach(() => {
diff --git a/packages/runtime-vapor/__tests__/dom/templateRef.spec.ts b/packages/runtime-vapor/__tests__/dom/templateRef.spec.ts
index 143f46929f..16bd6403c3 100644
--- a/packages/runtime-vapor/__tests__/dom/templateRef.spec.ts
+++ b/packages/runtime-vapor/__tests__/dom/templateRef.spec.ts
@@ -12,12 +12,12 @@ import {
   setText,
   template,
   watchEffect,
-} from '../../src/_old'
+} from '../../src'
 import { makeRender } from '../_utils'
 
 const define = makeRender()
 
-describe('api: template ref', () => {
+describe.todo('api: template ref', () => {
   test('string ref mount', () => {
     const t0 = template('<div ref="refKey"></div>')
     const el = ref(null)
diff --git a/packages/runtime-vapor/__tests__/for.spec.ts b/packages/runtime-vapor/__tests__/for.spec.ts
index 283184dba2..9f50781acc 100644
--- a/packages/runtime-vapor/__tests__/for.spec.ts
+++ b/packages/runtime-vapor/__tests__/for.spec.ts
@@ -7,12 +7,12 @@ import {
   template,
   triggerRef,
   withDestructure,
-} from '../src/_old'
+} from '../src'
 import { makeRender } from './_utils'
 
 const define = makeRender()
 
-describe('createFor', () => {
+describe.todo('createFor', () => {
   test('array source', async () => {
     const list = ref([{ name: '1' }, { name: '2' }, { name: '3' }])
     function reverse() {
diff --git a/packages/runtime-vapor/__tests__/if.spec.ts b/packages/runtime-vapor/__tests__/if.spec.ts
index 955659f346..2c6554cbc7 100644
--- a/packages/runtime-vapor/__tests__/if.spec.ts
+++ b/packages/runtime-vapor/__tests__/if.spec.ts
@@ -8,14 +8,14 @@ import {
   setText,
   template,
   withDirectives,
-} from '../src/_old'
+} from '../src'
 import type { Mock } from 'vitest'
 import { makeRender } from './_utils'
-import { unmountComponent } from '../src/_old/apiRender'
+import { unmountComponent } from '../src/component'
 
 const define = makeRender()
 
-describe('createIf', () => {
+describe.todo('createIf', () => {
   test('basic', async () => {
     // mock this template:
     //  <div>
diff --git a/tsconfig.json b/tsconfig.json
index 7020787509..8973145f6f 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -38,8 +38,5 @@
     "scripts/*",
     "rollup.*.js"
   ],
-  "exclude": [
-    "packages-private/sfc-playground/src/vue-dev-proxy*",
-    "packages/runtime-vapor/src/_old"
-  ]
+  "exclude": ["packages-private/sfc-playground/src/vue-dev-proxy*"]
 }