From dab38d5a479842bec4cc0fc241c961b90e913f4e Mon Sep 17 00:00:00 2001
From: Adina Parpalita <Adina.Parpalita@ness.com>
Date: Fri, 10 Nov 2017 15:39:15 +0200
Subject: [PATCH] small refactoring of login / logout

---
 e2e/pages/login-page.ts                           | 15 ++++++++-------
 e2e/pages/logout-page.ts                          |  5 ++++-
 .../repo-client/apis/people/people-api.ts         |  2 +-
 e2e/utilities/utils.ts                            |  6 ++++++
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/e2e/pages/login-page.ts b/e2e/pages/login-page.ts
index d5ca2dc98..a5db319f6 100644
--- a/e2e/pages/login-page.ts
+++ b/e2e/pages/login-page.ts
@@ -18,6 +18,7 @@
 import { browser, ExpectedConditions as EC, promise } from 'protractor';
 import { LoginComponent } from '../components/components';
 import { Page } from './page';
+import { Utils } from '../utilities/utils';
 
 import {
     ADMIN_USERNAME,
@@ -38,17 +39,17 @@ export class LoginPage extends Page {
     load(): promise.Promise<any> {
         return super.load().then(() => {
             const { submitButton } = this.login;
-            const hasSumbitButton = EC.presenceOf(submitButton);
+            const hasSubmitButton = EC.presenceOf(submitButton);
 
-            return browser.wait(hasSumbitButton, BROWSER_WAIT_TIMEOUT)
-                .then(() => browser.executeScript('window.localStorage.clear();'))
-                .then(() => browser.executeScript('window.sessionStorage.clear();'))
-                .then(() => browser.driver.manage().deleteAllCookies());
+            return browser.wait(hasSubmitButton, BROWSER_WAIT_TIMEOUT)
+                .then(() => Utils.clearLocalStorage())
+                .then(() => browser.manage().deleteAllCookies());
         });
     }
 
-    loginWith(username: string, password: string): promise.Promise<void> {
-        return this.login.enterCredentials(username, password).submit();
+    loginWith(username: string, password?: string): promise.Promise<void> {
+        const pass = password || username;
+        return this.login.enterCredentials(username, pass).submit();
     }
 
     loginWithAdmin(): promise.Promise<any> {
diff --git a/e2e/pages/logout-page.ts b/e2e/pages/logout-page.ts
index 5a8f6082a..7f3ecd591 100644
--- a/e2e/pages/logout-page.ts
+++ b/e2e/pages/logout-page.ts
@@ -18,6 +18,7 @@
 import { promise } from 'protractor';
 import { Page } from './page';
 import { APP_ROUTES } from '../configs';
+import { Utils } from '../utilities/utils';
 
 export class LogoutPage extends Page {
     /** @override */
@@ -27,6 +28,8 @@ export class LogoutPage extends Page {
 
     /** @override */
     load(): promise.Promise<any> {
-        return super.load();
+        return super.load()
+            .then(() => Utils.clearLocalStorage())
+            .then(() => Utils.clearSessionStorage());
     }
 }
diff --git a/e2e/utilities/repo-client/apis/people/people-api.ts b/e2e/utilities/repo-client/apis/people/people-api.ts
index 8f05548a1..5b9a6ecec 100644
--- a/e2e/utilities/repo-client/apis/people/people-api.ts
+++ b/e2e/utilities/repo-client/apis/people/people-api.ts
@@ -35,7 +35,7 @@ export class PeopleApi extends RepoApi {
             .catch(this.handleError);
     }
 
-    createUser(username: string, password: string, details?: Person): Promise<any> {
+    createUser(username: string, password?: string, details?: Person): Promise<any> {
         const person: Person = new Person(username, password, details);
         const onSuccess = (response) => response;
         const onError = (response) => {
diff --git a/e2e/utilities/utils.ts b/e2e/utilities/utils.ts
index 0a6072f68..616adb672 100644
--- a/e2e/utilities/utils.ts
+++ b/e2e/utilities/utils.ts
@@ -27,4 +27,10 @@ export class Utils {
     static clearLocalStorage(): promise.Promise<any> {
         return browser.executeScript('window.localStorage.clear();');
     }
+
+    // session storage
+    static clearSessionStorage(): promise.Promise<any> {
+        return browser.executeScript('window.sessionStorage.clear();');
+    }
+
 }