test infrastructure improvements

sokra · sokra · commit dac1354c1419 · 2016-06-04T14:47:20.000+02:00
diff --git a/test/Stats.test.js b/test/Stats.test.js
@@ -8,7 +8,9 @@ var webpack = require("../lib/webpack");
 
 var base = path.join(__dirname, "statsCases");
 var outputBase = path.join(__dirname, "js", "stats");
-var tests = fs.readdirSync(base);
+var tests = fs.readdirSync(base).filter(function(testName) {
+	return fs.existsSync(path.join(base, testName, "index.js"))
+});
 var Stats = require("../lib/Stats");
 
 describe("Stats", function() {
diff --git a/test/TestCases.test.js b/test/TestCases.test.js
@@ -7,8 +7,6 @@ var checkArrayExpectation = require("./checkArrayExpectation");
 
 var webpack = require("../lib/webpack");
 
-var harmony = (+process.versions.node.split(".")[0]) >= 4;
-
 describe("TestCases", function() {
 	var casesPath = path.join(__dirname, "cases");
 	var categories = fs.readdirSync(casesPath);
@@ -66,15 +64,15 @@ describe("TestCases", function() {
 		devtool: "cheap-source-map"
 	}, {
 		name: "minimized",
-		excludeNominimize: true,
+		minimize: true,
 		plugins: [
 			new webpack.optimize.UglifyJsPlugin({
 				sourceMap: false
 			})
 		]
 	}, {
 		name: "minimized-source-map",
-		excludeNominimize: true,
+		minimize: true,
 		plugins: [
 			new webpack.optimize.UglifyJsPlugin()
 		]
@@ -86,14 +84,14 @@ describe("TestCases", function() {
 		]
 	}, {
 		name: "minimized-deduped",
-		excludeNominimize: true,
+		minimize: true,
 		plugins: [
 			new webpack.optimize.DedupePlugin(),
 			new webpack.optimize.UglifyJsPlugin()
 		]
 	}, {
 		name: "optimized",
-		excludeNominimize: true,
+		minimize: true,
 		plugins: [
 			new webpack.optimize.DedupePlugin(),
 			new webpack.optimize.OccurrenceOrderPlugin(),
@@ -102,7 +100,7 @@ describe("TestCases", function() {
 	}, {
 		name: "all-combined",
 		devtool: "#@source-map",
-		excludeNominimize: true,
+		minimize: true,
 		plugins: [
 			new webpack.HotModuleReplacementPlugin(),
 			new webpack.optimize.DedupePlugin(),
@@ -116,9 +114,12 @@ describe("TestCases", function() {
 				describe(category.name, function() {
 					this.timeout(20000);
 					category.tests.filter(function(test) {
-						var minimizeCheckOk = !config.excludeNominimize || test.indexOf("nominimize") < 0;
-						var harmonyCheckOk = !/^es6/.test(test) || harmony;
-						return minimizeCheckOk && harmonyCheckOk;
+						var testDirectory = path.join(casesPath, category.name, test);
+						var filterPath = path.join(testDirectory, "test.filter.js");
+						if(fs.existsSync(filterPath)) {
+							return require(filterPath)(config);
+						}
+						return true;
 					}).forEach(function(testName) {
 						var suite = describe(testName, function() {});
 						it(testName + " should compile", function(done) {
diff --git a/test/cases/parsing/es6.nominimize/test.filter.js b/test/cases/parsing/es6.nominimize/test.filter.js
@@ -0,0 +1,5 @@
+var supportsES6 = require("../../../helpers/supportsES6");
+
+module.exports = function(config) {
+	return !config.minimize && supportsES6();
+};
diff --git a/test/helpers/supportsES6.js b/test/helpers/supportsES6.js
@@ -0,0 +1,8 @@
+module.exports = function supportsES6() {
+	try {
+		eval("class A {}");
+		return true;
+	} catch(e) {
+		return false;
+	}
+};
