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

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 () {