fixed webpack#1769

sokra · sokra · commit 4c6915617226 · 2015-12-22T11:00:48.000+01:00
diff --git a/lib/ContextModule.js b/lib/ContextModule.js
@@ -149,7 +149,7 @@ ContextModule.prototype.source = function() {
 			"function webpackAsyncContext(req) {\n",
 			"\tvar ids = map[req];",
 			"\tif(!ids)\n",
-			"\t\tthrow new Error(\"Cannot find module '\" + req + \"'.\");\n",
+			"\t\treturn Promise.reject(new Error(\"Cannot find module '\" + req + \"'.\"));\n",
 			"\treturn ",
 			hasMultipleChunks ?
 			"Promise.all(ids.slice(1).map(__webpack_require__.e))" :
diff --git a/test/cases/context/issue-1769/folder/0.js b/test/cases/context/issue-1769/folder/0.js
diff --git a/test/cases/context/issue-1769/index.js b/test/cases/context/issue-1769/index.js
@@ -0,0 +1,9 @@
+it("should be able the catch a incorrect System.import", function(done) {
+	var expr = "1";
+	System.import("./folder/" + expr).then(function() {
+		done(new Error("should not be called"));
+	}).catch(function(err) {
+		err.should.be.instanceof(Error);
+		done();
+	});
+});
