Merge remote-tracking branch 'refs/remotes/origin/master' into next

icebob · icebob · commit 37549919293e · 2016-10-06T22:11:33.000+02:00
diff --git a/test/unit/specs/fields/fieldVueMultiSelect.spec.js b/test/unit/specs/fields/fieldVueMultiSelect.spec.js
@@ -13,7 +13,7 @@ function createField(test, schema = {}, model = null, disabled = false, options)
 	[ el, vm, field ] = createVueField(test, "fieldVueMultiSelect", schema, model, disabled, options);
 }
 
-describe("fieldVueMultiSelect.vue", function() {
+describe.skip("fieldVueMultiSelect.vue", function() {
 
 	describe("check template", () => {
 		let schema = {

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ function createField(test, schema = {}, model = null, disabled = false, options)`
`13`	`13`	`[ el, vm, field ] = createVueField(test, "fieldVueMultiSelect", schema, model, disabled, options);`
`14`	`14`	`}`
`15`	`15`
`16`		`-describe("fieldVueMultiSelect.vue", function() {`
	`16`	`+describe.skip("fieldVueMultiSelect.vue", function() {`
`17`	`17`
`18`	`18`	`describe("check template", () => {`
`19`	`19`	`let schema = {`