From 8569e3b772a3bcf6ea7cbbb18f6e8ab450a4cab3 Mon Sep 17 00:00:00 2001
From: Jari Kolehmainen <jari.kolehmainen@gmail.com>
Date: Fri, 26 Jun 2020 14:10:30 +0300
Subject: [PATCH] integration fixes

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
---
 .eslintrc.js                  | 2 +-
 Makefile                      | 4 ----
 integration/helpers/utils.ts  | 2 +-
 integration/specs/app_spec.ts | 1 +
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index efc6865e95..43adca25e5 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -29,7 +29,7 @@ module.exports =  {
       files: [
         "build/*.ts",
         "src/**/*.ts",
-        "spec/**/*.ts"
+        "integration/**/*.ts"
       ],
       parser: "@typescript-eslint/parser",
       extends:  [
diff --git a/Makefile b/Makefile
index ffdbb5bd71..c42bdd9632 100644
--- a/Makefile
+++ b/Makefile
@@ -34,10 +34,6 @@ integration-win:
 	yarn build:win
 	yarn integration
 
-lint:
-	yarn lint
-	yarn lint-dashboard
-
 test-app:
 	yarn test
 
diff --git a/integration/helpers/utils.ts b/integration/helpers/utils.ts
index 33aeda65c0..3e3fc60add 100644
--- a/integration/helpers/utils.ts
+++ b/integration/helpers/utils.ts
@@ -13,7 +13,7 @@ case "darwin":
   break
 }
 
-export function setup() {
+export function setup(): Application {
   return new Application({
     // path to electron app
     args: [],
diff --git a/integration/specs/app_spec.ts b/integration/specs/app_spec.ts
index 4b52f3b115..96604df7fc 100644
--- a/integration/specs/app_spec.ts
+++ b/integration/specs/app_spec.ts
@@ -36,6 +36,7 @@ describe("app start", () => {
   beforeEach(async () => {
     app = util.setup()
     await app.start()
+    await app.client.waitUntilWindowLoaded()
     const windowCount = await app.client.getWindowCount()
     await app.client.windowByIndex(windowCount - 1)
     await app.client.waitUntilWindowLoaded()