Merge pull request webpack#4201 from fedebertolini/test/environment-plugin

sokra · web-flow · commit 3855b77275d4 · 2017-02-06T13:53:25.000+01:00
Test - improve EnvironmentPlugin code coverage
diff --git a/test/configCases/plugins/environment-plugin/errors.js b/test/configCases/plugins/environment-plugin/errors.js
@@ -1,11 +1,33 @@
-module.exports = [
-	[/(aaa)/, /resolve 'bbb'/],
-	[/(aaa)/, /resolve 'ccc'/],
-	[/(aaa)/, /resolve 'ddd'/],
-	[/(bbbccc)/, /resolve 'aaa'/],
-	[/(bbbccc)/, /resolve 'ddd'/],
-	[/(ddd)/, /resolve 'aaa'/],
-	[/(ddd)/, /resolve 'bbb'/],
-	[/(ddd)/, /resolve 'ccc'/],
-	[/(ddd)/, /resolve 'ddd'/],
-];
+const variables = ['aaa', 'bbb', 'ccc', 'ddd', 'eee', 'fff', 'ggg', 'hhh'];
+const modules = [{
+	name: 'aaa',
+	variables: ['aaa']
+}, {
+	name: 'bbbccc',
+	variables: ['bbb', 'ccc']
+}, {
+	name: 'ddd',
+	variables: []
+}, {
+	name: 'eeefff',
+	variables: ['eee', 'fff']
+}, {
+	name: 'ggghhh',
+	variables: ['ggg', 'hhh']
+}];
+
+// build an array of regular expressions of expected errors
+const regex = [];
+modules.forEach(module => {
+	variables.forEach(variable => {
+		if (module.variables.indexOf(variable) === -1) {
+			// the module doesn't include the env variable, an error is expected when requiring the variable
+			regex.push([
+				new RegExp(`(${module.name})`),
+				new RegExp(`Can't resolve '${variable}'`),
+			]);
+		}
+	});
+});
+
+module.exports = regex;
diff --git a/test/configCases/plugins/environment-plugin/index.js b/test/configCases/plugins/environment-plugin/index.js
@@ -1,16 +1,30 @@
-it("should import a single process.env var", function() {
+it("should import a single process.env var", () => {
 	if(process.env.AAA !== "aaa")
 		require.include("aaa");
 });
 
-it("should import multiple process.env vars", function() {
+it("should import multiple process.env vars", () => {
 	if(process.env.BBB !== "bbb")
 		require.include("bbb");
 	if(process.env.CCC !== "ccc")
 		require.include("ccc");
 });
 
-it("should warn when a process.env variable is undefined", function() {
+it("should warn when a process.env variable is undefined", () => {
 	if(process.env.DDD !== "ddd")
 		require.include("ddd");
 });
+
+it("should import an array of process.env vars", () => {
+	if(process.env.EEE !== "eee")
+		require.include("eee");
+	if(process.env.FFF !== "fff")
+		require.include("fff");
+});
+
+it("should import multiple process.env var with default values", () => {
+	if(process.env.GGG !== "ggg")
+		require.include("ggg");
+	if(process.env.HHH !== "hhh")
+		require.include("hhh");
+});
diff --git a/test/configCases/plugins/environment-plugin/webpack.config.js b/test/configCases/plugins/environment-plugin/webpack.config.js
@@ -1,7 +1,12 @@
-var EnvironmentPlugin = require("../../../../lib/EnvironmentPlugin");
+const EnvironmentPlugin = require("../../../../lib/EnvironmentPlugin");
+
 process.env.AAA = "aaa";
 process.env.BBB = "bbb";
 process.env.CCC = "ccc";
+process.env.EEE = "eee";
+process.env.FFF = "fff";
+process.env.GGG = "ggg";
+
 module.exports = [{
 	name: "aaa",
 	module: { unknownContextRegExp: /$^/, unknownContextCritical: false },
@@ -20,4 +25,19 @@ module.exports = [{
 	plugins: [
 		new EnvironmentPlugin("DDD")
 	]
+}, {
+	name: "eeefff",
+	module: { unknownContextRegExp: /$^/, unknownContextCritical: false },
+	plugins: [
+		new EnvironmentPlugin(["EEE", "FFF"])
+	]
+}, {
+	name: "ggghhh",
+	module: { unknownContextRegExp: /$^/, unknownContextCritical: false },
+	plugins: [
+		new EnvironmentPlugin({
+			GGG: 'ggg-default',
+			HHH: 'hhh'
+		})
+	]
 }];
