added test cases, fixed bug, added CI

Author: sokra

.gitignore

@@ -1,2 +1,3 @@
 /node_modules
-/example/assets
+/example/assets
+/test/js

.npmignore

@@ -1,2 +1,3 @@
 example/
+test/
 .gitattributes

.travis.yml

@@ -0,0 +1,11 @@
+sudo: false
+language: node_js
+node_js:
+  - "0.12"
+  - node
+script: npm run travis
+
+after_success:
+  - cat ./coverage/lcov.info | node_modules/.bin/coveralls --verbose
+  - cat ./coverage/coverage.json | node_modules/codecov.io/bin/codecov.io.js
+  - rm -rf ./coverage

index.js

@@ -25,7 +25,6 @@ ExtractTextPlugin.prototype.mergeNonInitialChunks = function(chunk, intoChunk, c
 	} else if(checkedChunks.indexOf(chunk) < 0) {
 		checkedChunks.push(chunk);
 		chunk.modules.slice().forEach(function(module) {
-			chunk.removeModule(module);
 			intoChunk.addModule(module);
 			module.addChunk(intoChunk);
 		});
@@ -275,6 +274,13 @@ ExtractTextPlugin.prototype.apply = function(compiler) {
 					if(extractedChunk.initial)
 						this.mergeNonInitialChunks(extractedChunk);
 				}, this);
+				extractedChunks.forEach(function(extractedChunk) {
+					if(!extractedChunk.initial) {
+						extractedChunk.modules.forEach(function(module) {
+							extractedChunk.removeModule(module);
+						});
+					}
+				});
 				compilation.applyPlugins("optimize-extracted-chunks", extractedChunks);
 				callback();
 			}.bind(this));

package.json

@@ -7,19 +7,32 @@
     "webpack": "^1.9.11"
   },
   "dependencies": {
-    "async": "^1.2.1",
-    "loader-utils": "~0.2.3"
+    "async": "^1.5.0",
+    "loader-utils": "^0.2.3"
   },
   "devDependencies": {
-    "file-loader": "*",
-    "style-loader": "*",
-    "css-loader": "*",
-    "webpack": "*"
+    "codecov.io": "^0.1.2",
+    "coveralls": "^2.11.2",
+    "css-loader": "^0.21.0",
+    "file-loader": "^0.8.4",
+    "istanbul": "^0.3.13",
+    "mocha": "^2.3.3",
+    "mocha-lcov-reporter": "0.0.2",
+    "raw-loader": "^0.5.1",
+    "should": "^7.1.1",
+    "style-loader": "^0.13.0",
+    "webpack": "^1.12.2"
   },
   "homepage": "http://github.com/webpack/extract-text-webpack-plugin",
   "repository": {
     "type": "git",
     "url": "http://github.com/webpack/extract-text-webpack-plugin.git"
   },
-  "license": "MIT"
+  "license": "MIT",
+  "scripts": {
+    "test": "mocha",
+    "travis": "npm run cover -- --report lcovonly",
+    "cover": "istanbul cover node_modules/mocha/bin/_mocha",
+    "publish-patch": "mocha && npm version patch && git push && git push --tags && npm publish"
+  }
 }

test/TestCases.test.js

@@ -0,0 +1,52 @@
+var fs = require("fs");
+var vm = require("vm");
+var path = require("path");
+var webpack = require("webpack");
+var should = require("should");
+var ExtractTextPlugin = require("../");
+
+var cases = fs.readdirSync(path.join(__dirname, "cases"));
+
+describe("TestCases", function() {
+	cases.forEach(function(testCase) {
+		it(testCase, function(done) {
+			var testDirectory = path.join(__dirname, "cases", testCase);
+			var outputDirectory = path.join(__dirname, "js", testCase);
+			var options = { entry: { test: "./index.js" } };
+			var configFile = path.join(testDirectory, "webpack.config.js");
+			if(fs.existsSync(configFile))
+				options = require(configFile);
+			options.context = testDirectory;
+			if(!options.module) options.module = {};
+			if(!options.module.loaders) options.module.loaders = [
+				{ test: /\.txt$/, loader: ExtractTextPlugin.extract("raw-loader") }
+			];
+			if(!options.output) options.output = { filename: "[name].js" };
+			if(!options.output.path) options.output.path = outputDirectory;
+			webpack(options, function(err, stats) {
+				if(err) return done(err);
+				if(stats.hasErrors()) return done(new Error(stats.toString()));
+				var testFile = path.join(outputDirectory, "test.js");
+				if(fs.existsSync(testFile))
+					require(testFile)(suite);
+				var expectedDirectory = path.join(testDirectory, "expected");
+				fs.readdirSync(expectedDirectory).forEach(function(file) {
+					var filePath = path.join(expectedDirectory, file);
+					var actualPath = path.join(outputDirectory, file);
+					readFileOrEmpty(actualPath).should.be.eql(
+						readFileOrEmpty(filePath),
+						file + " should be correct");
+				});
+				done();
+			});
+		});
+	});
+});
+
+function readFileOrEmpty(path) {
+	try {
+		return fs.readFileSync(path, "utf-8");
+	} catch(e) {
+		return "";
+	}
+}

test/cases/merging-chunk/a.txt

@@ -0,0 +1 @@
+a

test/cases/merging-chunk/b.txt

@@ -0,0 +1 @@
+b

test/cases/merging-chunk/expected/file.css

@@ -0,0 +1,2 @@
+a
+b

test/cases/merging-chunk/index.js

@@ -0,0 +1,4 @@
+require("./a.txt");
+require.ensure([], function() {
+	require("./b.txt");
+});