chore: merge

Author: eddyerburgh

.babelrc

@@ -1,5 +1,5 @@
 {
   "presets": ["env", "stage-2", "flow-vue"],
-  "plugins": ["transform-decorators-legacy"],
+  "plugins": ["transform-decorators-legacy", "transform-vue-jsx"],
   "comments": false
 }

.circleci/config.yml

@@ -103,7 +103,7 @@ jobs:
       - attach_workspace:
           at: ~/repo
       - *restore_node_modules
-      - run: yarn test:compat "2.5.13"
+      - run: yarn test:compat "2.5.16"
 workflows:
   version: 2
   install-tests:

.github/CONTRIBUTING.md

@@ -82,7 +82,7 @@ The default test script will do the following: lint with ESLint -> type check wi
 
   - **`create-instance`**: private package that creates an instance and applies mounting options.
 
-  - **`shared`**: private package that contains utilities used by the other packzges.
+  - **`shared`**: private package that contains utilities used by the other packages.
 
 - **`scripts`**: contains build-related scripts and configuration files. In most cases you don't need to touch them.
 

CHANGELOG.md

@@ -3,6 +3,78 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="1.0.0-beta.23"></a>
+# [1.0.0-beta.23](https://github.com/vuejs/vue-test-utils/compare/v1.0.0-beta.22...v1.0.0-beta.23) (2018-07-31)
+
+
+### Bug Fixes
+
+* add stubs/mocks to extended components ([#881](https://github.com/vuejs/vue-test-utils/issues/881)) ([862ce5c](https://github.com/vuejs/vue-test-utils/commit/862ce5c))
+
+
+
+
+<a name="1.0.0-beta.22"></a>
+# [1.0.0-beta.22](https://github.com/vuejs/vue-test-utils/compare/v1.0.0-beta.21...v1.0.0-beta.22) (2018-07-29)
+
+
+### Bug Fixes
+
+*  remove incorrect test ([#847](https://github.com/vuejs/vue-test-utils/issues/847)) ([e9374b8](https://github.com/vuejs/vue-test-utils/commit/e9374b8))
+* add unused propsData as component attributes ([#865](https://github.com/vuejs/vue-test-utils/issues/865)) ([c747cd6](https://github.com/vuejs/vue-test-utils/commit/c747cd6))
+* clear static tree for slots render ([#862](https://github.com/vuejs/vue-test-utils/issues/862)) ([c7ac0d9](https://github.com/vuejs/vue-test-utils/commit/c7ac0d9))
+* handle dynamic imports ([#864](https://github.com/vuejs/vue-test-utils/issues/864)) ([4e739bd](https://github.com/vuejs/vue-test-utils/commit/4e739bd))
+* keep the overrides prototype information of component ([#856](https://github.com/vuejs/vue-test-utils/issues/856)) ([0371793](https://github.com/vuejs/vue-test-utils/commit/0371793))
+* render children for functional component stubs ([#860](https://github.com/vuejs/vue-test-utils/issues/860)) ([e2e48dc](https://github.com/vuejs/vue-test-utils/commit/e2e48dc))
+* stub globally registered components ([#859](https://github.com/vuejs/vue-test-utils/issues/859)) ([5af3677](https://github.com/vuejs/vue-test-utils/commit/5af3677))
+* support multiple default slot nodes ([#861](https://github.com/vuejs/vue-test-utils/issues/861)) ([85dd3ec](https://github.com/vuejs/vue-test-utils/commit/85dd3ec))
+
+
+### Features
+
+* add support for JSX scopedSlots value ([#871](https://github.com/vuejs/vue-test-utils/issues/871)) ([13bcaeb](https://github.com/vuejs/vue-test-utils/commit/13bcaeb))
+* export createWrapper method to create wrapper from instance ([#868](https://github.com/vuejs/vue-test-utils/issues/868)) ([ebca3b3](https://github.com/vuejs/vue-test-utils/commit/ebca3b3))
+* export wrapper class ([#866](https://github.com/vuejs/vue-test-utils/issues/866)) ([c212ebf](https://github.com/vuejs/vue-test-utils/commit/c212ebf))
+* render props on auto stubs ([#834](https://github.com/vuejs/vue-test-utils/issues/834)) ([8db502d](https://github.com/vuejs/vue-test-utils/commit/8db502d))
+
+
+
+
+<a name="1.0.0-beta.21"></a>
+# [1.0.0-beta.21](https://github.com/vuejs/vue-test-utils/compare/v1.0.0-beta.20...v1.0.0-beta.21) (2018-07-22)
+
+
+### Bug Fixes
+
+* broken links for deprecated methods ([#786](https://github.com/vuejs/vue-test-utils/issues/786)) ([5bb6a0b](https://github.com/vuejs/vue-test-utils/commit/5bb6a0b))
+* **types:** remove unnecessary method ([#755](https://github.com/vuejs/vue-test-utils/issues/755)) ([2068208](https://github.com/vuejs/vue-test-utils/commit/2068208))
+* allow extended components as stubs ([#825](https://github.com/vuejs/vue-test-utils/issues/825)) ([65449b3](https://github.com/vuejs/vue-test-utils/commit/65449b3))
+* extend extended child components ([#757](https://github.com/vuejs/vue-test-utils/issues/757)) ([bc5aba3](https://github.com/vuejs/vue-test-utils/commit/bc5aba3))
+* fix type of wrapper.vm ([#759](https://github.com/vuejs/vue-test-utils/issues/759)) ([ff5220d](https://github.com/vuejs/vue-test-utils/commit/ff5220d))
+* handle cloneDeep errors in createLocalVue ([#844](https://github.com/vuejs/vue-test-utils/issues/844)) ([17dfdc8](https://github.com/vuejs/vue-test-utils/commit/17dfdc8))
+* handle textarea correctly in setValue() and setChecked() ([#771](https://github.com/vuejs/vue-test-utils/issues/771)) ([4c9fe3c](https://github.com/vuejs/vue-test-utils/commit/4c9fe3c))
+* handle unnamed parent and child components ([#768](https://github.com/vuejs/vue-test-utils/issues/768)) ([71a2ac4](https://github.com/vuejs/vue-test-utils/commit/71a2ac4))
+* improve scopedSlots option ([#808](https://github.com/vuejs/vue-test-utils/issues/808)) ([b946997](https://github.com/vuejs/vue-test-utils/commit/b946997))
+* improve slots option ([#813](https://github.com/vuejs/vue-test-utils/issues/813)) ([5fecbd2](https://github.com/vuejs/vue-test-utils/commit/5fecbd2))
+* recursively call Vue.set in setData ([#843](https://github.com/vuejs/vue-test-utils/issues/843)) ([ef01abf](https://github.com/vuejs/vue-test-utils/commit/ef01abf))
+* setProps() throws an error if the property is the same reference ([#791](https://github.com/vuejs/vue-test-utils/issues/791)) ([bf655f3](https://github.com/vuejs/vue-test-utils/commit/bf655f3))
+* stubs extended component correctly ([#767](https://github.com/vuejs/vue-test-utils/issues/767)) ([24ab4c5](https://github.com/vuejs/vue-test-utils/commit/24ab4c5))
+* support setValue on textarea ([#764](https://github.com/vuejs/vue-test-utils/issues/764)) ([e83cda2](https://github.com/vuejs/vue-test-utils/commit/e83cda2))
+* update props when watcher depends on value ([#842](https://github.com/vuejs/vue-test-utils/issues/842)) ([2aeaee3](https://github.com/vuejs/vue-test-utils/commit/2aeaee3))
+* use boolean for VueWrapper ([#763](https://github.com/vuejs/vue-test-utils/issues/763)) ([6fa6ecd](https://github.com/vuejs/vue-test-utils/commit/6fa6ecd))
+* use for in to stub components on prototype ([#845](https://github.com/vuejs/vue-test-utils/issues/845)) ([b6a3659](https://github.com/vuejs/vue-test-utils/commit/b6a3659))
+
+
+### Features
+
+* add parentComponent option ([#846](https://github.com/vuejs/vue-test-utils/issues/846)) ([1951409](https://github.com/vuejs/vue-test-utils/commit/1951409))
+* enabled slots option to take class components ([#826](https://github.com/vuejs/vue-test-utils/issues/826)) ([4916fed](https://github.com/vuejs/vue-test-utils/commit/4916fed))
+* render slots by default ([#782](https://github.com/vuejs/vue-test-utils/issues/782)) ([1ad731e](https://github.com/vuejs/vue-test-utils/commit/1ad731e))
+* use setValue() on select element ([#837](https://github.com/vuejs/vue-test-utils/issues/837)) ([2e6de7b](https://github.com/vuejs/vue-test-utils/commit/2e6de7b))
+
+
+
+
 <a name="1.0.0-beta.20"></a>
 # [1.0.0-beta.20](https://github.com/vuejs/vue-test-utils/compare/v1.0.0-beta.19...v1.0.0-beta.20) (2018-06-24)
 

docs/.vuepress/config.js

@@ -26,6 +26,8 @@ module.exports = {
   themeConfig: {
     repo: 'vuejs/vue-test-utils',
     docsDir: 'docs',
+    editLinks: true,
+    docsBranch: 'dev',
     locales: {
       '/': {
         label: 'English',

docs/README.md

@@ -7,10 +7,11 @@ Vue Test Utils is the official unit testing utility library for Vue.js.
   * [Common Tips](guides/common-tips.md)
   * [Mouse, Key and other DOM Events](guides/dom-events.md)
   * [Choosing a test runner](guides/choosing-a-test-runner.md)
-  * [Testing SFCs with Jest](guides/testing-SFCs-with-jest.md)
-  * [Testing SFCs with Mocha + webpack](guides/testing-SFCs-with-mocha-webpack.md)
-  * [Testing SFCs with Karma](guides/testing-SFCs-with-karma.md)
+  * [Testing SFCs with Jest](guides/testing-single-file-components-with-jest.md)
+  * [Testing SFCs with Mocha + webpack](guides/testing-single-file-components-with-mocha-webpack.md)
+  * [Testing SFCs with Karma](guides/testing-single-file-components-with-karma.md)
   * [Testing Asynchronous Behavior](guides/testing-async-components.md)
+  * [Using with TypeScript](guides/using-with-typescript.md)
   * [Using with Vue Router](guides/using-with-vue-router.md)
   * [Using with Vuex](guides/using-with-vuex.md)
 * [API](api/)
@@ -28,6 +29,7 @@ Vue Test Utils is the official unit testing utility library for Vue.js.
     - [attachToDocument](api/options.md#attachtodocument)
     - [attrs](api/options.md#attrs)
     - [listeners](api/options.md#listeners)
+    - [parentComponent](api/options.md#parentComponent)
     - [provide](api/options.md#provide)
     - [sync](api/options.md#sync)
     - [other options](api/options.md#other-options)
@@ -77,5 +79,6 @@ Vue Test Utils is the official unit testing utility library for Vue.js.
     * [TransitionGroupStub](api/components/TransitionGroupStub.md)
     * [RouterLinkStub](api/components/RouterLinkStub.md)
   * [Selectors](api/selectors.md)
+  * [createWrapper](api/createWrapper.md)
   * [createLocalVue](api/createLocalVue.md)
   * [config](api/config.md)

docs/api/README.md

@@ -6,4 +6,5 @@
 !!!include(docs/api/renderToString.md)!!!
 !!!include(docs/api/selectors.md)!!!
 !!!include(docs/api/createLocalVue.md)!!!
+!!!include(docs/api/createWrapper.md)!!!
 !!!include(docs/api/config.md)!!!

docs/api/config.md

@@ -20,9 +20,9 @@ When passing `stubs` as an array in the mounting options, `config.stubs` are con
 Example:
 
 ```js
-import VueTestUtils from '@vue/test-utils'
+import { config } from '@vue/test-utils'
 
-VueTestUtils.config.stubs['my-component'] = '<div />'
+config.stubs['my-component'] = '<div />'
 ```
 
 ### `mocks`
@@ -35,9 +35,9 @@ Like `stubs`, the values passed to `config.mocks` are used by default. Any value
 Example:
 
 ```js
-import VueTestUtils from '@vue/test-utils'
+import { config } from '@vue/test-utils'
 
-VueTestUtils.config.mocks['$store'] = {
+config.mocks['$store'] = {
   state: {
     id: 1
   }
@@ -54,11 +54,9 @@ You can configure default methods using the `config` object. This can be useful
 Example:
 
 ```js
-import VueTestUtils from '@vue/test-utils'
+import { config } from '@vue/test-utils'
 
-VueTestUtils.config.methods['errors'] = () => {
-  any: () => false
-}
+config.methods['getData'] = () => {}
 ```
 
 ### `provide`
@@ -71,9 +69,9 @@ Like `stubs` or `mocks`, the values passed to `config.provide` are used by defau
 Example:
 
 ```js
-import VueTestUtils from '@vue/test-utils'
+import { config } from '@vue/test-utils'
 
-VueTestUtils.config.provide['$logger'] = {
+config.provide['$logger'] = {
   log: (...args) => {
     console.log(...args)
   }
@@ -90,9 +88,9 @@ Logs warning when extended child components are automatically stubbed. Hides war
 Example:
 
 ```js
-import VueTestUtils from '@vue/test-utils'
+import { config } from '@vue/test-utils'
 
-VueTestUtils.config.logModifiedComponents = false
+config.logModifiedComponents = false
 ```
 
 ### `silent`
@@ -105,7 +103,7 @@ It suppresses warnings triggered by Vue while mutating component's observables (
 Example:
 
 ```js
-import VueTestUtils from '@vue/test-utils'
+import { config } from '@vue/test-utils'
 
-VueTestUtils.config.silent = false
+config.silent = false
 ```

docs/api/createWrapper.md

@@ -0,0 +1,26 @@
+## createWrapper(node [, options])
+
+- **Arguments:**
+
+  - `{vm|HTMLElement} node`
+  - `{Object} options`
+    - `{Boolean} sync`
+    - `{Boolean} attachedToDocument`
+
+- **Returns:**
+  - `{Wrapper}`
+
+- **Usage:**
+
+`createWrapper` creates a `Wrapper` for a mounted Vue instance, or an HTML element.
+
+```js
+import { createWrapper } from '@vue/test-utils'
+import Foo from './Foo.vue'
+
+const Constructor = Vue.extend(Foo)
+const vm = new Constructor().$mount()
+const wrapper = createWrapper(vm)
+expect(wrapper.vm.foo).toBe(true)
+```
+

docs/api/options.md

@@ -11,6 +11,7 @@ Options for `mount` and `shallowMount`. The options object can contain both Vue
 - [`attachToDocument`](#attachtodocument)
 - [`attrs`](#attrs)
 - [`listeners`](#listeners)
+- [`parentComponent`](#parentComponent)
 - [`provide`](#provide)
 - [`sync`](#sync)
 
@@ -46,45 +47,74 @@ Example:
 
 ```js
 import Foo from './Foo.vue'
-import Bar from './Bar.vue'
+
+const bazComponent = {
+  name: 'baz-component',
+  template: '<p>baz</p>'
+}
 
 const wrapper = shallowMount(Component, {
   slots: {
-    default: [Foo, Bar],
+    default: [Foo, '<my-component />', 'text'],
     fooBar: Foo, // Will match `<slot name="FooBar" />`.
     foo: '<div />',
-    bar: 'bar'
+    bar: 'bar',
+    baz: bazComponent,
+    qux: '<my-component />'
   }
 })
+
 expect(wrapper.find('div')).toBe(true)
 ```
 
 ## scopedSlots
 
-- type: `{ [name: string]: string }`
+- type: `{ [name: string]: string|Function }`
 
-Provide an object of scoped slots contents to the component. The key corresponds to the slot name. The value can be a template string.
+Provide an object of scoped slots to the component. The key corresponds to the slot name.
 
-There are three limitations.
+You can set the name of the props using the slot-scope attribute:
 
-* This option is only supported in [email protected]+.
+```js
+shallowMount(Component, {
+  scopedSlots: {
+    foo: '<p slot-scope="foo">{{foo.index}},{{foo.text}}</p>'
+  }
+})
+```
 
-* You can not use `<template>` tag as the root element in the `scopedSlots` option.
+Otherwise props are available as a `props` object when the slot is evaluated:
 
-* This does not support PhantomJS.  
-You can use [Puppeteer](https://github.com/karma-runner/karma-chrome-launcher#headless-chromium-with-puppeteer) as an alternative.
+```js
+shallowMount(Component, {
+  scopedSlots: {
+    default: '<p>{{props.index}},{{props.text}}</p>'
+  }
+})
+```
 
-Example:
+You can also pass a function that takes the props as an argument:
 
 ```js
-const wrapper = shallowMount(Component, {
+shallowMount(Component, {
+  scopedSlots: {
+    foo: function (props) {
+      return this.$createElement('div', props.index)
+    }
+  }
+})
+```
+
+Or you can use JSX. If you write JSX in a method, `this.$createElement` is auto-injected by babel-plugin-transform-vue-jsx:
+
+```js
+shallowMount(Component, {
   scopedSlots: {
-    foo: '<p slot-scope="props">{{props.index}},{{props.text}}</p>'
+    foo (props) {
+      return <div>{ props.text }</div>
+    }
   }
 })
-expect(wrapper.find('#fooWrapper').html()).toBe(
-  `<div id="fooWrapper"><p>0,text1</p><p>1,text2</p><p>2,text3</p></div>`
-)
 ```
 
 ## stubs
@@ -182,6 +212,23 @@ Set the component instance's `$attrs` object.
 
 Set the component instance's `$listeners` object.
 
+## parentComponent
+
+- type: `Object`
+
+Component to use as parent for mounted component.
+
+Example:
+
+```js
+import Foo from './Foo.vue'
+
+const wrapper = shallowMount(Component, {
+  parentComponent: Foo
+})
+expect(wrapper.vm.$parent.name).toBe('foo')
+```
+
 ## provide
 
 - type: `Object`

docs/api/wrapper/setChecked.md

@@ -12,8 +12,8 @@ import { mount } from '@vue/test-utils'
 import Foo from './Foo.vue'
 
 const wrapper = mount(Foo)
-const option = wrapper.find('input[type="radio"]')
-option.setChecked()
+const radioInput = wrapper.find('input[type="radio"]')
+radioInput.setChecked()
 ```
 
 - **Note:**

docs/api/wrapper/setData.md

@@ -2,7 +2,7 @@
 
 Sets `Wrapper` `vm` data.
 
-setData works by merging existing properties, except for arrays which are overwritten.
+setData works by recursively calling Vue.set.
 
 **Note the Wrapper must contain a Vue instance.**