From ad3d8fa6b45aa072c4015830ab38e20a4f386fba Mon Sep 17 00:00:00 2001 From: Doctor Wu Date: Sun, 16 Jun 2024 16:50:24 +0800 Subject: [PATCH] test(runtime-vapor): fix type (#229) --- .../runtime-vapor/__tests__/componentAttrs.spec.ts | 13 +++---------- .../runtime-vapor/__tests__/componentExpose.spec.ts | 2 +- .../runtime-vapor/__tests__/componentProps.spec.ts | 5 +---- .../__tests__/directives/vShow.spec.ts | 2 +- packages/runtime-vapor/__tests__/for.spec.ts | 2 +- packages/runtime-vapor/__tests__/if.spec.ts | 2 +- .../runtime-vapor/__tests__/renderEffect.spec.ts | 6 +++--- 7 files changed, 11 insertions(+), 21 deletions(-) diff --git a/packages/runtime-vapor/__tests__/componentAttrs.spec.ts b/packages/runtime-vapor/__tests__/componentAttrs.spec.ts index 46a472b03..2ba81b81b 100644 --- a/packages/runtime-vapor/__tests__/componentAttrs.spec.ts +++ b/packages/runtime-vapor/__tests__/componentAttrs.spec.ts @@ -7,7 +7,6 @@ import { template, watchEffect, } from '../src' -import { setCurrentInstance } from '../src/component' import { makeRender } from './_utils' const define = makeRender() @@ -27,7 +26,7 @@ describe('attribute fallthrough', () => { const foo = ref(1) const id = ref('a') - const { instance, host } = define({ + const { host } = define({ setup() { return { foo, id } }, @@ -46,7 +45,6 @@ describe('attribute fallthrough', () => { ) }, }).render() - const reset = setCurrentInstance(instance) expect(host.innerHTML).toBe('
1
') foo.value++ @@ -56,7 +54,6 @@ describe('attribute fallthrough', () => { id.value = 'b' await nextTick() expect(host.innerHTML).toBe('
2
') - reset() }) it('should not fallthrough if explicitly pass inheritAttrs: false', async () => { @@ -74,7 +71,7 @@ describe('attribute fallthrough', () => { const foo = ref(1) const id = ref('a') - const { instance, host } = define({ + const { host } = define({ setup() { return { foo, id } }, @@ -93,7 +90,6 @@ describe('attribute fallthrough', () => { ) }, }).render() - const reset = setCurrentInstance(instance) expect(host.innerHTML).toBe('
1
') foo.value++ @@ -103,7 +99,6 @@ describe('attribute fallthrough', () => { id.value = 'b' await nextTick() expect(host.innerHTML).toBe('
2
') - reset() }) it('should pass through attrs in nested single root components', async () => { @@ -137,7 +132,7 @@ describe('attribute fallthrough', () => { const foo = ref(1) const id = ref('a') - const { instance, host } = define({ + const { host } = define({ setup() { return { foo, id } }, @@ -156,7 +151,6 @@ describe('attribute fallthrough', () => { ) }, }).render() - const reset = setCurrentInstance(instance) expect(host.innerHTML).toBe('
1
') foo.value++ @@ -166,6 +160,5 @@ describe('attribute fallthrough', () => { id.value = 'b' await nextTick() expect(host.innerHTML).toBe('
2
') - reset() }) }) diff --git a/packages/runtime-vapor/__tests__/componentExpose.spec.ts b/packages/runtime-vapor/__tests__/componentExpose.spec.ts index 7e046f9bc..95af649a4 100644 --- a/packages/runtime-vapor/__tests__/componentExpose.spec.ts +++ b/packages/runtime-vapor/__tests__/componentExpose.spec.ts @@ -13,7 +13,7 @@ describe('component expose', () => { }, }) const { instance } = render() - expect(instance.exposed).toEqual(expxosedObj) + expect(instance?.exposed).toEqual(expxosedObj) }) test('should warn when called multiple times', async () => { diff --git a/packages/runtime-vapor/__tests__/componentProps.spec.ts b/packages/runtime-vapor/__tests__/componentProps.spec.ts index 4487c65b1..38c031ddb 100644 --- a/packages/runtime-vapor/__tests__/componentProps.spec.ts +++ b/packages/runtime-vapor/__tests__/componentProps.spec.ts @@ -1,6 +1,5 @@ // NOTE: This test is implemented based on the case of `runtime-core/__test__/componentProps.spec.ts`. -import { setCurrentInstance } from '../src/component' import { createComponent, defineComponent, @@ -233,7 +232,7 @@ describe('component: props', () => { const foo = ref(1) const id = ref('a') - const { instance, host } = define({ + const { host } = define({ setup() { return { foo, id } }, @@ -250,7 +249,6 @@ describe('component: props', () => { ) }, }).render() - const reset = setCurrentInstance(instance) expect(host.innerHTML).toBe('
1
') foo.value++ @@ -260,7 +258,6 @@ describe('component: props', () => { id.value = 'b' await nextTick() expect(host.innerHTML).toBe('
2
') - reset() }) describe('validator', () => { diff --git a/packages/runtime-vapor/__tests__/directives/vShow.spec.ts b/packages/runtime-vapor/__tests__/directives/vShow.spec.ts index 75c44f8c7..d8ea73f20 100644 --- a/packages/runtime-vapor/__tests__/directives/vShow.spec.ts +++ b/packages/runtime-vapor/__tests__/directives/vShow.spec.ts @@ -77,7 +77,7 @@ describe('directive: v-show', () => { }).render() expect(host.innerHTML).toBe('
child
') - expect(instance.scope.dirs!.get(n0)![0].dir).toBe(vShow) + expect(instance?.scope.dirs!.get(n0)![0].dir).toBe(vShow) const btn = host.querySelector('button') btn?.click() diff --git a/packages/runtime-vapor/__tests__/for.spec.ts b/packages/runtime-vapor/__tests__/for.spec.ts index c1d981cb2..8cbbbedb6 100644 --- a/packages/runtime-vapor/__tests__/for.spec.ts +++ b/packages/runtime-vapor/__tests__/for.spec.ts @@ -305,7 +305,7 @@ describe('createFor', () => { calls.length = 0 expect(spySrcFn).toHaveBeenCalledTimes(7) - unmountComponent(instance) + unmountComponent(instance!) expect(calls).toEqual(['0 beforeUnmount', '0 unmounted']) expect(spySrcFn).toHaveBeenCalledTimes(7) }) diff --git a/packages/runtime-vapor/__tests__/if.spec.ts b/packages/runtime-vapor/__tests__/if.spec.ts index 03a94ff36..a596b3fe8 100644 --- a/packages/runtime-vapor/__tests__/if.spec.ts +++ b/packages/runtime-vapor/__tests__/if.spec.ts @@ -237,7 +237,7 @@ describe('createIf', () => { expect(spyConditionFn1).toHaveBeenCalledTimes(3) expect(spyConditionFn2).toHaveBeenCalledTimes(2) - unmountComponent(instance) + unmountComponent(instance!) expect(calls).toEqual(['1 beforeUnmount', '1 unmounted']) expect(spyConditionFn1).toHaveBeenCalledTimes(3) expect(spyConditionFn2).toHaveBeenCalledTimes(2) diff --git a/packages/runtime-vapor/__tests__/renderEffect.spec.ts b/packages/runtime-vapor/__tests__/renderEffect.spec.ts index 089e73b73..5ebb514bb 100644 --- a/packages/runtime-vapor/__tests__/renderEffect.spec.ts +++ b/packages/runtime-vapor/__tests__/renderEffect.spec.ts @@ -110,7 +110,7 @@ describe('renderEffect', () => { }) }, ).render() - const { change, changeRender } = instance.setupState as any + const { change, changeRender } = instance?.setupState as any expect(calls).toEqual(['pre 0', 'sync 0', 'renderEffect 0', 'post 0']) calls.length = 0 @@ -173,7 +173,7 @@ describe('renderEffect', () => { }) }, ).render() - const { update } = instance.setupState as any + const { update } = instance?.setupState as any await expect(async () => { update() await nextTick() @@ -203,7 +203,7 @@ describe('renderEffect', () => { }, ).render() - const { update } = instance.setupState as any + const { update } = instance?.setupState as any await expect(async () => { update() await nextTick()