inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2026-09-09 18:02:54 +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 09:21:02 +01: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
e2e/pages/browsing-page.ts
+9 -9
View File
@@ -28,14 +28,14 @@ import { Header, DataTable, Pagination, Toolbar, Breadcrumb, Sidenav } from '../
import { Page } from './page';
export class BrowsingPage extends Page {
header = new Header(this.app);
sidenav = new Sidenav(this.app);
toolbar = new Toolbar(this.app);
breadcrumb = new Breadcrumb(this.app);
dataTable = new DataTable(this.app);
pagination = new Pagination(this.app);
header = new Header(this.app);
sidenav = new Sidenav(this.app);
toolbar = new Toolbar(this.app);
breadcrumb = new Breadcrumb(this.app);
dataTable = new DataTable(this.app);
pagination = new Pagination(this.app);
signOut(): promise.Promise<void> {
return this.header.userInfo.signOut();
}
async signOut() {
await this.header.userInfo.signOut();
}
}
e2e/pages/login-page.ts
+32 -39
View File
@@ -22,54 +22,47 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
import { browser, ExpectedConditions as EC, promise } from 'protractor';
import { browser, ExpectedConditions as EC } from 'protractor';
import { LoginComponent } from '../components/components';
import { Page } from './page';
import { Utils } from '../utilities/utils';
import {
ADMIN_USERNAME,
ADMIN_PASSWORD,
BROWSER_WAIT_TIMEOUT,
APP_ROUTES
} from '../configs';
import { ADMIN_USERNAME, ADMIN_PASSWORD, BROWSER_WAIT_TIMEOUT, APP_ROUTES } from '../configs';
export class LoginPage extends Page {
login: LoginComponent = new LoginComponent(this.app);
login: LoginComponent = new LoginComponent(this.app);
/** @override */
constructor() {
super(APP_ROUTES.LOGIN);
}
/** @override */
constructor() {
super(APP_ROUTES.LOGIN);
}
/** @override */
load(): promise.Promise<any> {
return super.load().then(() => {
const { submitButton } = this.login;
const hasSubmitButton = EC.presenceOf(submitButton);
/** @override */
async load() {
await super.load();
const { submitButton } = this.login;
const hasSubmitButton = EC.presenceOf(submitButton);
return browser.wait(hasSubmitButton, BROWSER_WAIT_TIMEOUT);
}
return browser.wait(hasSubmitButton, BROWSER_WAIT_TIMEOUT)
.then(() => Utils.clearLocalStorage())
.then(() => browser.manage().deleteAllCookies());
});
}
async loginWith(username: string, password?: string) {
const pass = password || username;
await this.load();
await this.login.enterCredentials(username, pass)
await this.login.submit();
return super.waitForApp();
}
loginWith(username: string, password?: string): promise.Promise<any> {
const pass = password || username;
return this.load()
.then(() => this.login.enterCredentials(username, pass).submit())
.then(() => super.waitForApp());
}
async loginWithAdmin() {
await this.load();
return this.loginWith(ADMIN_USERNAME, ADMIN_PASSWORD);
}
loginWithAdmin(): promise.Promise<any> {
return this.load()
.then(() => this.loginWith(ADMIN_USERNAME, ADMIN_PASSWORD));
}
tryLoginWith(username: string, password?: string): promise.Promise<void> {
const pass = password || username;
return this.load()
.then(() => this.login.enterCredentials(username, pass).submit())
.then(() => browser.wait(EC.presenceOf(this.login.errorMessage), BROWSER_WAIT_TIMEOUT));
}
async tryLoginWith(username: string, password?: string) {
const pass = password || username;
await this.load();
await this.login.enterCredentials(username, pass);
await this.login.submit();
return browser.wait(EC.presenceOf(this.login.errorMessage), BROWSER_WAIT_TIMEOUT);
}
}
e2e/pages/logout-page.ts
+10 -11
View File
@@ -23,21 +23,20 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
import { promise } from 'protractor';
import { Page } from './page';
import { APP_ROUTES } from '../configs';
import { Utils } from '../utilities/utils';
export class LogoutPage extends Page {
/** @override */
constructor() {
super(APP_ROUTES.LOGIN);
}
/** @override */
constructor() {
super(APP_ROUTES.LOGIN);
}
/** @override */
load(): promise.Promise<any> {
return Utils.clearLocalStorage()
.then(() => Utils.clearSessionStorage())
.then(() => super.load());
}
/** @override */
load() {
// await Utils.clearLocalStorage();
// await Utils.clearSessionStorage();
return super.load();
}
}
e2e/pages/page.ts
+33 -45
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();
}
}