added test case for DllPlugin and chunks in dlls

sokra · sokra · commit 5aa5ca696110 · 2016-01-30T11:43:53.000+01:00
webpack#1948
diff --git a/test/ConfigTestCases.test.js b/test/ConfigTestCases.test.js
@@ -15,7 +15,7 @@ describe("ConfigTestCases", function() {
 			name: cat,
 			tests: fs.readdirSync(path.join(casesPath, cat)).filter(function(folder) {
 				return folder.indexOf("_") < 0;
-			})
+			}).sort()
 		};
 	});
 	categories.forEach(function(category) {
@@ -58,7 +58,7 @@ describe("ConfigTestCases", function() {
 						}
 
 						function _require(module) {
-							if(module.substr(0, 2) === "./") {
+							if(/^\.\.?\//.test(module)) {
 								var p = path.join(outputDirectory, module);
 								var fn;
 								if(options.target === "web") {
@@ -85,6 +85,8 @@ describe("ConfigTestCases", function() {
 							// try to load a test file
 							testConfig = require(path.join(testDirectory, "test.config.js"));
 						} catch(e) {}
+
+						if(testConfig.noTests) return process.nextTick(done);
 						for(var i = 0; i < optionsArr.length; i++) {
 							var bundlePath = testConfig.findBundle(i, optionsArr[i]);
 							if(bundlePath) {
diff --git a/test/configCases/dll-plugin/0-create-dll/a.js b/test/configCases/dll-plugin/0-create-dll/a.js
@@ -0,0 +1 @@
+module.exports = "a";
diff --git a/test/configCases/dll-plugin/0-create-dll/b.js b/test/configCases/dll-plugin/0-create-dll/b.js
@@ -0,0 +1,3 @@
+module.exports = function() {
+	return System.import("./c");
+}
diff --git a/test/configCases/dll-plugin/0-create-dll/c.js b/test/configCases/dll-plugin/0-create-dll/c.js
@@ -0,0 +1 @@
+export default "c";
diff --git a/test/configCases/dll-plugin/0-create-dll/test.config.js b/test/configCases/dll-plugin/0-create-dll/test.config.js
@@ -0,0 +1 @@
+exports.noTests = true;
diff --git a/test/configCases/dll-plugin/0-create-dll/webpack.config.js b/test/configCases/dll-plugin/0-create-dll/webpack.config.js
@@ -0,0 +1,16 @@
+var path = require("path");
+var webpack = require("../../../../");
+
+module.exports = {
+	entry: ["./a", "./b"],
+	output: {
+		filename: "dll.js",
+		chunkFilename: "[id].dll.js",
+		libraryTarget: "commonjs2"
+	},
+	plugins: [
+		new webpack.DllPlugin({
+			path: path.resolve(__dirname, "../../../js/config/dll-plugin/manifest0.json")
+		})
+	]
+}
diff --git a/test/configCases/dll-plugin/1-use-dll/index.js b/test/configCases/dll-plugin/1-use-dll/index.js
@@ -0,0 +1,11 @@
+var should = require("should");
+
+it("should load a module from dll", function() {
+	require("dll/a").should.be.eql("a");
+});
+
+it("should load an async module from dll", function() {
+	require("dll/b")().then(function(c) {
+		c.should.be.eql({ default: "c" });
+	});
+});
diff --git a/test/configCases/dll-plugin/1-use-dll/webpack.config.js b/test/configCases/dll-plugin/1-use-dll/webpack.config.js
@@ -0,0 +1,13 @@
+var path = require("path");
+var webpack = require("../../../../");
+
+module.exports = {
+	plugins: [
+		new webpack.DllReferencePlugin({
+			manifest: require("../../../js/config/dll-plugin/manifest0.json"),
+			name: "../0-create-dll/dll.js",
+			scope: "dll",
+			sourceType: "commonjs2"
+		})
+	]
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module.exports = function() {`
	`2`	`+ return System.import("./c");`
	`3`	`+}`