Skip to content

Commit 9041426

Browse files
phrobinetphrobinet
authored
Merge branch 'vuejs:dev' into dev
2 parents 669c826 + e639009 commit 9041426

File tree

6 files changed

+43
-74
lines changed

6 files changed

+43
-74
lines changed

‎docs/zh/api/wrapper/README.md

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -28,30 +28,30 @@ Vue Test Utils 是一个基于包裹器的 API。
2828

2929
## 方法
3030

31-
!!!include(docs/api/wrapper/attributes.md)!!!
32-
!!!include(docs/api/wrapper/classes.md)!!!
33-
!!!include(docs/api/wrapper/contains.md)!!!
34-
!!!include(docs/api/wrapper/destroy.md)!!!
35-
!!!include(docs/api/wrapper/emitted.md)!!!
36-
!!!include(docs/api/wrapper/emittedByOrder.md)!!!
37-
!!!include(docs/api/wrapper/exists.md)!!!
38-
!!!include(docs/api/wrapper/find.md)!!!
39-
!!!include(docs/api/wrapper/findAll.md)!!!
40-
!!!include(docs/api/wrapper/findComponent.md)!!!
41-
!!!include(docs/api/wrapper/findAllComponents.md)!!!
42-
!!!include(docs/api/wrapper/html.md)!!!
43-
!!!include(docs/api/wrapper/get.md)!!!
44-
!!!include(docs/api/wrapper/is.md)!!!
45-
!!!include(docs/api/wrapper/isEmpty.md)!!!
46-
!!!include(docs/api/wrapper/isVisible.md)!!!
47-
!!!include(docs/api/wrapper/isVueInstance.md)!!!
48-
!!!include(docs/api/wrapper/name.md)!!!
49-
!!!include(docs/api/wrapper/props.md)!!!
50-
!!!include(docs/api/wrapper/setChecked.md)!!!
51-
!!!include(docs/api/wrapper/setData.md)!!!
52-
!!!include(docs/api/wrapper/setMethods.md)!!!
53-
!!!include(docs/api/wrapper/setProps.md)!!!
54-
!!!include(docs/api/wrapper/setSelected.md)!!!
55-
!!!include(docs/api/wrapper/setValue.md)!!!
56-
!!!include(docs/api/wrapper/text.md)!!!
57-
!!!include(docs/api/wrapper/trigger.md)!!!
31+
!!!include(docs/zh/api/wrapper/attributes.md)!!!
32+
!!!include(docs/zh/api/wrapper/classes.md)!!!
33+
!!!include(docs/zh/api/wrapper/contains.md)!!!
34+
!!!include(docs/zh/api/wrapper/destroy.md)!!!
35+
!!!include(docs/zh/api/wrapper/emitted.md)!!!
36+
!!!include(docs/zh/api/wrapper/emittedByOrder.md)!!!
37+
!!!include(docs/zh/api/wrapper/exists.md)!!!
38+
!!!include(docs/zh/api/wrapper/find.md)!!!
39+
!!!include(docs/zh/api/wrapper/findAll.md)!!!
40+
!!!include(docs/zh/api/wrapper/findComponent.md)!!!
41+
!!!include(docs/zh/api/wrapper/findAllComponents.md)!!!
42+
!!!include(docs/zh/api/wrapper/html.md)!!!
43+
!!!include(docs/zh/api/wrapper/get.md)!!!
44+
!!!include(docs/zh/api/wrapper/is.md)!!!
45+
!!!include(docs/zh/api/wrapper/isEmpty.md)!!!
46+
!!!include(docs/zh/api/wrapper/isVisible.md)!!!
47+
!!!include(docs/zh/api/wrapper/isVueInstance.md)!!!
48+
!!!include(docs/zh/api/wrapper/name.md)!!!
49+
!!!include(docs/zh/api/wrapper/props.md)!!!
50+
!!!include(docs/zh/api/wrapper/setChecked.md)!!!
51+
!!!include(docs/zh/api/wrapper/setData.md)!!!
52+
!!!include(docs/zh/api/wrapper/setMethods.md)!!!
53+
!!!include(docs/zh/api/wrapper/setProps.md)!!!
54+
!!!include(docs/zh/api/wrapper/setSelected.md)!!!
55+
!!!include(docs/zh/api/wrapper/setValue.md)!!!
56+
!!!include(docs/zh/api/wrapper/text.md)!!!
57+
!!!include(docs/zh/api/wrapper/trigger.md)!!!

‎lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
],
66
"npmClient": "yarn",
77
"useWorkspaces": true,
8-
"version": "1.2.1"
8+
"version": "1.2.2"
99
}

‎packages/test-utils/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/test-utils",
3-
"version": "1.2.1",
3+
"version": "1.2.2",
44
"description": "Utilities for testing Vue components.",
55
"main": "dist/vue-test-utils.js",
66
"types": "types/index.d.ts",

‎packages/test-utils/types/index.d.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,15 @@ interface BaseWrapper {
7575
selector: Selector | void
7676
}
7777

78-
export interface Wrapper<V extends Vue | null> extends BaseWrapper {
78+
export interface Wrapper<V extends Vue | null, el extends Element = Element> extends BaseWrapper {
7979
readonly vm: V
80-
readonly element: HTMLElement
80+
readonly element: el
8181
readonly options: WrapperOptions
8282

8383
get<R extends Vue> (selector: VueClass<R>): Wrapper<R>
8484
get<R extends Vue> (selector: ComponentOptions<R>): Wrapper<R>
8585
get<Props = DefaultProps, PropDefs = PropsDefinition<Props>>(selector: FunctionalComponentOptions<Props, PropDefs>): Wrapper<Vue>
86-
get (selector: string): Wrapper<Vue>
86+
get<el extends Element>(selector: string): Wrapper<Vue, el>
8787
get (selector: RefSelector): Wrapper<Vue>
8888
get (selector: NameSelector): Wrapper<Vue>
8989

@@ -96,7 +96,7 @@ export interface Wrapper<V extends Vue | null> extends BaseWrapper {
9696
find<R extends Vue> (selector: VueClass<R>): Wrapper<R>
9797
find<R extends Vue> (selector: ComponentOptions<R>): Wrapper<R>
9898
find<Props = DefaultProps, PropDefs = PropsDefinition<Props>>(selector: FunctionalComponentOptions<Props, PropDefs>): Wrapper<Vue>
99-
find (selector: string): Wrapper<Vue>
99+
find<el extends Element>(selector: string): Wrapper<Vue, el>
100100
find (selector: RefSelector): Wrapper<Vue>
101101
find (selector: NameSelector): Wrapper<Vue>
102102

@@ -183,7 +183,7 @@ interface VueTestUtilsConfigOptions {
183183
deprecationWarningHandler?: Function
184184
}
185185

186-
export declare function createLocalVue (): typeof Vue
186+
export declare function createLocalVue (options?: any): typeof Vue
187187
export declare let config: VueTestUtilsConfigOptions
188188

189189
export declare function mount<V extends Vue> (component: VueClass<V>, options?: ThisTypedMountOptions<V>): Wrapper<V>

‎packages/test-utils/types/test/wrapper.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ wrapper.findComponent(ClassComponent)
5151
wrapper.vm.foo
5252
wrapper.vm.$emit('event', 'arg')
5353

54-
let el: HTMLElement = wrapper.element
54+
let el: Element = wrapper.element
5555

5656
let selector: Selector | void
5757

@@ -68,6 +68,8 @@ selector = found.selector
6868
found = wrapper.find({ name: 'my-button' })
6969
selector = found.selector
7070

71+
wrapper.find<HTMLInputElement>('input').element.value
72+
7173
let array = wrapper.findAll('.bar')
7274
selector = array.selector
7375
array = wrapper.findAll(normalOptions)

‎yarn.lock

Lines changed: 6 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -4081,15 +4081,6 @@ cli-width@^2.0.0:
40814081
version "2.2.0"
40824082
resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
40834083

4084-
clipboard@^2.0.0:
4085-
version "2.0.6"
4086-
resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.6.tgz#52921296eec0fdf77ead1749421b21c968647376"
4087-
integrity sha512-g5zbiixBRk/wyKakSwCKd7vQXDjFnAMGHoEyBogG/bw9kTD9GvdAvaoRR1ALcEzt3pVKxZR0pViekPMIS0QyGg==
4088-
dependencies:
4089-
good-listener "^1.2.2"
4090-
select "^1.1.2"
4091-
tiny-emitter "^2.0.0"
4092-
40934084
cliui@^5.0.0:
40944085
version "5.0.0"
40954086
resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
@@ -5254,11 +5245,6 @@ delayed-stream@~1.0.0:
52545245
resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
52555246
integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
52565247

5257-
delegate@^3.1.2:
5258-
version "3.2.0"
5259-
resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166"
5260-
integrity sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==
5261-
52625248
delegates@^1.0.0:
52635249
version "1.0.0"
52645250
resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
@@ -6834,13 +6820,6 @@ globby@^9.2.0:
68346820
pify "^4.0.1"
68356821
slash "^2.0.0"
68366822

6837-
good-listener@^1.2.2:
6838-
version "1.2.2"
6839-
resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50"
6840-
integrity sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=
6841-
dependencies:
6842-
delegate "^3.1.2"
6843-
68446823
got@^9.6.0:
68456824
version "9.6.0"
68466825
resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
@@ -10339,9 +10318,9 @@ path-key@^3.0.0, path-key@^3.1.0:
1033910318
integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
1034010319

1034110320
path-parse@^1.0.6:
10342-
version "1.0.6"
10343-
resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
10344-
integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
10321+
version "1.0.7"
10322+
resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
10323+
integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
1034510324

1034610325
path-to-regexp@0.1.7:
1034710326
version "0.1.7"
@@ -10873,11 +10852,9 @@ pretty@^2.0.0:
1087310852
js-beautify "^1.6.12"
1087410853

1087510854
prismjs@^1.13.0:
10876-
version "1.23.0"
10877-
resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.23.0.tgz#d3b3967f7d72440690497652a9d40ff046067f33"
10878-
integrity sha512-c29LVsqOaLbBHuIbsTxaKENh1N2EQBOHaWv7gkHN4dgRbxSREqDnDbtFJYdpPauS4YCplMSNCABQ6Eeor69bAA==
10879-
optionalDependencies:
10880-
clipboard "^2.0.0"
10855+
version "1.24.0"
10856+
resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.24.0.tgz#0409c30068a6c52c89ef7f1089b3ca4de56be2ac"
10857+
integrity sha512-SqV5GRsNqnzCL8k5dfAjCNhUrF3pR0A9lTDSCUZeh/LIshheXJEaP0hwLz2t4XHivd2J/v2HR+gRnigzeKe3cQ==
1088110858

1088210859
process-nextick-args@~2.0.0:
1088310860
version "2.0.1"
@@ -11805,11 +11782,6 @@ select-hose@^2.0.0:
1180511782
resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
1180611783
integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
1180711784

11808-
select@^1.1.2:
11809-
version "1.1.2"
11810-
resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
11811-
integrity sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=
11812-
1181311785
selfsigned@^1.10.7:
1181411786
version "1.10.7"
1181511787
resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.7.tgz#da5819fd049d5574f28e88a9bcc6dbc6e6f3906b"
@@ -12862,11 +12834,6 @@ timsort@^0.3.0:
1286212834
resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
1286312835
integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=
1286412836

12865-
tiny-emitter@^2.0.0:
12866-
version "2.1.0"
12867-
resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"
12868-
integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==
12869-
1287012837
tmp@0.2.1:
1287112838
version "0.2.1"
1287212839
resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"

0 commit comments

Comments
 (0)