fixed conflict

Author: sunecosuri

README.md

@@ -1,8 +1,10 @@
 # vue-test-utils
 
-## Currently not published on npm 
-To use vue-test-utils pre-release:
-```
+**Currently no published on npm** 
+
+To install, use the github URL
+
+```shell
 npm install --save-dev https://github.com/vuejs/vue-test-utils/
 ```
 

dist/vue-test-utils.js

@@ -94,7 +94,7 @@ function stubComponents (component, stubs) {
         return
       }
       if (component.components[stub]) {
-        // Remove cached constructor
+              // Remove cached constructor
         delete component.components[stub]._Ctor;
         if (typeof stubs[stub] === 'string') {
           component.components[stub] = createStubFromString(stubs[stub], component.components[stub]);
@@ -111,10 +111,7 @@ function stubComponents (component, stubs) {
           component.components[stub] = Object.assign({}, stubs[stub]);
         }
       }
-      // ignoreElements does not exist in Vue 2.0.x
-      if (Vue.config.ignoredElements) {
-        Vue.config.ignoredElements.push(stub);
-      }
+      Vue.config.ignoredElements.push(stub);
     });
   }
 }
@@ -765,6 +762,7 @@ Wrapper.prototype.setProps = function setProps (data) {
 
   Object.keys(data).forEach(function (key) {
     // $FlowIgnore : Problem with possibly null this.vm
+<<<<<<< HEAD
     if (this$1.vm._props) {
       this$1.vm._props[key] = data[key];
     } else {
@@ -775,6 +773,12 @@ Wrapper.prototype.setProps = function setProps (data) {
 
   Object.keys(data).forEach(function (key) {
     // $FlowIgnore : Problem with possibly null this.vm
+=======
+    this$1.vm._props[key] = data[key];
+  });
+  Object.keys(data).forEach(function (key) {
+      // $FlowIgnore : Problem with possibly null this.vm
+>>>>>>> 25f3fb43b3d5ea9e8d59012077660d946ea46d43
     this$1.vm._watchers.forEach(function (watcher) {
       if (watcher.expression === key) { watcher.run(); }
     });
@@ -1015,7 +1019,11 @@ function mount (component, options) {
     throwError('window is undefined, vue-test-utils needs to be run in a browser environment.\n You can run the tests in node using JSDOM');
   }
 
+<<<<<<< HEAD
   var componentToMount = options.clone === false ? component : cloneDeep(component);
+=======
+  var componentToMount = options.clone === false ? component : lodash.cloneDeep(component);
+>>>>>>> 25f3fb43b3d5ea9e8d59012077660d946ea46d43
   // Remove cached constructor
   delete componentToMount._Ctor;
 

docs/en/getting-started.md

@@ -91,7 +91,7 @@ That was easy as well, so let's step up the game.
 
 ### Component data
 
-Changing the data of the component can be quite useful for efficient testing. The method `setData({...})` is meant for changing the data on the instance. You can interact with the instance directly using the `vm` key. As Vue automatically sets all data values and computed properties as getters on the root instance, we can access those values straight away.
+Changing the data of the component can be quite useful for efficient testing. The method `setData({...})` is ment for changing the data on the instance. You can interact with the instance directly using the `vm` key. As Vue automatically sets all data values and computed properties as getters on the root instance, we can access those values straight away.
 It may be useful to change the data accordingly for a whole group of specs, so `beforeEach()` could be a good place for that:
 
 ```js

flow/options.js

@@ -6,6 +6,5 @@ declare type Options = { // eslint-disable-line no-undef
     stubs?: Object,
     context?: Object,
     clone?: boolean,
-    attrs?: Object,
-    listeners?: Object
+    children?: Array<Component | string>
 }

package.json

@@ -16,11 +16,10 @@
     "lint": "eslint --ext js,vue src test flow build --ignore-path .gitignore",
     "lint:docs": "eslint --ext js,vue,md docs --ignore-path .gitignore",
     "lint:fix": "npm run lint -- --fix",
-    "setup": "node build/install-hooks.js",
-    "test": "npm run lint && npm run lint:docs && npm run flow && npm run test:types && npm run test:unit && npm run test:unit:karma",
-    "test:compatibility": "test/test.sh",
-    "test:unit": "mocha-webpack --webpack-config build/webpack.test.config.js test/unit/specs --recursive --require test/unit/setup/mocha.setup.js",
-    "test:unit:karma": "cross-env BABEL_ENV=test TARGET=browser karma start test/unit/setup/karma.conf.js --single-run",
+    "test": "npm run lint && npm run lint:docs && npm run flow && npm run test:types && npm run test:unit && npm run test:integration && npm run test:integration:karma",
+    "test:integration": "cross-env BABEL_ENV=test mocha-webpack --webpack-config build/webpack.test.config.js test/integration/specs --recursive --require test/integration/setup/mocha.setup.js",
+    "test:integration:karma": "cross-env BABEL_ENV=test TARGET=browser karma start test/integration/setup/karma.conf.js --single-run",
+    "test:unit": "cross-env BABEL_ENV=test mocha-webpack --webpack-config build/webpack.test.config.js test/unit/specs --recursive --require test/unit/setup/mocha.setup.js",
     "test:types": "tsc -p types",
     "release": "bash build/release.sh",
     "release:note": "node build/gen-release-note.js"

src/lib/create-instance.js

@@ -24,7 +24,7 @@ export default function createConstructor (component: Component, options: Option
     const clonedComponent = cloneDeep(component)
     component = {
       render (h) {
-        return h(clonedComponent, options.context)
+        return h(clonedComponent, options.context, options.children)
       }
     }
   }

test/integration/specs/mount/options/children.spec.js

@@ -0,0 +1,22 @@
+import mount from '~src/mount'
+
+describe('mount.children', () => {
+  it('mounts functional component with children when passed children array', () => {
+    const Component = {
+      functional: true,
+      render (h, { children }) {
+        return h('div', children)
+      },
+      name: 'common'
+    }
+
+    const context = {}
+    const children = [
+      'hello'
+    ]
+
+    const wrapper = mount(Component, { context, children })
+
+    expect(wrapper.text()).to.contain('hello')
+  })
+})

test/integration/specs/mount/options/localVue.spec.js

@@ -0,0 +1,15 @@
+import Vue from 'vue'
+import mount from '~src/mount'
+import Component from '~resources/components/component.vue'
+
+describe('mount.localVue', () => {
+  it('mounts component using passed localVue as base Vue', () => {
+    const localVue = Vue.extend()
+    localVue.version = '2.3'
+    const wrapper = mount(Component, { localVue: localVue, intercept: { test: true }})
+    expect(wrapper.vm.test).to.equal(true)
+    const freshWrapper = mount(Component)
+    expect(typeof freshWrapper.vm.test).to.equal('undefined')
+  })
+})
+

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

@@ -36,6 +36,7 @@ describe('createLocalVue', () => {
     const freshWrapper = mount(Component)
     expect(typeof freshWrapper.vm.$route).to.equal('undefined')
   })
+<<<<<<< HEAD:test/unit/specs/create-local-vue.spec.js
 
   it('installs Router after a previous installed', () => {
     const localVue = createLocalVue()
@@ -51,4 +52,6 @@ describe('createLocalVue', () => {
     const freshWrapper = mount(Component)
     expect(typeof freshWrapper.vm.$route).to.equal('undefined')
   })
+=======
+>>>>>>> 25f3fb43b3d5ea9e8d59012077660d946ea46d43:test/integration/specs/create-local-vue.spec.js
 })

test/unit/specs/mount/options/context.spec.js

@@ -1,12 +1,7 @@
 import Vue from 'vue'
 import mount from '~src/mount'
 
-function cannotIdentifyComponent () {
-  const version = Number(`${Vue.version.split('.')[0]}.${Vue.version.split('.')[1]}`)
-  return version <= 2.2
-}
-
-describe('context', () => {
+describe('mount.context', () => {
   it('mounts functional component when passed context object', () => {
     if (cannotIdentifyComponent()) {
       console.log('WARN: no current way to test functional component is component in v2.1.x')

types/index.d.ts

@@ -25,6 +25,8 @@ type Stubs = {
   [key: string]: Component | string | true
 } | string[]
 
+type Children =  (Component | string)[]
+
 /**
  * Base class of Wrapper and WrapperArray
  * It has common methods on both Wrapper and WrapperArray
@@ -87,8 +89,7 @@ interface MountOptions<V extends Vue> extends ComponentOptions<V> {
   intercept?: object
   slots?: Slots
   stubs?: Stubs,
-  attrs?: object
-  listeners?: object
+  children?: Children
 }
 
 type ShallowOptions<V extends Vue> = MountOptions<V>

types/test/mount.ts

@@ -52,6 +52,7 @@ mount(functionalOptions, {
   context: {
     props: { foo: 'test' }
   },
+  children: ['child', ClassComponent],
   stubs: ['child']
 })