Merge pull request #59 from chuckdumont/work2

Chuck Dumont · web-flow · commit 48f3d05a4a2b · 2017-10-09T12:14:44.000-04:00
Add error test cases
diff --git a/lib/DojoAMDPlugin.js b/lib/DojoAMDPlugin.js
@@ -186,14 +186,18 @@ Refer to https://github.com/OpenNTF/dojo-webpack-plugin/blob/master/README.md#bu
 	getDojoLoader(options__, loaderConfig, callback) {
 		var dojoLoader;
 		if (this.options.loader) {
-			dojoLoader = require(this.options.loader);
+			try {
+				dojoLoader = require(this.options.loader);
+			} catch (error) {
+				callback(error);
+			}
 			callback(null, dojoLoader);
 		} else {
 			console.log("Dojo loader not specified in options.  Building the loader...");
 			const execFile = require("child_process").execFile;
 			const tmp = require("tmp");
 			let dojoPath;
-			if (!loaderConfig.packages.some((pkg) => {
+			if (!loaderConfig.packages || !loaderConfig.packages.some((pkg) => {
 				if (pkg.name === "dojo") return (dojoPath = pkg.location);
 			})) {
 				return callback(new Error("dojo package not defined in loader config"));
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -33,6 +33,7 @@
     "eslint": "^4.7.2",
     "eslint-plugin-json": "^1.2.0",
     "eslint-plugin-markdown": "^1.0.0-beta.6",
+    "fs-extra": "^4.0.2",
     "istanbul": "^0.4.5",
     "mocha": "^3.5.3",
     "mocha-lcov-reporter": "^1.3.0",
diff --git a/test/ErrorTestCases/misc/loaderVersion/expectedError.js b/test/ErrorTestCases/misc/loaderVersion/expectedError.js
@@ -0,0 +1,5 @@
+module.exports = {
+	test: function(error) {
+		return /Dojo loader version does not match the version of Dojo/.test(error.message);
+	}
+};
diff --git a/test/ErrorTestCases/misc/loaderVersion/index.js b/test/ErrorTestCases/misc/loaderVersion/index.js
@@ -0,0 +1 @@
+define([], function() {});
diff --git a/test/ErrorTestCases/misc/loaderVersion/webpack.config.js b/test/ErrorTestCases/misc/loaderVersion/webpack.config.js
@@ -0,0 +1,19 @@
+var DojoWebpackPlugin = require("../../../../index");
+var path = require("path");
+var fs = require("fs-extra");
+var loader = fs.readFileSync(path.join(__dirname, "../../../js/dojo/dojo.js"), "utf-8"); // eslint-disable-line
+var loaderPath = path.join(__dirname.replace(/[\/\\]test[\/\\]ErrorTestCases[\/\\]/, "/test/js/ErrorTestCases/"), "dojoLoader.js");
+loader = loader.replace(/(this\.loaderVersion)\s*=\s*"[^"]+"/, '$1 = "1.0.0"');
+fs.ensureDirSync(path.join(loaderPath, ".."));
+fs.writeFileSync(loaderPath, loader, "utf-8");
+module.exports = {
+	entry: "test/index",
+	plugins: [
+		new DojoWebpackPlugin({
+			loaderConfig: {
+				paths:{test: "."}
+			},
+			loader: loaderPath
+		})
+	]
+};
diff --git a/test/ErrorTestCases/options/badDojoPath/expectedError.js b/test/ErrorTestCases/options/badDojoPath/expectedError.js
@@ -0,0 +1,5 @@
+module.exports = {
+	test: function(error) {
+		return /Command failed:/.test(error.message);
+	}
+};
diff --git a/test/ErrorTestCases/options/badDojoPath/index.js b/test/ErrorTestCases/options/badDojoPath/index.js
@@ -0,0 +1 @@
+define([], function() {});
diff --git a/test/ErrorTestCases/options/badDojoPath/webpack.config.js b/test/ErrorTestCases/options/badDojoPath/webpack.config.js
@@ -0,0 +1,12 @@
+var DojoWebpackPlugin = require("../../../../index");
+module.exports = {
+	entry: "test/index",
+	plugins: [
+		new DojoWebpackPlugin({
+			loaderConfig: {
+				paths:{test: "."},
+				packages:[{name: "dojo", location: "./dojo"}]
+			}
+		})
+	]
+};
diff --git a/test/ErrorTestCases/options/missingDojo/expectedError.js b/test/ErrorTestCases/options/missingDojo/expectedError.js
@@ -0,0 +1,5 @@
+module.exports = {
+	test: function(error) {
+		return /dojo package not defined in loader config/.test(error.message);
+	}
+};
diff --git a/test/ErrorTestCases/options/missingDojo/index.js b/test/ErrorTestCases/options/missingDojo/index.js
@@ -0,0 +1 @@
+define([], function() {});
diff --git a/test/ErrorTestCases/options/missingDojo/webpack.config.js b/test/ErrorTestCases/options/missingDojo/webpack.config.js
@@ -0,0 +1,11 @@
+var DojoWebpackPlugin = require("../../../../index");
+module.exports = {
+	entry: "test/index",
+	plugins: [
+		new DojoWebpackPlugin({
+			loaderConfig: {
+				paths:{test: "."}
+			}
+		})
+	]
+};
diff --git a/test/ErrorTestCases/options/missingLoader/expectedError.js b/test/ErrorTestCases/options/missingLoader/expectedError.js
@@ -0,0 +1,5 @@
+module.exports = {
+	test: function(error) {
+		return /Cannot find module \'.*[\/\\]dojo.js'$/.test(error);
+	}
+};
diff --git a/test/ErrorTestCases/options/missingLoader/index.js b/test/ErrorTestCases/options/missingLoader/index.js
@@ -0,0 +1 @@
+define([], function() {});
diff --git a/test/ErrorTestCases/options/missingLoader/webpack.config.js b/test/ErrorTestCases/options/missingLoader/webpack.config.js
@@ -0,0 +1,13 @@
+var path = require("path");
+var DojoWebpackPlugin = require("../../../../index");
+module.exports = {
+	entry: "test/index",
+	plugins: [
+		new DojoWebpackPlugin({
+			loaderConfig: {
+				paths:{test: "."}
+			},
+			loader: path.join(__dirname, "dojo.js")
+		})
+	]
+};
diff --git a/test/TestCases/dependencies/constNamedModules/loaderConfig.js b/test/TestCases/dependencies/constNamedModules/loaderConfig.js
@@ -0,0 +1,5 @@
+module.exports = function() {
+	return {
+		paths:{test: "."}
+	};
+};
diff --git a/test/TestCases/dependencies/constNamedModules/webpack.config.js b/test/TestCases/dependencies/constNamedModules/webpack.config.js
@@ -4,9 +4,7 @@ module.exports = {
 	entry: "test/index",
 	plugins: [
 		new DojoWebpackPlugin({
-			loaderConfig: {
-				paths:{test: "."}
-			},
+			loaderConfig: require.resolve("./loaderConfig"),
 			loader: path.join(__dirname, "../../../js/dojo/dojo.js")
 		})
 	],
diff --git a/test/TestCases/loaders/selectorEngine/index.js b/test/TestCases/loaders/selectorEngine/index.js
@@ -1,5 +1,5 @@
 define(["dojo/query!css2"], function(engine) {
-	it("should load text files" , function() {
+	it("should load the specified selector engine" , function() {
 		"css2".should.be.eql(engine);
 	});
 });
diff --git a/test/test.js b/test/test.js
@@ -31,7 +31,14 @@ var NodeRequireEnsurePatchPlugin = require("./plugins/NodeRequireEnsurePatchPlug
 
 
 describe("TestCases", () => {
-	var casesPath = path.join(__dirname, "TestCases");
+	runTestCases(path.join(__dirname, "TestCases"));
+});
+
+describe("ErrorTestCases", () => {
+	runTestCases(path.join(__dirname, "ErrorTestCases"), true);
+});
+
+function runTestCases(casesPath, isErrorTest) {
 	var categories = fs.readdirSync(casesPath);
 	categories = categories.map(function(cat) {
 		return {
@@ -45,7 +52,7 @@ describe("TestCases", () => {
 		describe(category.name, function() {
 			category.tests.forEach(function(testName) {
 				var suite = describe(testName, function() {});
-				it(testName + " should compile", function(done) {
+				it(testName + isErrorTest ? " should fail" : " should compile", function(done) {
 					this.timeout(60000);
 					var testDirectory = path.join(casesPath, category.name, testName);
 					var outputDirectory = path.join(__dirname, "js", "TestCases", category.name, testName);
@@ -64,7 +71,9 @@ describe("TestCases", () => {
 						options.plugins.push(new NodeRequireEnsurePatchPlugin());
 					});
 					webpack(options, function(err, stats) {
-						if(err) return done(err);
+						if (checkExpectedError(isErrorTest, testDirectory, err, done)) {
+							return;
+						}
 						var statOptions = Stats.presetToOptions("verbose");
 						statOptions.colors = false;
 						fs.writeFileSync(path.join(outputDirectory, "stats.txt"), stats.toString(statOptions), "utf-8");
@@ -129,7 +138,26 @@ describe("TestCases", () => {
 			});
 		});
 	});
-});
+}
+
+function checkExpectedError(isErrorTest, testDirectory, error, done) {
+	if (isErrorTest) {
+		if (error) {
+			const expectedError = require(path.join(testDirectory, "expectedError"));
+			if (expectedError.test(error)) {
+				done();
+			} else {
+				done(new Error("Unexpected error message: " + error));
+			}
+		} else {
+			done(new Error("Expected error but test passed."));
+		}
+		return true;
+	} else if (error) {
+		done(error);
+		return true;
+	}
+}
 
 function checkArrayExpectation(testDirectory, object, kind, filename, upperCaseKind, done) {
 	if(!done) {
