inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove global configuration and add timeout configuration

Browse Source
This commit is contained in:
Eugenio Romano
2020-06-22 13:22:34 +01:00
parent af70e22cd9
commit b62794e385
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
e2e/test.config.js
View File

@@ -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
}
};

4
lib/testing/src/lib/core/utils/browser-visibility.ts
View File

@@ -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 {