Merge branch 'upstream/dev' into translate-ja

Author: kazupon

docs/en/README.md

@@ -11,13 +11,24 @@
   * [Using with Vue Router](guides/using-with-vue-router.md)
   * [Using with Vuex](guides/using-with-vuex.md)
 * [API](api/README.md)
-  * [createLocalVue](api/createLocalVue.md)
   * [mount](api/mount.md)
   * [shallow](api/shallow.md)
   * [Mounting Options](api/options.md)
+    - [context](api/options.md#context)
+    - [slots](api/options.md#slots)
+    - [stubs](api/options.md#stubs)
+    - [mocks](api/options.md#mocks)
+    - [localVue](api/options.md#localvue)
+    - [attachToDocument](api/options.md#attachtodocument)
+    - [attrs](api/options.md#attrs)
+    - [listeners](api/options.md#listeners)
+    - [clone](api/options.md#clone)
   * [Wrapper](api/wrapper/README.md)
     * [contains](api/wrapper/contains.md)
+    * [emitted](api/wrapper/emitted.md)
+    * [emittedByOrder](api/wrapper/emittedByOrder.md)
     * [find](api/wrapper/find.md)
+    * [findAll](api/wrapper/findAll.md)
     * [hasAttribute](api/wrapper/hasAttribute.md)
     * [hasClass](api/wrapper/hasClass.md)
     * [hasProp](api/wrapper/hasProp.md)
@@ -27,11 +38,12 @@
     * [isEmpty](api/wrapper/isEmpty.md)
     * [isVueInstance](api/wrapper/isVueInstance.md)
     * [name](api/wrapper/name.md)
-    * [update](api/wrapper/update.md)
     * [setData](api/wrapper/setData.md)
+    * [setMethods](api/wrapper/setMethods.md)
     * [setProps](api/wrapper/setProps.md)
     * [text](api/wrapper/text.md)
     * [trigger](api/wrapper/trigger.md)
+    * [update](api/wrapper/update.md)
   * [WrapperArray](api/wrapper-array/README.md)
     * [at](api/wrapper-array/at.md)
     * [contains](api/wrapper-array/contains.md)
@@ -42,8 +54,10 @@
     * [is](api/wrapper-array/is.md)
     * [isEmpty](api/wrapper-array/isEmpty.md)
     * [isVueInstance](api/wrapper-array/isVueInstance.md)
-    * [update](api/wrapper-array/update.md)
     * [setData](api/wrapper-array/setData.md)
+    * [setMethods](api/wrapper-array/setMethods.md)
     * [setProps](api/wrapper-array/setProps.md)
     * [trigger](api/wrapper-array/trigger.md)
+    * [update](api/wrapper-array/update.md)
   * [Selectors](api/selectors.md)
+  * [createLocalVue](api/createLocalVue.md)

docs/en/api/mount.md

@@ -1,4 +1,4 @@
-# mount(component,{,options}])
+# mount(component {, options}])
 
 - **Arguments:**
 

docs/en/api/shallow.md

@@ -1,4 +1,4 @@
-# shallow(component,{,options}])
+# shallow(component {, options}])
 
 - **Arguments:**
 
@@ -19,15 +19,15 @@
 
 - **Options:**
 
-See [options](/docs/en/api/options.md)
+See [options](./options.md)
 
 - **Usage:**
 
-Returns [`Wrapper`](/docs/en/api/wrapper/README.md) of first DOM node or Vue component matching selector.
+Returns [`Wrapper`](./wrapper/README.md) of first DOM node or Vue component matching selector.
 
 Stubs all child components.
 
-Use any valid [selector](/docs/en/api/selectors.md).
+Use any valid [selector](./selectors.md).
 
 **Without options:**
 

docs/en/api/wrapper/find.md

@@ -24,4 +24,4 @@ const bar = wrapper.find(Bar)
 expect(bar.is(Bar)).toBe(true)
 ```
 
-- **See also:** [Wrapper](/docs/en/api/wrapper/README.md)
+- **See also:** [Wrapper](README.md)

docs/en/guides/README.md

@@ -6,4 +6,5 @@
 * [Using with Jest](./using-with-jest.md)
 * [Testing SFCs with Jest](./testing-SFCs-with-jest.md)
 * [Testing SFCs with Mocha + webpack](./testing-SFCs-with-mocha-webpack.md)
+* [Using with Vue Router](./using-with-vue-router.md)
 * [Using with Vuex](./using-with-vuex.md)

docs/en/guides/common-tips.md

@@ -58,7 +58,7 @@ expect(wrapper.emitted().foo.length).toBe(2)
 expect(wrapper.emitted().foo[1]).toEqual([123])
 ```
 
-You can also get an Array of the events in their emit order by calling [wrapper.emittedByOrder()](../api/emittedByOrder.md).
+You can also get an Array of the events in their emit order by calling [wrapper.emittedByOrder()](../api/wrapper/emittedByOrder.md).
 
 ## Manipulating Component State
 
@@ -86,7 +86,7 @@ mount(Component, {
 
 You can also update the props of an already-mounted component with the `wrapper.setProps({})` method.
 
-*For a full list of options, please see the [mount options section](./api/options.md) of the docs.*
+*For a full list of options, please see the [mount options section](../api/options.md) of the docs.*
 
 ## Applying Global Plugins and Mixins
 

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

@@ -67,15 +67,15 @@ describe('Actions.vue', () => {
     })
   })
 
-  it('calls store action actionInput when input value is input and an input even is fired', () => {
+  it('calls store action actionInput when input value is input and an input event is fired', () => {
     const wrapper = shallow(Actions, { store, localVue })
     const input = wrapper.find('input')
     input.element.value = 'input'
     input.trigger('input')
     expect(actions.actionInput).toHaveBeenCalled()
   })
 
-  it('does not call store action actionInput when input value is not input and an input even is fired', () => {
+  it('does not call store action actionInput when input value is not input and an input event is fired', () => {
     const wrapper = shallow(Actions, { store, localVue })
     const input = wrapper.find('input')
     input.element.value = 'not input'

src/create-local-vue.js

@@ -30,10 +30,10 @@ function createLocalVue (): Component {
 
   // compat for vue-router < 2.7.1 where it does not allow multiple installs
   const use = instance.use
-  instance.use = (plugin) => {
+  instance.use = (plugin, ...rest) => {
     plugin.installed = false
     plugin.install.installed = false
-    use.call(instance, plugin)
+    use.call(instance, plugin, ...rest)
   }
   return instance
 }

test/unit/specs/create-local-vue.spec.js

@@ -95,4 +95,15 @@ describe('createLocalVue', () => {
     const freshWrapper = mount(Component)
     expect(typeof freshWrapper.vm.$route).to.equal('undefined')
   })
+
+  it('use can take additional arguments', () => {
+    const localVue = createLocalVue()
+    const pluginOptions = { foo: 'bar' }
+    const plugin = {
+      install: function (_Vue, options) {
+        expect(options).to.equal(pluginOptions)
+      }
+    }
+    localVue.use(plugin, pluginOptions)
+  })
 })