Merge remote-tracking branch 'roramirez_github/develop' into default-hello-world

tests/e2e/modules/calendar_spec.js

@@ -1,19 +1,32 @@
-const globalSetup = require("../global-setup");
-const serverBasicAuth  = require("../../servers/basic-auth.js");
-const app = globalSetup.app;
-const chai = require("chai");
-const expect = chai.expect;
+const helpers = require("../global-setup");
+const path = require("path");
+const request = require("request");
+const serverBasicAuth = require("../../servers/basic-auth.js");
 
-describe("Calendar module", function () {
+const expect = require("chai").expect;
 
-	this.timeout(20000);
+const describe = global.describe;
+const it = global.it;
+const beforeEach = global.beforeEach;
+const afterEach = global.afterEach;
 
-	beforeEach(function (done) {
-		app.start().then(function() { done(); } );
+describe("Calendar module", function() {
+	helpers.setupTimeout(this);
+
+	var app = null;
+
+	beforeEach(function() {
+		return helpers
+			.startApplication({
+				args: ["js/electron.js"]
+			})
+			.then(function(startedApp) {
+				app = startedApp;
+			});
 	});
 
-	afterEach(function (done) {
-		app.stop().then(function() { done(); });
+	afterEach(function() {
+		return helpers.stopApplication(app);
 	});
 
 	describe("Default configuration", function() {
@@ -22,12 +35,11 @@ describe("Calendar module", function () {
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/calendar/default.js";
 		});
 
-		it("Should return TestEvents", function () {
+		it("Should return TestEvents", function() {
 			return app.client.waitUntilTextExists(".calendar", "TestEvent", 10000);
 		});
 	});
 
-
 	describe("Basic auth", function() {
 		before(function() {
 			serverBasicAuth.listen(8010);
@@ -35,12 +47,15 @@ describe("Calendar module", function () {
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/calendar/basic-auth.js";
 		});
 
-		it("Should return TestEvents", function () {
+		after(function(done) {
+			serverBasicAuth.close(done());
+		});
+
+		it("Should return TestEvents", function() {
 			return app.client.waitUntilTextExists(".calendar", "TestEvent", 10000);
 		});
 	});
 
-
 	describe("Basic auth by default", function() {
 		before(function() {
 			serverBasicAuth.listen(8011);
@@ -48,19 +63,27 @@ describe("Calendar module", function () {
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/calendar/auth-default.js";
 		});
 
-		it("Should return TestEvents", function () {
+		after(function(done) {
+			serverBasicAuth.close(done());
+		});
+
+		it("Should return TestEvents", function() {
 			return app.client.waitUntilTextExists(".calendar", "TestEvent", 10000);
 		});
 	});
 
-	describe("Basic auth backward compatibilty configuration", function() {
+	describe("Basic auth backward compatibilty configuration: DEPRECATED", function() {
 		before(function() {
 			serverBasicAuth.listen(8012);
 			// Set config sample for use in test
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/calendar/old-basic-auth.js";
 		});
 
-		it("Should return TestEvents", function () {
+		after(function(done) {
+			serverBasicAuth.close(done());
+		});
+
+		it("Should return TestEvents", function() {
 			return app.client.waitUntilTextExists(".calendar", "TestEvent", 10000);
 		});
 	});
@@ -72,10 +95,12 @@ describe("Calendar module", function () {
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/calendar/fail-basic-auth.js";
 		});
 
-		it("Should return No upcoming events", function () {
+		after(function(done) {
+			serverBasicAuth.close(done());
+		});
+
+		it("Should return No upcoming events", function() {
 			return app.client.waitUntilTextExists(".calendar", "No upcoming events.", 10000);
 		});
 	});
-
-
 });

tests/e2e/modules/clock_es_spec.js

@@ -1,8 +1,32 @@
-const globalSetup = require("../global-setup");
-const app = globalSetup.app;
+const helpers = require("../global-setup");
+const path = require("path");
+const request = require("request");
 
-describe("Clock set to spanish language module", function () {
-	this.timeout(20000);
+const expect = require("chai").expect;
+
+const describe = global.describe;
+const it = global.it;
+const beforeEach = global.beforeEach;
+const afterEach = global.afterEach;
+
+describe("Clock set to spanish language module", function() {
+	helpers.setupTimeout(this);
+
+	var app = null;
+
+	beforeEach(function() {
+		return helpers
+			.startApplication({
+				args: ["js/electron.js"]
+			})
+			.then(function(startedApp) {
+				app = startedApp;
+			});
+	});
+
+	afterEach(function() {
+		return helpers.stopApplication(app);
+	});
 
 	describe("with default 24hr clock config", function() {
 		before(function() {
@@ -10,24 +34,14 @@ describe("Clock set to spanish language module", function () {
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/es/clock_24hr.js";
 		});
 
-		beforeEach(function (done) {
-			app.start().then(function() { done(); } );
-		});
-
-		afterEach(function (done) {
-			app.stop().then(function() { done(); });
-		});
-
-		it("shows date with correct format", function () {
+		it("shows date with correct format", function() {
 			const dateRegex = /^(?:lunes|martes|miércoles|jueves|viernes|sábado|domingo), \d{1,2} de (?:enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre) de \d{4}$/;
-			return app.client.waitUntilWindowLoaded()
-				.getText(".clock .date").should.eventually.match(dateRegex);
+			return app.client.waitUntilWindowLoaded().getText(".clock .date").should.eventually.match(dateRegex);
 		});
 
 		it("shows time in 24hr format", function() {
-			const timeRegex = /^(?:2[0-3]|[01]\d):[0-5]\d[0-5]\d$/
-			return app.client.waitUntilWindowLoaded()
-				.getText(".clock .time").should.eventually.match(timeRegex);
+			const timeRegex = /^(?:2[0-3]|[01]\d):[0-5]\d[0-5]\d$/;
+			return app.client.waitUntilWindowLoaded().getText(".clock .time").should.eventually.match(timeRegex);
 		});
 	});
 
@@ -37,24 +51,14 @@ describe("Clock set to spanish language module", function () {
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/es/clock_12hr.js";
 		});
 
-		beforeEach(function (done) {
-			app.start().then(function() { done(); } );
-		});
-
-		afterEach(function (done) {
-			app.stop().then(function() { done(); });
-		});
-
-		it("shows date with correct format", function () {
+		it("shows date with correct format", function() {
 			const dateRegex = /^(?:lunes|martes|miércoles|jueves|viernes|sábado|domingo), \d{1,2} de (?:enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre) de \d{4}$/;
-			return app.client.waitUntilWindowLoaded()
-				.getText(".clock .date").should.eventually.match(dateRegex);
+			return app.client.waitUntilWindowLoaded().getText(".clock .date").should.eventually.match(dateRegex);
 		});
 
 		it("shows time in 12hr format", function() {
 			const timeRegex = /^(?:1[0-2]|[1-9]):[0-5]\d[0-5]\d[ap]m$/;
-			return app.client.waitUntilWindowLoaded()
-				.getText(".clock .time").should.eventually.match(timeRegex);
+			return app.client.waitUntilWindowLoaded().getText(".clock .time").should.eventually.match(timeRegex);
 		});
 	});
 
@@ -64,18 +68,23 @@ describe("Clock set to spanish language module", function () {
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/es/clock_showPeriodUpper.js";
 		});
 
-		beforeEach(function (done) {
-			app.start().then(function() { done(); } );
-		});
-
-		afterEach(function (done) {
-			app.stop().then(function() { done(); });
-		});
-
 		it("shows 12hr time with upper case AM/PM", function() {
 			const timeRegex = /^(?:1[0-2]|[1-9]):[0-5]\d[0-5]\d[AP]M$/;
-			return app.client.waitUntilWindowLoaded()
-				.getText(".clock .time").should.eventually.match(timeRegex);
+			return app.client.waitUntilWindowLoaded().getText(".clock .time").should.eventually.match(timeRegex);
 		});
 	});
+
+	describe("with showWeek config enabled", function() {
+		before(function() {
+			// Set config sample for use in test
+			process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/es/clock_showWeek.js";
+		});
+
+		it("shows week with correct format", function() {
+			const weekRegex = /^Semana [0-9]{1,2}$/;
+			return app.client.waitUntilWindowLoaded()
+				.getText(".clock .week").should.eventually.match(weekRegex);
+		});
+	});
+
 });

tests/e2e/modules/clock_spec.js

@@ -1,8 +1,32 @@
-const globalSetup = require("../global-setup");
-const app = globalSetup.app;
+const helpers = require("../global-setup");
+const path = require("path");
+const request = require("request");
 
-describe("Clock module", function () {
-	this.timeout(20000);
+const expect = require("chai").expect;
+
+const describe = global.describe;
+const it = global.it;
+const beforeEach = global.beforeEach;
+const afterEach = global.afterEach;
+
+describe("Clock module", function() {
+	helpers.setupTimeout(this);
+
+	var app = null;
+
+	beforeEach(function() {
+		return helpers
+			.startApplication({
+				args: ["js/electron.js"]
+			})
+			.then(function(startedApp) {
+				app = startedApp;
+			});
+	});
+
+	afterEach(function() {
+		return helpers.stopApplication(app);
+	});
 
 	describe("with default 24hr clock config", function() {
 		before(function() {
@@ -10,24 +34,14 @@ describe("Clock module", function () {
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/clock_24hr.js";
 		});
 
-		beforeEach(function (done) {
-			app.start().then(function() { done(); } );
-		});
-
-		afterEach(function (done) {
-			app.stop().then(function() { done(); });
-		});
-
-		it("shows date with correct format", function () {
+		it("shows date with correct format", function() {
 			const dateRegex = /^(?:Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday), (?:January|February|March|April|May|June|July|August|September|October|November|December) \d{1,2}, \d{4}$/;
-			return app.client.waitUntilWindowLoaded()
-				.getText(".clock .date").should.eventually.match(dateRegex);
+			return app.client.waitUntilWindowLoaded().getText(".clock .date").should.eventually.match(dateRegex);
 		});
 
 		it("shows time in 24hr format", function() {
-			const timeRegex = /^(?:2[0-3]|[01]\d):[0-5]\d[0-5]\d$/
-			return app.client.waitUntilWindowLoaded()
-				.getText(".clock .time").should.eventually.match(timeRegex);
+			const timeRegex = /^(?:2[0-3]|[01]\d):[0-5]\d[0-5]\d$/;
+			return app.client.waitUntilWindowLoaded().getText(".clock .time").should.eventually.match(timeRegex);
 		});
 	});
 
@@ -37,24 +51,14 @@ describe("Clock module", function () {
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/clock_12hr.js";
 		});
 
-		beforeEach(function (done) {
-			app.start().then(function() { done(); } );
-		});
-
-		afterEach(function (done) {
-			app.stop().then(function() { done(); });
-		});
-
-		it("shows date with correct format", function () {
+		it("shows date with correct format", function() {
 			const dateRegex = /^(?:Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday), (?:January|February|March|April|May|June|July|August|September|October|November|December) \d{1,2}, \d{4}$/;
-			return app.client.waitUntilWindowLoaded()
-				.getText(".clock .date").should.eventually.match(dateRegex);
+			return app.client.waitUntilWindowLoaded().getText(".clock .date").should.eventually.match(dateRegex);
 		});
 
 		it("shows time in 12hr format", function() {
 			const timeRegex = /^(?:1[0-2]|[1-9]):[0-5]\d[0-5]\d[ap]m$/;
-			return app.client.waitUntilWindowLoaded()
-				.getText(".clock .time").should.eventually.match(timeRegex);
+			return app.client.waitUntilWindowLoaded().getText(".clock .time").should.eventually.match(timeRegex);
 		});
 	});
 
@@ -64,18 +68,9 @@ describe("Clock module", function () {
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/clock_showPeriodUpper.js";
 		});
 
-		beforeEach(function (done) {
-			app.start().then(function() { done(); } );
-		});
-
-		afterEach(function (done) {
-			app.stop().then(function() { done(); });
-		});
-
 		it("shows 12hr time with upper case AM/PM", function() {
 			const timeRegex = /^(?:1[0-2]|[1-9]):[0-5]\d[0-5]\d[AP]M$/;
-			return app.client.waitUntilWindowLoaded()
-				.getText(".clock .time").should.eventually.match(timeRegex);
+			return app.client.waitUntilWindowLoaded().getText(".clock .time").should.eventually.match(timeRegex);
 		});
 	});
 
@@ -85,19 +80,29 @@ describe("Clock module", function () {
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/clock_displaySeconds_false.js";
 		});
 
-		beforeEach(function (done) {
-			app.start().then(function() { done(); } );
-		});
-
-		afterEach(function (done) {
-			app.stop().then(function() { done(); });
-		});
-
 		it("shows 12hr time without seconds am/pm", function() {
 			const timeRegex = /^(?:1[0-2]|[1-9]):[0-5]\d[ap]m$/;
-			return app.client.waitUntilWindowLoaded()
-				.getText(".clock .time").should.eventually.match(timeRegex);
+			return app.client.waitUntilWindowLoaded().getText(".clock .time").should.eventually.match(timeRegex);
 		});
 	});
 
+	describe("with showWeek config enabled", function() {
+		before(function() {
+			// Set config sample for use in test
+			process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/clock_showWeek.js";
+		});
+
+		it("shows week with correct format", function() {
+			const weekRegex = /^Week [0-9]{1,2}$/;
+			return app.client.waitUntilWindowLoaded().getText(".clock .week").should.eventually.match(weekRegex);
+		});
+
+		it("shows week with correct number of week of year", function() {
+			it("FIXME: if the day is a sunday this not match");
+			//	const currentWeekNumber = require("current-week-number")();
+			//	const weekToShow = "Week " + currentWeekNumber;
+			//	return app.client.waitUntilWindowLoaded()
+			//		.getText(".clock .week").should.eventually.equal(weekToShow);
+		});
+	});
 });

tests/e2e/modules/compliments_spec.js

@@ -1,77 +1,81 @@
-const globalSetup = require("../global-setup");
-const app = globalSetup.app;
-const chai = require("chai");
-const expect = chai.expect;
+const helpers = require("../global-setup");
+const path = require("path");
+const request = require("request");
 
-describe("Compliments module", function () {
-	this.timeout(20000);
+const expect = require("chai").expect;
 
+const describe = global.describe;
+const it = global.it;
+const beforeEach = global.beforeEach;
+const afterEach = global.afterEach;
 
-	beforeEach(function (done) {
-		app.start().then(function() { done(); } );
+describe("Compliments module", function() {
+	helpers.setupTimeout(this);
+
+	var app = null;
+
+	beforeEach(function() {
+		return helpers
+			.startApplication({
+				args: ["js/electron.js"]
+			})
+			.then(function(startedApp) {
+				app = startedApp;
+			});
 	});
 
-	afterEach(function (done) {
-		app.stop().then(function() { done(); });
+	afterEach(function() {
+		return helpers.stopApplication(app);
 	});
 
-
 	describe("parts of days", function() {
-
 		before(function() {
 			// Set config sample for use in test
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/compliments/compliments_parts_day.js";
 		});
 
-		it("if Morning compliments for that part of day", function () {
+		it("if Morning compliments for that part of day", function() {
 			var hour = new Date().getHours();
 			if (hour >= 3 && hour < 12) {
 				// if morning check
-				return app.client.waitUntilWindowLoaded()
-					.getText(".compliments").then(function (text) {
-						expect(text).to.be.oneOf(["Hi", "Good Morning", "Morning test"]);
-					})
+				return app.client.waitUntilWindowLoaded().getText(".compliments").then(function(text) {
+					expect(text).to.be.oneOf(["Hi", "Good Morning", "Morning test"]);
+				});
 			}
 		});
 
-		it("if Afternoon show Compliments for that part of day", function () {
+		it("if Afternoon show Compliments for that part of day", function() {
 			var hour = new Date().getHours();
 			if (hour >= 12 && hour < 17) {
 				// if morning check
-				return app.client.waitUntilWindowLoaded()
-					.getText(".compliments").then(function (text) {
-						expect(text).to.be.oneOf(["Hello", "Good Afternoon", "Afternoon test"]);
-					})
+				return app.client.waitUntilWindowLoaded().getText(".compliments").then(function(text) {
+					expect(text).to.be.oneOf(["Hello", "Good Afternoon", "Afternoon test"]);
+				});
 			}
 		});
 
-		it("if Evening show Compliments for that part of day", function () {
+		it("if Evening show Compliments for that part of day", function() {
 			var hour = new Date().getHours();
 			if (!(hour >= 3 && hour < 12) && !(hour >= 12 && hour < 17)) {
 				// if evening check
-				return app.client.waitUntilWindowLoaded()
-					.getText(".compliments").then(function (text) {
-						expect(text).to.be.oneOf(["Hello There", "Good Evening", "Evening test"]);
-					})
+				return app.client.waitUntilWindowLoaded().getText(".compliments").then(function(text) {
+					expect(text).to.be.oneOf(["Hello There", "Good Evening", "Evening test"]);
+				});
 			}
 		});
-
 	});
 
-
 	describe("Feature anytime in compliments module", function() {
-
 		describe("Set anytime and empty compliments for morning, evening and afternoon ", function() {
 			before(function() {
 				// Set config sample for use in test
 				process.env.MM_CONFIG_FILE = "tests/configs/modules/compliments/compliments_anytime.js";
 			});
 
-			it("Show anytime because if configure empty parts of day compliments and set anytime compliments", function () {
-				return app.client.waitUntilWindowLoaded()
-					.getText(".compliments").then(function (text) {
-						expect(text).to.be.oneOf(["Anytime here"]);
-					})
+			it("Show anytime because if configure empty parts of day compliments and set anytime compliments", function() {
+				return app.client.waitUntilWindowLoaded().getText(".compliments").then(function(text) {
+					expect(text).to.be.oneOf(["Anytime here"]);
+				});
 			});
 		});
 
@@ -81,15 +85,11 @@ describe("Compliments module", function () {
 				process.env.MM_CONFIG_FILE = "tests/configs/modules/compliments/compliments_only_anytime.js";
 			});
 
-			it("Show anytime compliments", function () {
-				return app.client.waitUntilWindowLoaded()
-					.getText(".compliments").then(function (text) {
-						expect(text).to.be.oneOf(["Anytime here"]);
-					})
+			it("Show anytime compliments", function() {
+				return app.client.waitUntilWindowLoaded().getText(".compliments").then(function(text) {
+					expect(text).to.be.oneOf(["Anytime here"]);
+				});
 			});
 		});
-
-
 	});
-
 });

tests/e2e/modules/helloworld_spec.js

@@ -1,16 +1,32 @@
-const globalSetup = require("../global-setup");
-const app = globalSetup.app;
+const helpers = require("../global-setup");
+const path = require("path");
+const request = require("request");
 
-describe("Test helloworld module", function () {
-	this.timeout(20000);
+const expect = require("chai").expect;
 
+const describe = global.describe;
+const it = global.it;
+const beforeEach = global.beforeEach;
+const afterEach = global.afterEach;
 
-	beforeEach(function (done) {
-		app.start().then(function() { done(); } );
+describe("Test helloworld module", function() {
+	helpers.setupTimeout(this);
+
+	var app = null;
+
+	beforeEach(function() {
+		return helpers
+			.startApplication({
+				args: ["js/electron.js"]
+			})
+			.then(function(startedApp) {
+				app = startedApp;
+			});
 	});
 
-	afterEach(function (done) {
-		app.stop().then(function() { done(); });
+
+	afterEach(function() {
+		return helpers.stopApplication(app);
 	});
 
 	describe("helloworld set config text", function () {

tests/e2e/modules/newsfeed_spec.js

@@ -0,0 +1,40 @@
+const helpers = require("../global-setup");
+const path = require("path");
+const request = require("request");
+
+const expect = require("chai").expect;
+
+const describe = global.describe;
+const it = global.it;
+const beforeEach = global.beforeEach;
+const afterEach = global.afterEach;
+
+describe("Newsfeed module", function() {
+	helpers.setupTimeout(this);
+
+	var app = null;
+
+	beforeEach(function() {
+		return helpers
+			.startApplication({
+				args: ["js/electron.js"]
+			})
+			.then(function(startedApp) {
+				app = startedApp;
+			});
+	});
+
+	afterEach(function() {
+		return helpers.stopApplication(app);
+	});
+
+	describe("Default configuration", function() {
+		before(function() {
+			process.env.MM_CONFIG_FILE = "tests/configs/modules/newsfeed/default.js";
+		});
+
+		it("show title newsfeed", function() {
+			return app.client.waitUntilTextExists(".newsfeed .small", "Rodrigo Ramirez Blog", 10000).should.be.fulfilled;
+		});
+	});
+});