Merge pull request webpack#1146 from realtymaps/master

sokra · sokra · commit 2e52a78ebe39 · 2015-06-15T09:09:58.000+02:00
Stats.js formatError supports string errors
diff --git a/lib/Stats.js b/lib/Stats.js
@@ -74,6 +74,8 @@ Stats.prototype.toJson = function toJson(options, forToString) {
 	}
 	function formatError(e) {
 		var text = "";
+		if(typeof e === "string")
+			e = {message: e};
 		if(e.module && e.module.readableIdentifier && typeof e.module.readableIdentifier === "function") {
 			text += e.module.readableIdentifier(requestShortener) + "\n";
 		} else if(e.file) {
diff --git a/test/Stats.test.js b/test/Stats.test.js
@@ -7,6 +7,7 @@ var webpack = require("../lib/webpack");
 
 var base = path.join(__dirname, "statsCases");
 var tests = fs.readdirSync(base);
+var Stats = require("../lib/Stats");
 
 describe("Stats", function() {
 	tests.forEach(function(testName) {
@@ -59,4 +60,43 @@ describe("Stats", function() {
 			});
 		});
 	});
+	describe("Error Handling", function(){
+		describe("does have", function(){
+			it("hasErrors", function() {
+				mockStats = new Stats({errors:['firstError'],hash:'1234'});
+				mockStats.hasErrors().should.be.ok;
+			});
+			it("hasWarnings", function() {
+				mockStats = new Stats({warnings:['firstError'],hash:'1234'});
+				mockStats.hasWarnings().should.be.ok;
+			});
+		});
+		describe("does not have", function(){
+			it("hasErrors", function() {
+				mockStats = new Stats({errors:[],hash:'1234'});
+				mockStats.hasErrors().should.not.be.ok;
+			});
+			it("hasWarnings", function() {
+				mockStats = new Stats({warnings:[],hash:'1234'});
+				mockStats.hasWarnings().should.not.be.ok;
+			});
+		});
+		it("formatError handles string errors", function(){
+			mockStats = new Stats({
+				errors:['firstError'],
+				warnings:[],
+				assets:[],
+				chunks:[],
+				modules:[],
+				children:[],
+				hash:'1234',
+				mainTemplate:{
+					getPublicPath:function(){return 'path';}
+				}
+			});
+			obj = mockStats.toJson();
+			obj.errors[0].should.be.equal('firstError');
+		});
+	});
+
 });

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,8 @@ Stats.prototype.toJson = function toJson(options, forToString) {`
`74`	`74`	`}`
`75`	`75`	`function formatError(e) {`
`76`	`76`	`var text = "";`
	`77`	`+ if(typeof e === "string")`
	`78`	`+ e = {message: e};`
`77`	`79`	`if(e.module && e.module.readableIdentifier && typeof e.module.readableIdentifier === "function") {`
`78`	`80`	`text += e.module.readableIdentifier(requestShortener) + "\n";`
`79`	`81`	`} else if(e.file) {`