Introduce timeout argument to findTestSubject

This commit is contained in:
Felix Stürmer 2017-02-14 17:05:28 +01:00
parent 27ad2447a5
commit 60ab85a295
No known key found for this signature in database
GPG key ID: F938FEB4935329DA
2 changed files with 13 additions and 4 deletions

View file

@ -299,11 +299,20 @@ export default class Common {
return exists;
}
findTestSubject(selector) {
findTestSubject(selector, timeout = defaultFindTimeout) {
this.debug('in findTestSubject: ' + testSubjSelector(selector));
let originalFindTimeout = null;
return this.remote
.setFindTimeout(defaultFindTimeout)
.findDisplayedByCssSelector(testSubjSelector(selector));
.getFindTimeout()
.then((findTimeout) => originalFindTimeout = findTimeout)
.setFindTimeout(timeout)
.findDisplayedByCssSelector(testSubjSelector(selector))
.then(
(result) => this.remote.setFindTimeout(originalFindTimeout)
.finally(() => result),
(error) => this.remote.setFindTimeout(originalFindTimeout)
.finally(() => { throw error; }),
);
}
async findAllTestSubjects(selector) {

View file

@ -158,7 +158,7 @@ export default class HeaderPage {
}
isGlobalLoadingIndicatorVisible() {
return PageObjects.common.findTestSubject('globalLoadingIndicator');
return PageObjects.common.findTestSubject('globalLoadingIndicator', defaultFindTimeout / 5);
}
isGlobalLoadingIndicatorHidden() {