From c2e7ea799e527b76850a30f405e6e4b1fbd65b37 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Sun, 18 Jul 2021 14:21:56 +0100
Subject: [PATCH] Improve login

---
 src/app/pages/login/login.page.ts | 12 +++++++-----
 test/login.spec.ts                | 13 +++++++++++++
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index f1258b0cf..683758ed3 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -26,7 +26,6 @@ export class LoginPage implements OnInit {
   hasSession = false
   setPin = false
 
-
   constructor(
     private notificatinsservice: NotificationsService,
     private router: Router,
@@ -208,10 +207,13 @@ export class LoginPage implements OnInit {
 
     localStorage.setItem('PIN', encrypted)
 
-
-    // this.router.navigate(['/home/events']);
-    window.location.pathname = '/home/events'
-
+    // 
+    if(window['cy']) {
+      this.router.navigate(['/home/events']);
+    } else {
+      window.location.pathname = '/home/events'
+    }
+    
   }
 
 }
\ No newline at end of file
diff --git a/test/login.spec.ts b/test/login.spec.ts
index cbd2a856c..941388008 100644
--- a/test/login.spec.ts
+++ b/test/login.spec.ts
@@ -1,6 +1,16 @@
 import { environment }  from './../src/environments/environment'
 
 
+const windowSet = (page, name, value) => {
+    page.evaluateOnNewDocument(`
+    Object.defineProperty(window, '${name}', {
+      get() {
+        return '${value}'
+      }
+    })
+  `)
+}
+
 export const loginTest = async (page) => {
     await page.setViewport({width: 1200, height: 720});
     await page.goto(process.env.PUPPETEER_HOST); // wait until page load
@@ -21,6 +31,9 @@ export const loginTest = async (page) => {
         await page.type('input[type="text"]', environment.defaultuser);
         await page.type('input[type="password"]', environment.defaultuserpwd); 
         // click and wait for navigation
+
+		windowSet(page, 'cy', true)
+		
         await Promise.all([
             page.click('.btn-ok'),
             // page.waitForNavigation({ waitUntil: 'networkidle0' }),