fix(schema): emit proper error messages

Related to #371.
webpack-contrib · Jan 28, 2017 · 70cbd4b · 70cbd4b
1 parent 99f686e
commit 70cbd4b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/schema/validator.js b/schema/validator.js
@@ -3,10 +3,10 @@ var ajv = new Ajv({allErrors: true});
 var json = require('./schema.json');
 
 module.exports = function validate(data) {
-	var validSchema = ajv.compile(json);
-	var valid = validSchema(data);
+	var ajv = new Ajv();
+	var isValid = ajv.validate(json, data);
 
-	if(!valid) {
+	if(!isValid) {
 		throw new Error(ajv.errorsText());
 	}
 }
diff --git a/test/extract.test.js b/test/extract.test.js
@@ -24,9 +24,14 @@ describe("ExtractTextPlugin.extract()", function() {
 		});
 
 		it("throws if an incorrect config is passed in", function() {
-			should.throws(function() {
-				ExtractTextPlugin.extract({style: 'file.css'});
-			});
+			should.throws(
+				function() {
+					ExtractTextPlugin.extract({style: 'file.css'});
+				},
+				function(err) {
+					return err.message === 'data should NOT have additional properties';
+				}
+			);
 		});
 	});