inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-07-31 17:38:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACA-1628] async await (#693)

Browse Source 
* async / await on login component and utils

* more async / awaits

* remove fdescribe

* expect for exact totalItems in waitForApi methods
other async / awaits

* pagination tests

* more tries

* disable selenium promise manager

* try to fix shared-links tests

* re-enable selenium_promise_manager and some more fixes

* add target es2017 to e2e

* set target to es2017 on tsconfig.spec.json

* other tries

* forgotten console.log

* disable pagination tests

* some fixes for pagination

* temporary fix viewer actions tests

* fix some actions tests

* fix some tests for actions

* fix some tests for undo action

* try to fix some more tests

* fixes for toolbar actions

* fix NoSuchElementError for openMoreMenu

* fix NoSuchElementError for rightClickOnMultipleSelection

* fixes for mark as favourite

* more fixes

* more fixes

* change order of some expects

* forgot describe
This commit is contained in:
Adina Parpalita
2018-10-08 11:21:02 +03:00
committed by Denys Vuika
parent 0d4795bfa8
commit 7d73ae309c
53 changed files with 1553 additions and 1662 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
e2e/pages/page.ts
View File

@@ -28,7 +28,6 @@ import {
element,
by,
ElementFinder,
promise,
ExpectedConditions as EC
} from 'protractor';
import { BROWSER_WAIT_TIMEOUT, USE_HASH_STRATEGY } from './../configs';
@@ -62,14 +61,13 @@ export abstract class Page {
constructor(public url: string = '') {}
get title(): promise.Promise<string> {
getTitle() {
return browser.getTitle();
}
load(relativeUrl: string = ''): promise.Promise<void> {
load(relativeUrl: string = '') {
const hash = USE_HASH_STRATEGY ? '/#' : '';
const path = `${browser.baseUrl}${hash}${this.url}${relativeUrl}`;
return browser.get(path);
}
@@ -78,68 +76,58 @@ export abstract class Page {
}
waitForSnackBarToAppear() {
return browser.wait(
EC.visibilityOf(this.snackBarContainer),
BROWSER_WAIT_TIMEOUT
);
return browser.wait(EC.visibilityOf(this.snackBarContainer), BROWSER_WAIT_TIMEOUT);
}
waitForSnackBarToClose() {
return browser.wait(
EC.not(EC.visibilityOf(this.snackBarContainer)),
BROWSER_WAIT_TIMEOUT
);
async waitForSnackBarToClose() {
await browser.wait(EC.not(EC.visibilityOf(this.snackBarContainer)), BROWSER_WAIT_TIMEOUT);
}
waitForDialog() {
return browser.wait(
EC.visibilityOf(this.dialogContainer),
BROWSER_WAIT_TIMEOUT
);
async waitForDialog() {
await browser.wait(EC.visibilityOf(this.dialogContainer), BROWSER_WAIT_TIMEOUT);
}
waitForDialogToClose() {
return browser.wait(
EC.not(EC.visibilityOf(this.dialogContainer)),
BROWSER_WAIT_TIMEOUT
);
async waitForDialogToClose() {
await browser.wait(EC.not(EC.visibilityOf(this.dialogContainer)), BROWSER_WAIT_TIMEOUT);
}
refresh(): promise.Promise<void> {
return browser.refresh();
async refresh() {
await browser.refresh();
await this.waitForApp();
}
getDialogActionByLabel(label) {
return element(by.cssContainingText('.mat-button-wrapper', label));
}
isSnackBarDisplayed(): promise.Promise<boolean> {
return this.snackBar.isDisplayed();
async isSnackBarDisplayed() {
return await this.snackBar.isDisplayed();
}
getSnackBarMessage(): promise.Promise<string> {
return this.waitForSnackBarToAppear().then(() =>
this.snackBar.getAttribute('innerText')
);
async getSnackBarMessage() {
// await this.waitForSnackBarToAppear();
return await this.snackBar.getAttribute('innerText');
}
getSnackBarAction() {
return this.waitForSnackBarToAppear().then(() => this.snackBarAction);
async clickSnackBarAction() {
try {
// await this.waitForSnackBarToAppear();
// return browser.executeScript(function (elem) {
// elem.click();
// }, this.snackBarAction);
return await this.snackBarAction.click();
} catch (e) {
console.log(e, '.......failed on click snack bar action.........');
}
}
clickSnackBarAction() {
return this.waitForSnackBarToAppear().then(() => {
return browser.executeScript(function(elem) {
elem.click();
}, this.snackBarAction);
});
async isGenericErrorDisplayed() {
return await this.genericError.isDisplayed();
}
isGenericErrorDisplayed() {
return this.genericError.isDisplayed();
}
getGenericErrorTitle() {
return this.genericErrorTitle.getText();
async getGenericErrorTitle() {
return await this.genericErrorTitle.getText();
}
}