From c84aa8903222da370aa794d66f03dde0d51dec86 Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Sat, 15 Dec 2018 15:37:13 -0200
Subject: [PATCH] Fix e2e tests

---
 .gitignore           | 1 -
 package.json         | 2 +-
 src/e2e/app.e2e.js   | 2 +-
 src/e2e/utils.js     | 4 ++--
 tasks/build-tests.js | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index f2b92e282..0eabe01a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 .DS_Store
 Thumbs.db
 *.log
-*.autogenerated
 
 /node_modules
 /package-lock.json
diff --git a/package.json b/package.json
index 633016da3..b485099a9 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "coverage-renderer": "electron-mocha --require source-map-support/register --reporter scripts/istanbul-reporter app/renderer.specs.js",
     "coverage": "npm-run-all coverage-main coverage-renderer",
     "pree2e": "gulp build-e2e-tests --env=test",
-    "e2e": "mocha app/e2e.js.autogenerated --require source-map-support/register"
+    "e2e": "mocha --require source-map-support/register app/e2e.js"
   },
   "dependencies": {
     "@paulcbetts/system-idle-time": "^1.0.4",
diff --git a/src/e2e/app.e2e.js b/src/e2e/app.e2e.js
index dd7abc8d1..e926629a2 100644
--- a/src/e2e/app.e2e.js
+++ b/src/e2e/app.e2e.js
@@ -8,7 +8,7 @@ describe('application', function() {
 	after(stopApp);
 
 	it('shows the main window', async function() {
+		expect(await app.browserWindow.getTitle()).to.be.equals(appManifest.productName);
 		expect(await app.browserWindow.isVisible()).to.be.true;
-		expect(await app.browserWindow.getTitle()).to.be.equal(appManifest.productName);
 	});
 });
diff --git a/src/e2e/utils.js b/src/e2e/utils.js
index 60b40d410..2dccedfe9 100644
--- a/src/e2e/utils.js
+++ b/src/e2e/utils.js
@@ -1,4 +1,3 @@
-import path from 'path';
 import electron from 'electron';
 import { Application } from 'spectron';
 
@@ -16,7 +15,7 @@ export async function startApp() {
 	app = new Application({
 		path: electron,
 		cwd: process.cwd(),
-		args: [path.join(__dirname, '..')],
+		args: [process.cwd()],
 		quitTimeout: 5000,
 		startTimeout: 5000,
 		waitTimeout: 5000,
@@ -24,6 +23,7 @@ export async function startApp() {
 
 	await app.start();
 	await app.client.waitUntilWindowLoaded();
+	await app.client.windowByIndex(1);
 
 	logFetchInterval = setInterval(fetchLogs, 100);
 }
diff --git a/tasks/build-tests.js b/tasks/build-tests.js
index fc87d51be..52366477f 100644
--- a/tasks/build-tests.js
+++ b/tasks/build-tests.js
@@ -13,5 +13,5 @@ gulp.task('build-coverage-tests', ['build-app'], async() => {
 });
 
 gulp.task('build-e2e-tests', ['build-app'], async() => {
-	await bundle.many('src', '*.e2e.js', 'app/e2e.js.autogenerated');
+	await bundle.many('src', '*.e2e.js', 'app/e2e.js');
 });
-- 
GitLab