Merge pull request #20 from vuejs/dev

Author: eddyerburgh

docs/en/api/mount.md

@@ -9,11 +9,11 @@
     - `{Object} slots`  
         - `{Array<Componet|Object>|Component|String} default`  
         - `{Array<Componet|Object>|Component|String} named`  
-    - `{Object} globals`
-    - `{Object} instance`
-    - `{Object} stub` 
-    
-- **Arguments:**
+    - `{Object} intercept`
+    - `{Object|Array<string>} stubs`
+    - `{boolean} clone`
+    - `{Object} children`
+    - `{Vue} localVue`
 
 - **Returns:** `{Wrapper}`
 
@@ -27,6 +27,8 @@
 
 `options.context` (`Object`): Passes context to functional component. Can only be used with functional components
 
+`options.children` (`Array<string|Component|Function>`): Passes children to be rendered by functional components
+
 `options.localVue` (`Object`): vue class to use in `mount`. See [createLocalVue](/api/createLocalVue.md)
 
 `options.slots` (`Object`): Render component with slots.
@@ -35,9 +37,9 @@
 
 `options.slots.name` (`Array[Component]|Component`): Named slots. i.e. slots.name will match a <slot name="name" />, can be a Vue component or array of Vue components
 
-`options.globals` (`Object`): Add globals to Vue instance.
+`options.intercept` (`Object`): Add globals to Vue instance.
 
-`options.stub` (`Object|Array<string>`): Stubs components matching the name. Takes object or array of strings 
+`options.stubs` (`Object|Array<string>`): Stubs components matching the name. Takes object or array of strings
 
 - **Usage:**
 

docs/en/api/shallow.md

@@ -6,14 +6,14 @@
   - `{Object} options`
     - `{boolean} attachToDocument`
     - `{Object} context`
-    - `{Object} slots`  
-        - `{Array<Componet|Object>|Component|String} default`  
-        - `{Array<Componet|Object>|Component|String} named`  
-    - `{Object} globals`
-    - `{Object} instance`
-    - `{Object} stub` 
-    
-- **Arguments:**
+    - `{Object} slots`
+        - `{Array<Componet|Object>|Component|String} default`
+        - `{Array<Componet|Object>|Component|String} named`
+    - `{Object} intercept`
+    - `{Object|Array<string>} stubs`
+    - `{boolean} clone`
+    - `{Object} children`
+    - `{Vue} localVue`
 
 - **Returns:** `{Wrapper}`
 
@@ -27,6 +27,8 @@
 
 `options.context` (`Object`): Passes context to functional component. Can only be used with functional components
 
+`options.children` (`Array<string|Component|Function>`): Passes children to be rendered by functional components
+
 `options.localVue` (`Object`): vue class to use in `mount`. See [createLocalVue](/api/createLocalVue.md)
 
 `options.slots` (`Object`): Render component with slots.
@@ -35,9 +37,9 @@
 
 `options.slots.name` (`Array[Component]|Component`): Named slots. i.e. slots.name will match a <slot name="name" />, can be a Vue component or array of Vue components
 
-`options.globals` (`Object`): Add globals to Vue instance.
+`options.intercept` (`Object`): Add globals to Vue instance.
 
-`options.stub` (`Object|Array<string>`): Stubs components matching the name. Takes object or array of strings 
+`options.stubs` (`Object|Array<string>`): Stubs components matching the name. Takes object or array of strings
 
 - **Usage:**
 

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

@@ -69,21 +69,21 @@ describe('Actions.vue', () => {
     const wrapper = mount(Actions, { store })
     const input = wrapper.find('input')[0]
     input.element.value = 'input'
-    input.dispatch('input')
+    input.trigger('input')
     expect(actions.actionInput.calledOnce).to.equal(true)
   })
 
   it('does not call store action actionInput when input value is not input and an input even is fired', () => {
     const wrapper = mount(Actions, { store })
     const input = wrapper.find('input')[0]
     input.element.value = 'not input'
-    input.dispatch('input')
+    input.trigger('input')
     expect(actions.actionInput.calledOnce).to.equal(false)
   })
 
   it('calls store action actionClick when button is clicked', () => {
     const wrapper = mount(Actions, { store })
-    wrapper.find('button')[0].dispatch('click')
+    wrapper.find('button')[0].trigger('click')
     expect(actions.actionClick.calledOnce).to.equal(true)
   })
 })
@@ -245,7 +245,7 @@ describe('Modules.vue', () => {
   it('calls store action moduleActionClick when button is clicked', () => {
     const wrapper = mount(Modules, { store })
     const button = wrapper.find('button')[0]
-    button.dispatch('click')
+    button.trigger('click')
     expect(actions.moduleActionClick.calledOnce).to.equal(true)
   })