fix lints & remove old tests

Author: icebob

lib/validator.js

@@ -66,24 +66,24 @@ Validator.prototype.compile = function(schema) {
 			throw new Error("If the schema is an Array, must contain at least one element!");
 		}
 
-		var rules = this.compileSchemaType(schema);
+		const rules = this.compileSchemaType(schema);
 		return function(value) {
 			return self.checkSchemaType(value, rules, undefined, null);
-		}
+		};
 	} 
 
-	var rule = this.compileSchemaObject(schema);
+	const rule = this.compileSchemaObject(schema);
 	return function(value) {
 		return self.checkSchemaObject(value, rule, undefined, null);
-	}
+	};
 };
 
 Validator.prototype.compileSchemaObject = function(schemaObject) {
 	if (schemaObject === null || typeof schemaObject !== "object" || Array.isArray(schemaObject)) {
 		throw new Error("Invalid schema!");
 	}
 
-	var compiledObject = Object.keys(schemaObject).map(name => {
+	const compiledObject = Object.keys(schemaObject).map(name => {
 		const compiledType = this.compileSchemaType(schemaObject[name]);
 		return {name: name, compiledType: compiledType};
 	});
@@ -92,9 +92,9 @@ Validator.prototype.compileSchemaObject = function(schemaObject) {
 	// return compiledObject;
 
 	const sourceCode = [];
-	sourceCode.push(`let res;`);
-	sourceCode.push(`let propertyPath;`);
-	sourceCode.push(`const errors = [];`);
+	sourceCode.push("let res;");
+	sourceCode.push("let propertyPath;");
+	sourceCode.push("const errors = [];");
 	for (let i = 0; i < compiledObject.length; i++) {
 		const property = compiledObject[i];
 		const name = property.name;
@@ -104,16 +104,16 @@ Validator.prototype.compileSchemaObject = function(schemaObject) {
 		} else {
 			sourceCode.push(`res = this.checkSchemaRule(value.${name}, compiledObject[${i}].compiledType, propertyPath, value);`);
 		}
-		sourceCode.push(`if (res !== true) {`);
-		sourceCode.push(`\tthis.handleResult(errors, propertyPath, res);`);
-		sourceCode.push(`}`);
+		sourceCode.push("if (res !== true) {");
+		sourceCode.push("\tthis.handleResult(errors, propertyPath, res);");
+		sourceCode.push("}");
 	}
 
-	sourceCode.push(`return errors.length === 0 ? true : errors;`);
+	sourceCode.push("return errors.length === 0 ? true : errors;");
 
-	var compiledObjectFunction = new Function("value", "compiledObject", "path", "parent", sourceCode.join("\n"));
+	const compiledObjectFunction = new Function("value", "compiledObject", "path", "parent", sourceCode.join("\n"));
 
-	var self = this;
+	const self = this;
 	return function(value, _unused, path, parent) {
 		return compiledObjectFunction.call(self, value, compiledObject, path, parent);
 	};

package.json

@@ -51,6 +51,7 @@
     "rollup-plugin-uglify-es": "0.0.1"
   },
   "jest": {
+    "coverageDirectory": "../coverage",    
     "testEnvironment": "node",
     "rootDir": "./lib",
     "roots": [

test/helpers/deep-extend.spec.js

@@ -8,7 +8,9 @@ describe("deepExtend", () => {
 				b: 5,
 				c: 6
 			},
-			d: true
+			d: true,
+			j: [],
+			k: [1,2]
 		}, {
 			a: {
 				b: 10,
@@ -17,7 +19,9 @@ describe("deepExtend", () => {
 			f: "F",
 			g: {
 				h: "H"
-			}
+			},
+			j: "some",
+			k: [5,6]
 		});
 		expect(result).toEqual({
 			a: {
@@ -29,7 +33,9 @@ describe("deepExtend", () => {
 			f: "F",
 			g: {
 				h: "H"
-			}
+			},
+			j: "some",
+			k: [5,6]
 		});
 	});
 });

test/validator.spec.js

@@ -196,79 +196,6 @@ describe("Test compile (unit test)", () => {
 	});
 });
 
-// Skip tests for earlier compiler internals
-describe.skip("Test _processRule", () => {
-
-	const v = new Validator();
-	v.compile = jest.fn();
-	v._checkWrapper = jest.fn();
-
-	it("should return array of rules", () => {
-		let res = v._processRule({ type: "number", positive: true }, "id", false);
-
-		expect(res).toBeInstanceOf(Array);
-		expect(res.length).toBe(1);
-		expect(res[0].fn).toBeInstanceOf(Function);
-		expect(res[0].type).toBe("number");
-		expect(res[0].name).toBe("id");
-		expect(res[0].schema).toEqual({ type: "number", positive: true });
-		expect(res[0].iterate).toBe(false);
-	});
-
-	it("should convert shorthand definition", () => {
-		let res = v._processRule("string", "name", false);
-
-		expect(res).toBeInstanceOf(Array);
-		expect(res.length).toBe(1);
-		expect(res[0].fn).toBeInstanceOf(Function);
-		expect(res[0].type).toBe("string");
-		expect(res[0].name).toBe("name");
-		expect(res[0].schema).toEqual({ type: "string" });
-		expect(res[0].iterate).toBe(false);
-	});
-
-	it("should call compile if type is object", () => {
-		let res = v._processRule({ type: "object", props: {
-			id: "number"
-		} }, "item", false);
-
-		expect(res).toBeInstanceOf(Array);
-		expect(res.length).toBe(2);
-		expect(res[0].fn).toBeInstanceOf(Function);
-		expect(res[0].type).toBe("object");
-		expect(res[0].name).toBe("item");
-		expect(res[0].iterate).toBe(false);
-
-		//expect(res[1].fn).toBeInstanceOf(Function);
-		expect(res[1].type).toBe("object");
-		expect(res[1].name).toBe("item");
-		expect(res[1].iterate).toBe(false);
-
-		expect(v.compile).toHaveBeenCalledTimes(1);
-		expect(v.compile).toHaveBeenCalledWith({id: "number"});
-	});
-
-	it("should call checkWrapper & processRule if type is Array", () => {
-		let res = v._processRule({ type: "array", items: "number" }, "list", false);
-
-		expect(res).toBeInstanceOf(Array);
-		expect(res.length).toBe(2);
-
-		expect(res[0].fn).toBeInstanceOf(Function);
-		expect(res[0].type).toBe("array");
-		expect(res[0].name).toBe("list");
-		expect(res[0].iterate).toBe(false);
-
-		//expect(res[1].fn).toBeInstanceOf(Function);
-		expect(res[1].type).toBe("array");
-		expect(res[1].name).toBe("list");
-		expect(res[1].iterate).toBe(true);
-
-		expect(v._checkWrapper).toHaveBeenCalledTimes(1);
-		expect(v._checkWrapper).toHaveBeenCalledWith([{"fn": expect.any(Function), "iterate": false, "name": null, "schema": {"type": "number"}, "type": "number"}]);
-	});
-});
-
 describe("Test compile (integration test)", () => {
 
 	describe("Test check generator with good obj", () => {