Merge pull request faceyspacey#2 from scottdj92/json-tests

JSON tests

Author: scottdj92

index.js

@@ -9,7 +9,7 @@ var ExtractedModule = require("./ExtractedModule");
 var Chunk = require("webpack/lib/Chunk");
 var OrderUndefinedError = require("./OrderUndefinedError");
 var loaderUtils = require("loader-utils");
-var schemaTester = require('./schema/valid');
+var schemaTester = require('./schema/validator');
 
 var NS = fs.realpathSync(__dirname);
 
@@ -105,7 +105,6 @@ function getOrder(a, b) {
 }
 
 function ExtractTextPlugin(options) {
-	schemaTester(options);
 	if(arguments.length > 1) {
 		throw new Error("Breaking change: ExtractTextPlugin now only takes a single argument. Either an options " +
 						"object *or* the name of the result file.\n" +
@@ -120,6 +119,8 @@ function ExtractTextPlugin(options) {
 	}
 	if(isString(options)) {
 		options = { filename: options };
+	} else {
+		schemaTester(options);
 	}
 	this.filename = options.filename;
 	this.id = options.id != null ? options.id : ++nextId;

schema/schema.json

@@ -16,7 +16,7 @@
       "type": "string"
     },
     "filename": {
-      "description": "The filename and path that ExtractTextPlugin will extract to.",
+      "description": "The filename and path that ExtractTextPlugin will extract to",
       "type": "string"
     },
     "loader": {
@@ -27,6 +27,5 @@
       "description": "",
       "type": "string"
     }
-  },
-  "required": ["loader"]
+  }
 }

schema/valid.js renamed to schema/validator.js

@@ -10,6 +10,26 @@ describe("ExtractTextPlugin.extract()", function() {
 		});
 	});
 
+	context("json schema validation", function() {
+		it("does not throw if a filename is specified", function() {
+			should.doesNotThrow(function() {
+				ExtractTextPlugin.extract("file.css");
+			});
+		});
+
+		it("does not throw if a correct config object is passed in", function() {
+			should.doesNotThrow(function() {
+				ExtractTextPlugin.extract({loader: 'css-loader'});
+			});
+		});
+
+		it("throws if an incorrect config is passed in", function() {
+			should.throws(function() {
+				ExtractTextPlugin.extract({style: 'file.css'});
+			});
+		});
+	});
+
 	context("specifying loader", function() {
 		it("accepts a loader string", function() {
 			ExtractTextPlugin.extract("css-loader").should.deepEqual([