From 123f82a9a57b3d9f02090bb5fefb992ab7c9d535 Mon Sep 17 00:00:00 2001 From: Sergey Vishnevsky Date: Wed, 7 Jul 2021 10:46:15 +0300 Subject: [PATCH 1/5] feat: add generic for wrapper.find() and wrapper.get() --- packages/test-utils/types/index.d.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/test-utils/types/index.d.ts b/packages/test-utils/types/index.d.ts index ee3938787..95dddb74e 100644 --- a/packages/test-utils/types/index.d.ts +++ b/packages/test-utils/types/index.d.ts @@ -75,15 +75,15 @@ interface BaseWrapper { selector: Selector | void } -export interface Wrapper extends BaseWrapper { +export interface Wrapper extends BaseWrapper { readonly vm: V - readonly element: HTMLElement + readonly element: el readonly options: WrapperOptions get (selector: VueClass): Wrapper get (selector: ComponentOptions): Wrapper get>(selector: FunctionalComponentOptions): Wrapper - get (selector: string): Wrapper + get(selector: string): Wrapper get (selector: RefSelector): Wrapper get (selector: NameSelector): Wrapper @@ -96,7 +96,7 @@ export interface Wrapper extends BaseWrapper { find (selector: VueClass): Wrapper find (selector: ComponentOptions): Wrapper find>(selector: FunctionalComponentOptions): Wrapper - find (selector: string): Wrapper + find(selector: string): Wrapper find (selector: RefSelector): Wrapper find (selector: NameSelector): Wrapper From 239102910a15179e90926901f9391a399f17f30a Mon Sep 17 00:00:00 2001 From: Sergey Vishnevsky Date: Wed, 7 Jul 2021 10:54:18 +0300 Subject: [PATCH 2/5] refactor: change HTMLElement -> Element --- packages/test-utils/types/index.d.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/test-utils/types/index.d.ts b/packages/test-utils/types/index.d.ts index 95dddb74e..d6090d6ee 100644 --- a/packages/test-utils/types/index.d.ts +++ b/packages/test-utils/types/index.d.ts @@ -75,7 +75,7 @@ interface BaseWrapper { selector: Selector | void } -export interface Wrapper extends BaseWrapper { +export interface Wrapper extends BaseWrapper { readonly vm: V readonly element: el readonly options: WrapperOptions @@ -83,7 +83,7 @@ export interface Wrapper (selector: VueClass): Wrapper get (selector: ComponentOptions): Wrapper get>(selector: FunctionalComponentOptions): Wrapper - get(selector: string): Wrapper + get(selector: string): Wrapper get (selector: RefSelector): Wrapper get (selector: NameSelector): Wrapper @@ -96,7 +96,7 @@ export interface Wrapper (selector: VueClass): Wrapper find (selector: ComponentOptions): Wrapper find>(selector: FunctionalComponentOptions): Wrapper - find(selector: string): Wrapper + find(selector: string): Wrapper find (selector: RefSelector): Wrapper find (selector: NameSelector): Wrapper From c899b388408a720195f58bc188a6d1cb3b02283f Mon Sep 17 00:00:00 2001 From: Sergey Vishnevsky Date: Wed, 7 Jul 2021 11:03:13 +0300 Subject: [PATCH 3/5] fix: fix the tests for wrapper --- packages/test-utils/types/test/wrapper.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/test-utils/types/test/wrapper.ts b/packages/test-utils/types/test/wrapper.ts index 46800da67..326c3232e 100644 --- a/packages/test-utils/types/test/wrapper.ts +++ b/packages/test-utils/types/test/wrapper.ts @@ -51,7 +51,7 @@ wrapper.findComponent(ClassComponent) wrapper.vm.foo wrapper.vm.$emit('event', 'arg') -let el: HTMLElement = wrapper.element +let el: Element = wrapper.element let selector: Selector | void From 1102c611820022faeb709bd85641fda00a7a3bf6 Mon Sep 17 00:00:00 2001 From: Sergey Vishnevsky Date: Wed, 7 Jul 2021 11:11:24 +0300 Subject: [PATCH 4/5] fix: forgot to apply the generic --- packages/test-utils/types/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/test-utils/types/index.d.ts b/packages/test-utils/types/index.d.ts index d6090d6ee..0b6e1abd2 100644 --- a/packages/test-utils/types/index.d.ts +++ b/packages/test-utils/types/index.d.ts @@ -96,7 +96,7 @@ export interface Wrapper ext find (selector: VueClass): Wrapper find (selector: ComponentOptions): Wrapper find>(selector: FunctionalComponentOptions): Wrapper - find(selector: string): Wrapper + find(selector: string): Wrapper find (selector: RefSelector): Wrapper find (selector: NameSelector): Wrapper From 3656299985ad48c263a79c3bf80bc6c1f9fb5f58 Mon Sep 17 00:00:00 2001 From: Sergey Vishnevsky Date: Thu, 8 Jul 2021 09:10:32 +0300 Subject: [PATCH 5/5] test: added the simple test --- packages/test-utils/types/test/wrapper.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/test-utils/types/test/wrapper.ts b/packages/test-utils/types/test/wrapper.ts index 326c3232e..a19ed7959 100644 --- a/packages/test-utils/types/test/wrapper.ts +++ b/packages/test-utils/types/test/wrapper.ts @@ -68,6 +68,8 @@ selector = found.selector found = wrapper.find({ name: 'my-button' }) selector = found.selector +wrapper.find('input').element.value + let array = wrapper.findAll('.bar') selector = array.selector array = wrapper.findAll(normalOptions)