(from xxx) => (@ xxx); fix test

mc-zone · mc-zone · commit 16c1f9e42c0d · 2018-02-22T08:50:47.000+08:00
diff --git a/lib/ModuleBuildError.js b/lib/ModuleBuildError.js
@@ -14,7 +14,7 @@ class ModuleBuildError extends WebpackError {
 		this.name = "ModuleBuildError";
 		this.message = "Module build failed";
 		if(from) {
-			this.message += ` (from ${from})`;
+			this.message += ` (@ ${from})`;
 		}
 		this.message += ": ";
 		if(err !== null && typeof err === "object") {
diff --git a/lib/ModuleError.js b/lib/ModuleError.js
@@ -15,7 +15,7 @@ class ModuleError extends WebpackError {
 		this.module = module;
 		this.message = "Module Error";
 		if(from) {
-			this.message += ` (from ${from})`;
+			this.message += ` (@ ${from})`;
 		}
 		this.message += ": ";
 		this.message += err && typeof err === "object" && err.message ? err.message : err;
diff --git a/lib/ModuleWarning.js b/lib/ModuleWarning.js
@@ -15,7 +15,7 @@ class ModuleWarning extends WebpackError {
 		this.module = module;
 		this.message = "Module Warning";
 		if(from) {
-			this.message += ` (from ${from})`;
+			this.message += ` (@ ${from})`;
 		}
 		this.message += ": ";
 		this.message += warning && typeof warning === "object" && warning.message ? warning.message : warning;
diff --git a/test/Errors.test.js b/test/Errors.test.js
@@ -177,7 +177,7 @@ describe("Errors", () => {
 			done();
 		});
 	});
-	it.only("should show loader name when emit/throw an error or warning from a loader", () => {
+	it("should show loader name when emit/throw an error or warning from a loader", () => {
 		return Promise.all([
 			getErrorsPromise({
 				mode: "development",
@@ -196,10 +196,10 @@ describe("Errors", () => {
 
 			}, (errors, warnings) => {
 				warnings.length.should.be.eql(1);
-				warnings[0].split("\n")[1].should.match(/^Module Warning \(from emit-error-loader\)/);
+				warnings[0].split("\n")[1].should.match(/^Module Warning \(@ emit-error-loader\)/);
 				errors.length.should.be.eql(2);
-				errors[0].split("\n")[1].should.match(/^Module Error \(from emit-error-loader\)/);
-				errors[1].split("\n")[1].should.match(/^Module build failed \(from json-loader\)/);
+				errors[0].split("\n")[1].should.match(/^Module Error \(@ emit-error-loader\)/);
+				errors[1].split("\n")[1].should.match(/^Module build failed \(@ json-loader\)/);
 			}),
 			getErrorsPromise({
 				mode: "development",
@@ -213,7 +213,7 @@ describe("Errors", () => {
 
 			}, (errors, warnings) => {
 				errors.length.should.be.eql(1);
-				errors[0].split("\n")[1].should.match(/^Module build failed \(from async-error-loader\)/);
+				errors[0].split("\n")[1].should.match(/^Module build failed \(@ async-error-loader\)/);
 			}),
 			getErrorsPromise({
 				mode: "development",
@@ -227,7 +227,7 @@ describe("Errors", () => {
 
 			}, (errors, warnings) => {
 				errors.length.should.be.eql(1);
-				errors[0].split("\n")[1].should.match(/^Module build failed \(from throw-error-loader\)/);
+				errors[0].split("\n")[1].should.match(/^Module build failed \(@ throw-error-loader\)/);
 			}),
 
 		]);
diff --git a/test/cases/compile/error-hide-stack/errors.js b/test/cases/compile/error-hide-stack/errors.js
@@ -1,3 +1,3 @@
 module.exports = [
-	[/Module build failed: Message\nStack/]
-];
+	[/Module build failed( \(@ [^)]+\))?: Message\nStack/]
+];

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class ModuleBuildError extends WebpackError {`
`14`	`14`	`this.name = "ModuleBuildError";`
`15`	`15`	`this.message = "Module build failed";`
`16`	`16`	`if(from) {`
`17`		- this.message += ` (from ${from})`;
	`17`	+ this.message += ` (@ ${from})`;
`18`	`18`	`}`
`19`	`19`	`this.message += ": ";`
`20`	`20`	`if(err !== null && typeof err === "object") {`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class ModuleError extends WebpackError {`
`15`	`15`	`this.module = module;`
`16`	`16`	`this.message = "Module Error";`
`17`	`17`	`if(from) {`
`18`		- this.message += ` (from ${from})`;
	`18`	+ this.message += ` (@ ${from})`;
`19`	`19`	`}`
`20`	`20`	`this.message += ": ";`
`21`	`21`	`this.message += err && typeof err === "object" && err.message ? err.message : err;`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class ModuleWarning extends WebpackError {`
`15`	`15`	`this.module = module;`
`16`	`16`	`this.message = "Module Warning";`
`17`	`17`	`if(from) {`
`18`		- this.message += ` (from ${from})`;
	`18`	+ this.message += ` (@ ${from})`;
`19`	`19`	`}`
`20`	`20`	`this.message += ": ";`
`21`	`21`	`this.message += warning && typeof warning === "object" && warning.message ? warning.message : warning;`