Merge pull request #63 from chuckdumont/work

Chuck Dumont · web-flow · commit a20543b8f9ba · 2017-10-11T16:44:42.000-04:00
i18n unit tests
diff --git a/test/ErrorTestCases/i18n/illegalDefineDeps/errors.js b/test/ErrorTestCases/i18n/illegalDefineDeps/errors.js
@@ -0,0 +1,3 @@
+module.exports = [
+	[/define dependencies not supported in langauge files/]
+];
diff --git a/test/ErrorTestCases/i18n/illegalDefineDeps/index.js b/test/ErrorTestCases/i18n/illegalDefineDeps/index.js
@@ -0,0 +1,4 @@
+define(["dojo/i18n!./nls/strings"], function(strings) {
+	strings;
+	throw new Error("Should not get here");
+});
diff --git a/test/ErrorTestCases/i18n/illegalDefineDeps/nls/strings.js b/test/ErrorTestCases/i18n/illegalDefineDeps/nls/strings.js
@@ -0,0 +1,7 @@
+define(["dep"], function() {
+	return {
+		root: ({
+	    hello: 'Hello'
+	  })
+	};
+});
diff --git a/test/ErrorTestCases/i18n/illegalDefineDeps/webpack.config.js b/test/ErrorTestCases/i18n/illegalDefineDeps/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, "../../../js/dojo/dojo.js")
+		})
+	]
+};
diff --git a/test/TestCases/loaders/i18n/index.js b/test/TestCases/loaders/i18n/index.js
@@ -0,0 +1,14 @@
+define(["dojo/_base/config", "dojo/i18n!./nls/strings1", "dojo/i18n!./nls/strings2"], function(config, strings1, strings2) {
+	const lang = config.locale ? config.locale : "default";
+	it(`should load strings for ${lang} language`, function() {
+		strings1.hello.should.be.eql(lang === "fr" ? "Bonjoure" : lang === "es" ? "Hola" : "Hello");
+		strings2.goodby.should.be.eql(lang === "fr" ? "Bon par" : lang === "de" ? "Auf Wiedersehen" : "Good by");
+		it("should load locale specific strings", function(done) {
+			// load a locale specific bundle
+			require(["dojo/i18n!./nls/fr/strings1"], function(strings) {
+				strings.hello.should.be.eql("Bonjoure");
+				done();
+			});
+		});
+	});
+});
diff --git a/test/TestCases/loaders/i18n/nls/de/strings1.js b/test/TestCases/loaders/i18n/nls/de/strings1.js
@@ -0,0 +1,3 @@
+define({
+	hello: 'Hallo'
+});
diff --git a/test/TestCases/loaders/i18n/nls/de/strings2.js b/test/TestCases/loaders/i18n/nls/de/strings2.js
@@ -0,0 +1,3 @@
+define({
+	goodby: 'Auf Wiedersehen'
+});
diff --git a/test/TestCases/loaders/i18n/nls/es/strings1.js b/test/TestCases/loaders/i18n/nls/es/strings1.js
@@ -0,0 +1,3 @@
+define({
+	hello: 'Hola'
+});
diff --git a/test/TestCases/loaders/i18n/nls/es/strings2.js b/test/TestCases/loaders/i18n/nls/es/strings2.js
@@ -0,0 +1,3 @@
+define({
+	goodby: 'Bueno por'
+});
diff --git a/test/TestCases/loaders/i18n/nls/fr/strings1.js b/test/TestCases/loaders/i18n/nls/fr/strings1.js
@@ -0,0 +1,3 @@
+define({
+  hello: 'Bonjoure'
+});
diff --git a/test/TestCases/loaders/i18n/nls/fr/strings2.js b/test/TestCases/loaders/i18n/nls/fr/strings2.js
@@ -0,0 +1,3 @@
+define({
+	goodby: 'Bon par'
+});
diff --git a/test/TestCases/loaders/i18n/nls/strings1.js b/test/TestCases/loaders/i18n/nls/strings1.js
@@ -0,0 +1,8 @@
+define({
+  root: ({
+    hello: 'Hello'
+  }),
+	"fr":true,
+	"es":true,
+	"de":false
+});
diff --git a/test/TestCases/loaders/i18n/nls/strings2.js b/test/TestCases/loaders/i18n/nls/strings2.js
@@ -0,0 +1,10 @@
+define([], function() {
+	return {
+	  root: ({
+	    goodby: 'Good by'
+	  }),
+		"fr":true,
+		"es":false,
+		"de":true
+	};
+});
diff --git a/test/TestCases/loaders/i18n/webpack.config.js b/test/TestCases/loaders/i18n/webpack.config.js
@@ -0,0 +1,19 @@
+var path = require("path");
+var DojoWebpackPlugin = require("../../../../index");
+
+module.exports = [undefined, "fr", "es", "de"].map(locale => {
+	return {
+		entry: "test/index",
+		plugins: [
+			new DojoWebpackPlugin({
+				loaderConfig: {
+					paths:{test: "."},
+					has: {"host-browser": 0, "dojo-config-api": 1}
+				},
+				locales: ["fr", "es", "de"],
+				loader: path.join(__dirname, "../../../js/dojo/dojo.js"),
+				locale: locale
+			})
+		]
+	};
+});
diff --git a/test/test.js b/test/test.js
@@ -35,10 +35,10 @@ describe("TestCases", () => {
 });
 
 describe("ErrorTestCases", () => {
-	runTestCases(path.join(__dirname, "ErrorTestCases"), true);
+	runTestCases(path.join(__dirname, "ErrorTestCases"));
 });
 
-function runTestCases(casesPath, isErrorTest) {
+function runTestCases(casesPath) {
 	var categories = fs.readdirSync(casesPath);
 	categories = categories.map(function(cat) {
 		return {
@@ -52,9 +52,12 @@ function runTestCases(casesPath, isErrorTest) {
 		describe(category.name, function() {
 			category.tests.forEach(function(testName) {
 				var suite = describe(testName, function() {});
-				it(testName + isErrorTest ? " should fail" : " should compile", function(done) {
+				var testDirectory = path.join(casesPath, category.name, testName);
+				const isErrorTest = fs.existsSync(path.join(testDirectory, "expectedError.js"));
+				const isCompilerErrors = fs.existsSync(path.join(testDirectory, "errors.js"));
+				const isCompilerWarnings = fs.existsSync(path.join(testDirectory, "warnings.js"));
+				it(testName + (isErrorTest ? " should fail" : " should compile") + (isCompilerErrors ? " with errors" : isCompilerWarnings ? " with warnings" : ""), function(done) {
 					this.timeout(60000);
-					var testDirectory = path.join(casesPath, category.name, testName);
 					var outputDirectory = path.join(__dirname, "js", "TestCases", category.name, testName);
 					var options = require(path.join(testDirectory, "webpack.config.js"));
 					var optionsArr = [].concat(options);
@@ -183,6 +186,7 @@ function checkArrayExpectation(testDirectory, object, kind, filename, upperCaseK
 			} else if(!expected[i].test(array[i]))
 				return done(new Error(`${upperCaseKind} ${i}: ${array[i]} doesn't match ${expected[i].toString()}`)), true;
 		}
+		return done(), true;
 	} else if(array.length > 0) {
 		return done(new Error(`${upperCaseKind}s while compiling:\n\n${array.join("\n\n")}`)), true;
 	}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module.exports = [`
	`2`	`+ [/define dependencies not supported in langauge files/]`
	`3`	`+];`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+define({`
	`2`	`+ hello: 'Hallo'`
	`3`	`+});`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+define({`
	`2`	`+ goodby: 'Auf Wiedersehen'`
	`3`	`+});`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+define({`
	`2`	`+ hello: 'Hola'`
	`3`	`+});`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+define({`
	`2`	`+ goodby: 'Bueno por'`
	`3`	`+});`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+define({`
	`2`	`+ hello: 'Bonjoure'`
	`3`	`+});`