From 2ac59bd278f00c9fdc46f2009d3c3ddd63eaf02a Mon Sep 17 00:00:00 2001
From: Adina Parpalita <adina.parpalita@ness.com>
Date: Wed, 14 Nov 2018 17:23:33 +0200
Subject: [PATCH] [ACA] fix e2e tests failing on slow environments (#801)

* fix tests failing on slow environments

* forgot a change
---
 e2e/components/dialog/create-edit-folder-dialog.ts | 2 +-
 e2e/components/search/search-input.ts              | 8 +++-----
 e2e/suites/application/general.test.ts             | 6 ++++++
 e2e/suites/application/page-titles.test.ts         | 2 +-
 e2e/suites/pagination/pag-file-libraries.test.ts   | 8 ++++----
 e2e/suites/search/search-input.test.ts             | 4 ++--
 6 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/e2e/components/dialog/create-edit-folder-dialog.ts b/e2e/components/dialog/create-edit-folder-dialog.ts
index c07b39a49..d3d4cd5ec 100755
--- a/e2e/components/dialog/create-edit-folder-dialog.ts
+++ b/e2e/components/dialog/create-edit-folder-dialog.ts
@@ -57,7 +57,7 @@ export class CreateOrEditFolderDialog extends Component {
   }
 
   async waitForDialogToClose() {
-    await browser.wait(EC.stalenessOf(this.title), BROWSER_WAIT_TIMEOUT);
+    await browser.wait(EC.stalenessOf(this.title), BROWSER_WAIT_TIMEOUT, '---- timeout waiting for dialog to close ----');
   }
 
   async isDialogOpen() {
diff --git a/e2e/components/search/search-input.ts b/e2e/components/search/search-input.ts
index 121a640e1..dbead9704 100755
--- a/e2e/components/search/search-input.ts
+++ b/e2e/components/search/search-input.ts
@@ -38,7 +38,7 @@ export class SearchInput extends Component {
     optionCheckbox: '.mat-checkbox'
   };
 
-  searchButton: ElementFinder = browser.element(by.css(SearchInput.selectors.searchButton));
+  searchButton: ElementFinder = this.component.element(by.css(SearchInput.selectors.searchButton));
   searchContainer: ElementFinder = browser.element(by.css(SearchInput.selectors.searchContainer));
   searchBar: ElementFinder = browser.element(by.id(SearchInput.selectors.searchInput));
   searchOptionsArea: ElementFinder = browser.element(by.id(SearchInput.selectors.searchOptionsArea));
@@ -54,8 +54,8 @@ export class SearchInput extends Component {
     return (await this.searchContainer.isDisplayed()) && (await this.searchButton.isDisplayed());
   }
 
-  async clickSearchContainer() {
-    return await this.searchContainer.click();
+  async clickSearchButton() {
+    await this.searchButton.click();
   }
 
   async isOptionsAreaDisplayed() {
@@ -105,8 +105,6 @@ export class SearchInput extends Component {
     return optClass.includes('mat-checkbox-checked');
   }
 
-
-
   async searchForText(text: string) {
     await this.searchBar.clear();
     await this.searchBar.sendKeys(text);
diff --git a/e2e/suites/application/general.test.ts b/e2e/suites/application/general.test.ts
index e9063fe07..f1ffc6c76 100644
--- a/e2e/suites/application/general.test.ts
+++ b/e2e/suites/application/general.test.ts
@@ -65,6 +65,12 @@ describe('General', () => {
       expect(message).toEqual('The action was unsuccessful. Try again or contact your IT Team.');
 
       expect(await browser.getTitle()).toContain('Sign in');
+
+      try {
+        await createDialog.waitForDialogToClose();
+      } catch (error) {
+        console.log('err: ', error);
+      }
       expect(await createDialog.isDialogOpen()).not.toBe(true, 'dialog is present');
     });
   });
diff --git a/e2e/suites/application/page-titles.test.ts b/e2e/suites/application/page-titles.test.ts
index 3caee7a3c..6631214c8 100755
--- a/e2e/suites/application/page-titles.test.ts
+++ b/e2e/suites/application/page-titles.test.ts
@@ -125,7 +125,7 @@ describe('Page titles', () => {
     });
 
     it('Search Results page - [C280413]', async () => {
-      await searchInput.clickSearchContainer();
+      await searchInput.clickSearchButton();
       await searchInput.searchForText(file);
       expect(await browser.getTitle()).toContain(PAGE_TITLES.SEARCH);
     });
diff --git a/e2e/suites/pagination/pag-file-libraries.test.ts b/e2e/suites/pagination/pag-file-libraries.test.ts
index 37c969e3c..014633014 100755
--- a/e2e/suites/pagination/pag-file-libraries.test.ts
+++ b/e2e/suites/pagination/pag-file-libraries.test.ts
@@ -52,13 +52,13 @@ describe('Pagination on multiple pages on File Libraries', () => {
   });
 
   beforeEach(async (done) => {
-      await page.clickFileLibrariesAndWait();
-      done();
+    await page.clickFileLibrariesAndWait();
+    done();
   });
 
   afterEach(async (done) => {
-      await Utils.pressEscape();
-      done();
+    await Utils.pressEscape();
+    done();
   });
 
   afterAll(async (done) => {
diff --git a/e2e/suites/search/search-input.test.ts b/e2e/suites/search/search-input.test.ts
index ac1c497ad..3dfb6e064 100644
--- a/e2e/suites/search/search-input.test.ts
+++ b/e2e/suites/search/search-input.test.ts
@@ -48,7 +48,7 @@ describe('Search input', () => {
   });
 
   it('Search options are displayed when clicking in the search input - [C289848]', async () => {
-    await searchInput.clickSearchContainer();
+    await searchInput.clickSearchButton();
     expect(await searchInput.isOptionsAreaDisplayed()).toBe(true, '1. Search options not displayed');
     expect(await searchInput.isFilesOptionEnabled()).toBe(true, '2. Files option not enabled');
     expect(await searchInput.isFoldersOptionEnabled()).toBe(true, '3. Folders option not enabled');
@@ -59,7 +59,7 @@ describe('Search input', () => {
   });
 
   it('Search options are correctly enabled / disabled - [C289849]', async () => {
-    await searchInput.clickSearchContainer();
+    await searchInput.clickSearchButton();
 
     await searchInput.clickFilesOption();
     expect(await searchInput.isFoldersOptionEnabled()).toBe(true, 'Folders option not enabled');