From b62794e38525f2f1c0adf90a55a25657983887a5 Mon Sep 17 00:00:00 2001
From: Eugenio Romano <eugenio.romano@alfresco.com>
Date: Mon, 22 Jun 2020 13:22:34 +0100
Subject: [PATCH] remove global configuration and add timeout configuration

---
 e2e/test.config.js                                   | 7 ++++++-
 lib/testing/src/lib/core/utils/browser-visibility.ts | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/e2e/test.config.js b/e2e/test.config.js
index 2f59585481..93fc57286b 100644
--- a/e2e/test.config.js
+++ b/e2e/test.config.js
@@ -35,7 +35,7 @@ const SCREENSHOT_PASSWORD = process.env.SCREENSHOT_PASSWORD || process.env.PASSW
 const SCREENSHOT_USERNAME = process.env.SCREENSHOT_USERNAME || process.env.USERNAME_ADF;
 
 const EXTERNAL_ACS_HOST = process.env.EXTERNAL_ACS_HOST;
-const LOG_LEVEL = process.env.LOG_LEVEL || 'ERROR' ;
+const LOG_LEVEL = process.env.LOG_LEVEL || 'ERROR';
 
 const appConfig = {
     "log": LOG_LEVEL,
@@ -117,4 +117,9 @@ module.exports = {
         host: EXTERNAL_ACS_HOST,
     },
 
+    timeouts: {
+        visible_timeout: 20000,
+        no_visible_timeout: 20000
+    }
+
 };
diff --git a/lib/testing/src/lib/core/utils/browser-visibility.ts b/lib/testing/src/lib/core/utils/browser-visibility.ts
index 0c1a468dbb..2a96e396a8 100644
--- a/lib/testing/src/lib/core/utils/browser-visibility.ts
+++ b/lib/testing/src/lib/core/utils/browser-visibility.ts
@@ -18,8 +18,8 @@
 import { browser, by, element, ElementFinder, protractor } from 'protractor';
 import { Logger } from './logger';
 
-const DEFAULT_TIMEOUT = global['TestConfig'] ? global['TestConfig'].main.timeout : 20000;
-const NOT_VISIBLE_DEFAULT_TIMEOUT = global['TestConfig'] ? global['TestConfig'].main.timeout : 2000;
+const DEFAULT_TIMEOUT = browser.testConfig.timeouts.visible_timeout ? browser.testConfig.timeouts.visible_timeout : 20000;
+const NOT_VISIBLE_DEFAULT_TIMEOUT = browser.testConfig.timeouts.no_visible_timeout ? browser.testConfig.timeouts.no_visible_timeout : 20000;
 
 export class BrowserVisibility {