From 2e124fdc20a3f3123d849f9804b7c994328109a4 Mon Sep 17 00:00:00 2001
From: cristinaj <Cristina.Jalba@ness.com>
Date: Tue, 2 Oct 2018 14:26:41 +0300
Subject: [PATCH] [ADF-3638]Fixing Header tests (#3846)

* Fixing Header tests

* Fix task filters tests
---
 e2e/core/header_component.e2e.ts                  | 15 ++++++++-------
 e2e/pages/adf/core/headerPage.ts                  |  1 +
 e2e/pages/adf/navigationBarPage.js                |  1 +
 .../task_filters_component.e2e.ts                 |  2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/e2e/core/header_component.e2e.ts b/e2e/core/header_component.e2e.ts
index 6bf4ebc124..d69c7d8a52 100644
--- a/e2e/core/header_component.e2e.ts
+++ b/e2e/core/header_component.e2e.ts
@@ -53,10 +53,6 @@ describe('Header Component', () => {
             hostBpm: TestConfig.adf.url
         });
 
-        done();
-    });
-
-    beforeEach(async(done) => {
         let users = new UsersActions();
 
         await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
@@ -67,14 +63,19 @@ describe('Header Component', () => {
 
         await this.alfrescoJsApi.login(user.email, user.password);
 
-        await loginPage.loginToProcessServicesUsingUserModel(user);
+        done();
+    });
 
-        await navigationBarPage.clickHeaderDataButton();
+    beforeEach(async(done) => {
+
+        loginPage.loginToProcessServicesUsingUserModel(user);
+
+        navigationBarPage.clickHeaderDataButton();
 
         done();
     });
 
-    afterEach(async(done) => {
+    afterAll(async(done) => {
         await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
 
         await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(tenantId);
diff --git a/e2e/pages/adf/core/headerPage.ts b/e2e/pages/adf/core/headerPage.ts
index 0c9400bcb5..039ebd1888 100644
--- a/e2e/pages/adf/core/headerPage.ts
+++ b/e2e/pages/adf/core/headerPage.ts
@@ -103,6 +103,7 @@ export class HeaderPage {
 
     addLogoHyperlink(hyperlink) {
         Util.waitUntilElementIsVisible(this.logoHyperlinkInput);
+        Util.waitUntilElementIsClickable(this.logoHyperlinkInput);
         return this.logoHyperlinkInput.click().sendKeys(hyperlink).sendKeys(protractor.Key.ENTER);
     }
 
diff --git a/e2e/pages/adf/navigationBarPage.js b/e2e/pages/adf/navigationBarPage.js
index 97bf8654e3..7bfa46ca7c 100644
--- a/e2e/pages/adf/navigationBarPage.js
+++ b/e2e/pages/adf/navigationBarPage.js
@@ -134,6 +134,7 @@ var NavigationBarPage = function () {
 
     this.clickHeaderDataButton = function () {
         Util.waitUntilElementIsVisible(headerDataButton);
+        Util.waitUntilElementIsClickable(headerDataButton);
         return headerDataButton.click();
     };
 
diff --git a/e2e/process-services/task_filters_component.e2e.ts b/e2e/process-services/task_filters_component.e2e.ts
index 137a454d29..6f2bcbe129 100644
--- a/e2e/process-services/task_filters_component.e2e.ts
+++ b/e2e/process-services/task_filters_component.e2e.ts
@@ -75,7 +75,7 @@ describe('Task', () => {
 
             appId = appModel.id;
 
-            await loginPage.loginToProcessServicesUsingUserModel(user);
+            loginPage.loginToProcessServicesUsingUserModel(user);
 
             navigationBarPage.clickProcessServicesButton();