🐛 fix: Fixed #75

vue-generators · Sep 27, 2016 · f8db7b0 · f8db7b0
1 parent 7298080
commit f8db7b0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/src/fields/abstractField.js b/src/fields/abstractField.js
@@ -25,7 +25,6 @@ export default {
 			},
 
 			set(newValue) {
-
 				if (isFunction(this.formatValueToModel))
 					newValue = this.formatValueToModel(newValue);
 
@@ -40,7 +39,7 @@ export default {
 
 	watch: {
 		value: function(newVal, oldVal) {
-			//console.log("Changed", newVal, oldVal);
+			// console.log("Changed", newVal, oldVal);
 			if (isFunction(this.schema.onChanged)) {
 				this.schema.onChanged(this.model, newVal, oldVal, this.schema);
 			}

diff --git a/src/fields/fieldNoUiSlider.vue b/src/fields/fieldNoUiSlider.vue
@@ -47,9 +47,8 @@
 					this.slider.noUiSlider.set(value);
 				}
 			},
-			formatValueToModel() {				
+			formatValueToModel(val) {				
 				if(typeof this.slider.noUiSlider !== "undefined"){
-					let val = this.slider.noUiSlider.get();
 					if (val instanceof Array) {
 						return [Number(val[0]), Number(val[1])];
 					}else{

diff --git a/test/unit/specs/fields/fieldNoUiSlider.spec.js b/test/unit/specs/fields/fieldNoUiSlider.spec.js
@@ -54,13 +54,12 @@ describe("fieldNoUiSlider.vue", function() {
 			}
 		});
 
-		// FIXME: Not working in PhantomJS Left is 0%
-		it.skip("should contain the value", (done) => {
-			vm.$nextTick( () => {
+		it("should contain the value", (done) => {
+			setTimeout( () => {
 				let origin = input.querySelector(".noUi-origin");
 				expect(origin.style.left).to.be.within("70%", "90%");
 				done();
-			});
+			}, 100);
 		});
 
 		it("handle value should be the model value after changed", (done) => {
@@ -72,11 +71,10 @@ describe("fieldNoUiSlider.vue", function() {
 			}, 100);
 		});
 
-		it.skip("model value should be the handle value after changed", (done) => {
-			// `field.slider.noUiSlider.set(3);`	- It doesn't fired the onChange event
+		it("model value should be the handle value after changed", (done) => {
 			field.onChange(3);
 			setTimeout( () => {
-				expect(vm.model.rating).to.be.equal(3);
+				expect(field.model.rating).to.be.equal(3);
 				done();
 			}, 100);
 		});

diff --git a/test/unit/webpack.test.config.js b/test/unit/webpack.test.config.js
@@ -3,7 +3,7 @@ var webpack = require("webpack");
 var sourceDir = path.resolve(__dirname, "../../src");
 
 module.exports = {
-	devtool: "#inline-source-map",
+	devtool: "eval-source-map",
 
 	module: {
 		preLoaders: [