Skip to content

Commit c5b5bdd

Browse files
MachinisteWebMachinisteWeb
committed
Merge remote-tracking branch 'upstream/dev' into working
# Conflicts: # docs/en/api/README.md # docs/en/guides/using-with-vuex.md Signed-off-by: Bruno Lesieur <[email protected]>
2 parents a603a1a + 5da6821 commit c5b5bdd

File tree

186 files changed

+6427
-196
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

186 files changed

+6427
-196
lines changed

‎docs/LANGS.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@
33
* [日本語](ja/)
44
* [简体中文](zh-cn/)
55
* [Portuguese (Brazil)](pt-br/)
6+
* [Русский](ru/)
7+
* [한국어](kr/)

‎docs/en/README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
* [contains](api/wrapper/contains.md)
3131
* [emitted](api/wrapper/emitted.md)
3232
* [emittedByOrder](api/wrapper/emittedByOrder.md)
33+
* [exists](api/wrapper/exists.md)
34+
* [destroy](api/wrapper/destroy.md)
3335
* [find](api/wrapper/find.md)
3436
* [findAll](api/wrapper/findAll.md)
3537
* [hasAttribute](api/wrapper/hasAttribute.md)
@@ -48,10 +50,11 @@
4850
* [text](api/wrapper/text.md)
4951
* [trigger](api/wrapper/trigger.md)
5052
* [update](api/wrapper/update.md)
51-
* [destroy](api/wrapper/destroy.md)
5253
* [WrapperArray](api/wrapper-array/README.md)
5354
* [at](api/wrapper-array/at.md)
5455
* [contains](api/wrapper-array/contains.md)
56+
* [exists](api/wrapper/exists.md)
57+
* [destroy](api/wrapper-array/destroy.md)
5558
* [hasAttribute](api/wrapper-array/hasAttribute.md)
5659
* [hasClass](api/wrapper-array/hasClass.md)
5760
* [hasProp](api/wrapper-array/hasProp.md)
@@ -65,7 +68,6 @@
6568
* [setProps](api/wrapper-array/setProps.md)
6669
* [trigger](api/wrapper-array/trigger.md)
6770
* [update](api/wrapper-array/update.md)
68-
* [destroy](api/wrapper-array/destroy.md)
6971
* [components](api/components/README.md)
7072
* [TransitionStub](api/components/TransitionStub.md)
7173
* [TransitionGroupStub](api/components/TransitionGroupStub.md)

‎docs/en/SUMMARY.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
* [contains](api/wrapper/contains.md)
2727
* [emitted](api/wrapper/emitted.md)
2828
* [emittedByOrder](api/wrapper/emittedByOrder.md)
29+
* [exists](api/wrapper/exists.md)
30+
* [destroy](api/wrapper/destroy.md)
2931
* [find](api/wrapper/find.md)
3032
* [findAll](api/wrapper/findAll.md)
3133
* [hasAttribute](api/wrapper/hasAttribute.md)
@@ -44,10 +46,11 @@
4446
* [text](api/wrapper/text.md)
4547
* [trigger](api/wrapper/trigger.md)
4648
* [update](api/wrapper/update.md)
47-
* [destroy](api/wrapper/destroy.md)
4849
* [WrapperArray](api/wrapper-array/README.md)
4950
* [at](api/wrapper-array/at.md)
5051
* [contains](api/wrapper-array/contains.md)
52+
* [exists](api/wrapper/exists.md)
53+
* [destroy](api/wrapper-array/destroy.md)
5154
* [hasAttribute](api/wrapper-array/hasAttribute.md)
5255
* [hasClass](api/wrapper-array/hasClass.md)
5356
* [hasProp](api/wrapper-array/hasProp.md)
@@ -61,7 +64,6 @@
6164
* [setProps](api/wrapper-array/setProps.md)
6265
* [trigger](api/wrapper-array/trigger.md)
6366
* [update](api/wrapper-array/update.md)
64-
* [destroy](api/wrapper-array/destroy.md)
6567
* [components](api/components/README.md)
6668
* [TransitionStub](api/components/TransitionStub.md)
6769
* [TransitionGroupStub](api/components/TransitionGroupStub.md)

‎docs/en/api/README.md

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
* [mount (EN)](./mount.md)
44
* [shallow (EN)](./shallow.md)
5-
* [Options de montage (EN)](./options.md)
5+
* [Mounting Options (EN)](./options.md)
66
- [context (EN)](./options.md#context)
77
- [slots (EN)](./options.md#slots)
88
- [stubs (EN)](./options.md#stubs)
@@ -16,6 +16,8 @@
1616
* [contains (EN)](./wrapper/contains.md)
1717
* [emitted (EN)](./wrapper/emitted.md)
1818
* [emittedByOrder (EN)](./wrapper/emittedByOrder.md)
19+
* [exists (EN)](./wrapper/exists.md)
20+
* [destroy (EN)](./wrapper/destroy.md)
1921
* [find (EN)](./wrapper/find.md)
2022
* [findAll (EN)](./wrapper/findAll.md)
2123
* [hasAttribute (EN)](./wrapper/hasAttribute.md)
@@ -27,17 +29,18 @@
2729
* [isEmpty (EN)](./wrapper/isEmpty.md)
2830
* [isVueInstance (EN)](./wrapper/isVueInstance.md)
2931
* [name (EN)](./wrapper/name.md)
30-
* [setComputed](./wrapper/setComputed.md)
31-
* [setData](./wrapper/setData.md)
32-
* [setMethods](./wrapper/setMethods.md)
33-
* [setProps](./wrapper/setProps.md)
34-
* [text](./wrapper/text.md)
32+
* [setComputed (EN)](./wrapper/setComputed.md)
33+
* [setData (EN)](./wrapper/setData.md)
34+
* [setMethods (EN)](./wrapper/setMethods.md)
35+
* [setProps (EN)](./wrapper/setProps.md)
36+
* [text (EN)](./wrapper/text.md)
3537
* [trigger (EN)](./wrapper/trigger.md)
3638
* [update (EN)](./wrapper/update.md)
37-
* [destroy (EN)](./wrapper/destroy.md)
3839
* [WrapperArray (EN)](./wrapper-array/README.md)
3940
* [at (EN)](./wrapper-array/at.md)
4041
* [contains (EN)](./wrapper-array/contains.md)
42+
* [exists (EN)](./wrapper/exists.md)
43+
* [destroy (EN)](./wrapper-array/destroy.md)
4144
* [hasAttribute (EN)](./wrapper-array/hasAttribute.md)
4245
* [hasClass (EN)](./wrapper-array/hasClass.md)
4346
* [hasProp (EN)](./wrapper-array/hasProp.md)
@@ -51,10 +54,9 @@
5154
* [setProps (EN)](./wrapper-array/setProps.md)
5255
* [trigger (EN)](./wrapper-array/trigger.md)
5356
* [update (EN)](./wrapper-array/update.md)
54-
* [destroy (EN)](./wrapper-array/destroy.md)
55-
* [components](./components/README.md)
56-
* [TransitionStub](./components/TransitionStub.md)
57-
* [TransitionGroupStub](./components/TransitionGroupStub.md)
57+
* [components (EN)](./components/README.md)
58+
* [TransitionStub (EN)](./components/TransitionStub.md)
59+
* [TransitionGroupStub (EN)](./components/TransitionGroupStub.md)
60+
* [Selectors (EN)](./selectors.md)
5861
* [createLocalVue (EN)](./createLocalVue.md)
59-
* [Selecteurs (EN)](./selectors.md)
60-
* [config (EN)](./config.md)
62+
* [config (EN)](./config.md)

‎docs/en/api/mount.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ import Faz from './Faz.vue'
122122
describe('Foo', () => {
123123
it('renders a div', () => {
124124
const wrapper = mount(Foo, {
125-
stub: {
126-
Bar: '<div class="stubbed />',
125+
stubs: {
126+
Bar: '<div class="stubbed" />',
127127
BarFoo: true,
128128
FooBar: Faz
129129
}

‎docs/en/api/options.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Vue options are passed to the component when a new instance is created. , e.g. `
1313
- [`localVue`](#localvue)
1414
- [`attachToDocument`](#attachtodocument)
1515
- [`attrs`](#attrs)
16+
- [`provide`](#provide)
1617
- [`listeners`](#listeners)
1718
- [`clone`](#clone)
1819

@@ -160,6 +161,8 @@ Set the component instance's `$listeners` object.
160161

161162
Clones component before mounting if `true`, which avoids mutating the original component definition.
162163

163-
`options.mocks` (`Object`): Add globals to Vue instance.
164+
### `provide`
164165

165-
`options.localVue` (`Object`): `Vue` class to use in `mount`. See [`createLocalVue`](createLocalVue.md).
166+
- type: `Object`
167+
168+
Pass properties for components to use in injection. See [provide/inject](https://vuejs.org/v2/api/#provide-inject).

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ A `Wrapper` is an object that contains a mounted component or vnode and methods
66

77
- **Properties:**
88

9-
`vm` `Component`: this is the `Vue` instance. You can access all the [instance methods and properties of a vm](https://vuejs.org/v2/api/#Instance-Properties) with `wrapper.vm`. This only exists on Vue component wrappers
10-
`element` `HTMLElement`: the root DOM node of the wrapper
11-
`options` `Object`: Object containing `vue-test-utils` options passed to `mount` or `shallow`
12-
`options.attachedToDom` `Boolean`: True if `attachToDom` was passed to `mount` or `shallow`
9+
`vm` `Component`: this is the `Vue` instance. You can access all the [instance methods and properties of a vm](https://vuejs.org/v2/api/#Instance-Properties) with `wrapper.vm`. This only exists on Vue component wrappers
10+
`element` `HTMLElement`: the root DOM node of the wrapper
11+
`options` `Object`: Object containing `vue-test-utils` options passed to `mount` or `shallow`
12+
`options.attachedToDom` `Boolean`: True if `attachToDom` was passed to `mount` or `shallow`
1313

1414
- **Methods:**
1515

‎docs/en/guides/common-tips.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Des composants pourraient se fier à des fonctionnalités injectées par un plug
9494
Si vous écrivez des tests pour des composants dans une application spécifique, vous pouvez mettre en place les mêmes plugins globaux et mixins en une seule fois dans vos tests. Dans certains cas, comme tester un composant générique utilisé par des applications différentes, il est favorable de tester ces composants dans une installation plus isolée, sans avoir à polluer le constructeur global `Vue`. On peut utiliser la méthode [`createLocalVue`](../api/createLocalVue.md) pour faire cela :
9595

9696
``` js
97-
import createLocalVue from 'vue-test-utils'
97+
import { createLocalVue } from 'vue-test-utils'
9898

9999
// créer un constructeur local de `Vue`
100100
const localVue = createLocalVue()

‎docs/en/guides/getting-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ Si vous avez toujours besoin de `nextTick` dans vos fichiers de tests, faites at
114114

115115
```js
116116
// ceci ne sera pas intercepté
117-
it('pas d'interception, (done) => {
117+
it('pas d\'interception, (done) => {
118118
Vue.nextTick(() => {
119119
expect(true).toBe(false)
120120
done()

‎docs/en/guides/using-with-vuex.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ Génial, on peut désormais simuler des actions. Allons avoir comment simuler de
109109

110110
## Simuler des accesseurs
111111

112-
113112
``` html
114113
<template>
115114
<div>

‎docs/fr/README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
* [contains](api/wrapper/contains.md)
3131
* [emitted](api/wrapper/emitted.md)
3232
* [emittedByOrder](api/wrapper/emittedByOrder.md)
33+
* [exists](api/wrapper/exists.md)
34+
* [destroy](api/wrapper/destroy.md)
3335
* [find](api/wrapper/find.md)
3436
* [findAll](api/wrapper/findAll.md)
3537
* [hasAttribute](api/wrapper/hasAttribute.md)
@@ -48,10 +50,11 @@
4850
* [text](api/wrapper/text.md)
4951
* [trigger](api/wrapper/trigger.md)
5052
* [update](api/wrapper/update.md)
51-
* [destroy](api/wrapper/destroy.md)
5253
* [WrapperArray](api/wrapper-array/README.md)
5354
* [at](api/wrapper-array/at.md)
5455
* [contains](api/wrapper-array/contains.md)
56+
* [exists](api/wrapper/exists.md)
57+
* [destroy](api/wrapper-array/destroy.md)
5558
* [hasAttribute](api/wrapper-array/hasAttribute.md)
5659
* [hasClass](api/wrapper-array/hasClass.md)
5760
* [hasProp](api/wrapper-array/hasProp.md)
@@ -65,7 +68,6 @@
6568
* [setProps](api/wrapper-array/setProps.md)
6669
* [trigger](api/wrapper-array/trigger.md)
6770
* [update](api/wrapper-array/update.md)
68-
* [destroy](api/wrapper-array/destroy.md)
6971
* [components](api/components/README.md)
7072
* [TransitionStub](api/components/TransitionStub.md)
7173
* [TransitionGroupStub](api/components/TransitionGroupStub.md)

‎docs/fr/SUMMARY.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
* [contains](api/wrapper/contains.md)
2727
* [emitted](api/wrapper/emitted.md)
2828
* [emittedByOrder](api/wrapper/emittedByOrder.md)
29+
* [exists](api/wrapper/exists.md)
30+
* [destroy](api/wrapper/destroy.md)
2931
* [find](api/wrapper/find.md)
3032
* [findAll](api/wrapper/findAll.md)
3133
* [hasAttribute](api/wrapper/hasAttribute.md)
@@ -44,10 +46,11 @@
4446
* [text](api/wrapper/text.md)
4547
* [trigger](api/wrapper/trigger.md)
4648
* [update](api/wrapper/update.md)
47-
* [destroy](api/wrapper/destroy.md)
4849
* [WrapperArray](api/wrapper-array/README.md)
4950
* [at](api/wrapper-array/at.md)
5051
* [contains](api/wrapper-array/contains.md)
52+
* [exists](api/wrapper/exists.md)
53+
* [destroy](api/wrapper-array/destroy.md)
5154
* [hasAttribute](api/wrapper-array/hasAttribute.md)
5255
* [hasClass](api/wrapper-array/hasClass.md)
5356
* [hasProp](api/wrapper-array/hasProp.md)
@@ -61,7 +64,6 @@
6164
* [setProps](api/wrapper-array/setProps.md)
6265
* [trigger](api/wrapper-array/trigger.md)
6366
* [update](api/wrapper-array/update.md)
64-
* [destroy](api/wrapper-array/destroy.md)
6567
* [components](api/components/README.md)
6668
* [TransitionStub](api/components/TransitionStub.md)
6769
* [TransitionGroupStub](api/components/TransitionGroupStub.md)

‎docs/fr/api/README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
* [contains (EN)](./wrapper/contains.md)
1717
* [emitted (EN)](./wrapper/emitted.md)
1818
* [emittedByOrder (EN)](./wrapper/emittedByOrder.md)
19+
* [exists](./wrapper/exists.md)
20+
* [destroy (EN)](./wrapper/destroy.md)
1921
* [find (EN)](./wrapper/find.md)
2022
* [findAll (EN)](./wrapper/findAll.md)
2123
* [hasAttribute (EN)](./wrapper/hasAttribute.md)
@@ -34,10 +36,11 @@
3436
* [text](./wrapper/text.md)
3537
* [trigger (EN)](./wrapper/trigger.md)
3638
* [update (EN)](./wrapper/update.md)
37-
* [destroy (EN)](./wrapper/destroy.md)
3839
* [WrapperArray (EN)](./wrapper-array/README.md)
3940
* [at (EN)](./wrapper-array/at.md)
4041
* [contains (EN)](./wrapper-array/contains.md)
42+
* [exists](./wrapper/exists.md)
43+
* [destroy (EN)](./wrapper-array/destroy.md)
4144
* [hasAttribute (EN)](./wrapper-array/hasAttribute.md)
4245
* [hasClass (EN)](./wrapper-array/hasClass.md)
4346
* [hasProp (EN)](./wrapper-array/hasProp.md)
@@ -51,10 +54,9 @@
5154
* [setProps (EN)](./wrapper-array/setProps.md)
5255
* [trigger (EN)](./wrapper-array/trigger.md)
5356
* [update (EN)](./wrapper-array/update.md)
54-
* [destroy (EN)](./wrapper-array/destroy.md)
5557
* [components](./components/README.md)
5658
* [TransitionStub](./components/TransitionStub.md)
5759
* [TransitionGroupStub](./components/TransitionGroupStub.md)
5860
* [createLocalVue (EN)](./createLocalVue.md)
5961
* [Selecteurs (EN)](./selectors.md)
60-
* [config (EN)](./config.md)
62+
* [config (EN)](./config.md)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ A `Wrapper` is an object that contains a mounted component or vnode and methods
66

77
- **Properties:**
88

9-
`vm` `Component`: this is the `Vue` instance. You can access all the [instance methods and properties of a vm](https://vuejs.org/v2/api/#Instance-Properties) with `wrapper.vm`. This only exists on Vue component wrappers
10-
`element` `HTMLElement`: the root DOM node of the wrapper
11-
`options` `Object`: Object containing `vue-test-utils` options passed to `mount` or `shallow`
12-
`options.attachedToDom` `Boolean`: True if `attachToDom` was passed to `mount` or `shallow`
9+
`vm` `Component`: this is the `Vue` instance. You can access all the [instance methods and properties of a vm](https://vuejs.org/v2/api/#Instance-Properties) with `wrapper.vm`. This only exists on Vue component wrappers
10+
`element` `HTMLElement`: the root DOM node of the wrapper
11+
`options` `Object`: Object containing `vue-test-utils` options passed to `mount` or `shallow`
12+
`options.attachedToDom` `Boolean`: True if `attachToDom` was passed to `mount` or `shallow`
1313

1414
- **Methods:**
1515

‎docs/fr/guides/common-tips.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Des composants pourraient se fier à des fonctionnalités injectées par un plug
9494
Si vous écrivez des tests pour des composants dans une application spécifique, vous pouvez mettre en place les mêmes plugins globaux et mixins en une seule fois dans vos tests. Dans certains cas, comme tester un composant générique utilisé par des applications différentes, il est favorable de tester ces composants dans une installation plus isolée, sans avoir à polluer le constructeur global `Vue`. On peut utiliser la méthode [`createLocalVue`](../api/createLocalVue.md) pour faire cela :
9595

9696
``` js
97-
import createLocalVue from 'vue-test-utils'
97+
import { createLocalVue } from 'vue-test-utils'
9898

9999
// créer un constructeur local de `Vue`
100100
const localVue = createLocalVue()

‎docs/ja/README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
* [contains](api/wrapper/contains.md)
2929
* [emitted](api/wrapper/emitted.md)
3030
* [emittedByOrder](api/wrapper/emittedByOrder.md)
31+
* [exists](api/wrapper/exists.md)
32+
* [destroy](api/wrapper/destroy.md)
3133
* [find](api/wrapper/find.md)
3234
* [findAll](api/wrapper/findAll.md)
3335
* [hasAttribute](api/wrapper/hasAttribute.md)
@@ -46,10 +48,11 @@
4648
* [text](api/wrapper/text.md)
4749
* [trigger](api/wrapper/trigger.md)
4850
* [update](api/wrapper/update.md)
49-
* [destroy](api/wrapper/destroy.md)
5051
* [WrapperArray](api/wrapper-array/README.md)
5152
* [at](api/wrapper-array/at.md)
5253
* [contains](api/wrapper-array/contains.md)
54+
* [exists](api/wrapper/exists.md)
55+
* [destroy](api/wrapper-array/destroy.md)
5356
* [hasAttribute](api/wrapper-array/hasAttribute.md)
5457
* [hasClass](api/wrapper-array/hasClass.md)
5558
* [hasProp](api/wrapper-array/hasProp.md)
@@ -63,7 +66,6 @@
6366
* [setProps](api/wrapper-array/setProps.md)
6467
* [trigger](api/wrapper-array/trigger.md)
6568
* [update](api/wrapper-array/update.md)
66-
* [destroy](api/wrapper-array/destroy.md)
6769
* [コンポーネント](api/components/README.md)
6870
* [TransitionStub](api/components/TransitionStub.md)
6971
* [TransitionGroupStub](api/components/TransitionGroupStub.md)

‎docs/ja/SUMMARY.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
* [contains](api/wrapper/contains.md)
2727
* [emitted](api/wrapper/emitted.md)
2828
* [emittedByOrder](api/wrapper/emittedByOrder.md)
29+
* [exists](api/wrapper/exists.md)
30+
* [destroy](api/wrapper/destroy.md)
2931
* [find](api/wrapper/find.md)
3032
* [findAll](api/wrapper/findAll.md)
3133
* [hasAttribute](api/wrapper/hasAttribute.md)
@@ -44,10 +46,11 @@
4446
* [text](api/wrapper/text.md)
4547
* [trigger](api/wrapper/trigger.md)
4648
* [update](api/wrapper/update.md)
47-
* [destroy](api/wrapper/destroy.md)
4849
* [WrapperArray](api/wrapper-array/README.md)
4950
* [at](api/wrapper-array/at.md)
5051
* [contains](api/wrapper-array/contains.md)
52+
* [exists](api/wrapper/exists.md)
53+
* [destroy](api/wrapper-array/destroy.md)
5154
* [hasAttribute](api/wrapper-array/hasAttribute.md)
5255
* [hasClass](api/wrapper-array/hasClass.md)
5356
* [hasProp](api/wrapper-array/hasProp.md)
@@ -61,7 +64,6 @@
6164
* [setProps](api/wrapper-array/setProps.md)
6265
* [trigger](api/wrapper-array/trigger.md)
6366
* [update](api/wrapper-array/update.md)
64-
* [destroy](api/wrapper-array/destroy.md)
6567
* [コンポーネント](api/components/README.md)
6668
* [TransitionStub](api/components/TransitionStub.md)
6769
* [TransitionGroupStub](api/components/TransitionGroupStub.md)

0 commit comments

Comments
 (0)