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

Test improve (#6146)

Browse Source 
* fix

* fix datatable wait method

* slow down isEmpty check

* fix

* fix

* fix
This commit is contained in:
Eugenio Romano
2020-09-23 13:32:27 +01:00
committed by GitHub
parent 98742e898e
commit 3f1a9f4853
12 changed files with 89 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
lib/testing/src/lib/core/pages/data-table-component.page.ts
View File

@@ -257,15 +257,32 @@ export class DataTableComponentPage {
}
}
async checkContentIsDisplayed(columnName: string, columnValue: string): Promise<void> {
Logger.log(`Wait content is displayed ${columnName} ${columnValue}`);
async checkContentIsDisplayed(columnName: string, columnValue: string, retry = 0): Promise<void> {
Logger.log(`Wait content is displayed ${columnName} ${columnValue} retry: ${retry}`);
const row = this.getCellElementByValue(columnName, columnValue);
await BrowserVisibility.waitUntilElementIsVisible(row);
try {
await BrowserVisibility.waitUntilElementIsVisible(row);
} catch (error) {
if (retry < 3) {
retry++;
await this.checkContentIsDisplayed(columnName, columnValue, retry);
}
}
}
async checkContentIsNotDisplayed(columnName: string, columnValue: string): Promise<void> {
async checkContentIsNotDisplayed(columnName: string, columnValue: string, retry = 0): Promise<void> {
Logger.log(`Wait content is displayed ${columnName} ${columnValue} retry: ${retry}`);
const row = this.getCellElementByValue(columnName, columnValue);
await BrowserVisibility.waitUntilElementIsNotVisible(row);
try {
await BrowserVisibility.waitUntilElementIsNotVisible(row);
} catch (error) {
if (retry < 3) {
retry++;
await this.checkContentIsNotDisplayed(columnName, columnValue, retry);
}
}
}
getRow(columnName: string, columnValue: string): ElementFinder {
@@ -292,11 +309,11 @@ export class DataTableComponentPage {
async waitTillContentLoaded(): Promise<void> {
await browser.sleep(500);
if (this.isSpinnerPresent()) {
if (await this.isSpinnerPresent()) {
Logger.log('wait datatable loading spinner disappear');
await BrowserVisibility.waitUntilElementIsNotVisible(element(by.tagName('mat-spinner')));
if (this.isEmpty()) {
if (await this.isEmpty()) {
Logger.log('empty page');
} else {
await this.waitFirstElementPresent();
@@ -304,10 +321,11 @@ export class DataTableComponentPage {
} else {
try {
Logger.log('wait datatable loading spinner is present');
await BrowserVisibility.waitUntilElementIsVisible(element(by.tagName('mat-spinner')));
await BrowserVisibility.waitUntilElementIsVisible(element(by.tagName('mat-spinner')), 2000);
} catch (error) {
}
if (this.isEmpty()) {
if (await this.isEmpty()) {
Logger.log('empty page');
} else {
await this.waitFirstElementPresent();
@@ -327,6 +345,18 @@ export class DataTableComponentPage {
return isSpinnerPresent;
}
private async isInfiniteSpinnerPresent(): Promise<boolean> {
let isSpinnerPresent;
try {
isSpinnerPresent = await element(by.tagName('mat-progress-bar')).isDisplayed();
} catch (error) {
isSpinnerPresent = false;
}
return isSpinnerPresent;
}
private async waitFirstElementPresent(): Promise<void> {
try {
Logger.log('wait first element is present');
@@ -339,11 +369,11 @@ export class DataTableComponentPage {
async waitTillContentLoadedInfinitePagination(): Promise<void> {
await browser.sleep(500);
if (this.isSpinnerPresent()) {
if (await this.isInfiniteSpinnerPresent()) {
Logger.log('wait datatable loading spinner disappear');
await BrowserVisibility.waitUntilElementIsNotVisible(element(by.tagName('mat-progress-bar')));
if (this.isEmpty()) {
if (await this.isEmpty()) {
Logger.log('empty page');
} else {
await this.waitFirstElementPresent();
@@ -351,15 +381,16 @@ export class DataTableComponentPage {
} else {
try {
Logger.log('wait datatable loading spinner is present');
await BrowserVisibility.waitUntilElementIsVisible(element(by.tagName('mat-progress-bar')));
await BrowserVisibility.waitUntilElementIsVisible(element(by.tagName('mat-progress-bar')), 2000);
} catch (error) {
}
if (this.isEmpty()) {
if (await this.isEmpty()) {
Logger.log('empty page');
} else {
await this.waitFirstElementPresent();
}
} }
}
}
async checkColumnIsDisplayed(column: string): Promise<void> {
await BrowserVisibility.waitUntilElementIsVisible(element(by.css(`div[data-automation-id="auto_id_entry.${column}"]`)));
@@ -478,6 +509,8 @@ export class DataTableComponentPage {
}
async isEmpty(): Promise<boolean> {
await browser.sleep(500);
let isDisplayed;
try {
@@ -485,6 +518,9 @@ export class DataTableComponentPage {
} catch (error) {
isDisplayed = false;
}
Logger.log(`empty page isDisplayed ${isDisplayed}`);
return isDisplayed;
}

3
lib/testing/src/lib/core/pages/login.page.ts
View File

@@ -57,8 +57,9 @@ export class LoginPage {
Logger.log('Login With ' + username);
const authType = await LocalStorageUtil.getConfigField('authType');
const oauth: any = await LocalStorageUtil.getConfigField('oauth2');
if (!authType || authType === 'OAUTH') {
if ((!authType || authType === 'OAUTH') && oauth.implicitFlow) {
await this.loginSSOIdentityService(username, password);
} else {
await this.loginBasicAuth(username, password);

8
lib/testing/src/lib/core/pages/snackbar.page.ts
View File

@@ -25,14 +25,14 @@ export class SnackbarPage {
snackBarAction = element(by.css('simple-snack-bar button span'));
snackBarContainerCss: Locator = by.css('.mat-snack-bar-container');
async waitForSnackBarToAppear() {
return BrowserVisibility.waitUntilElementIsVisible(element.all(this.snackBarContainerCss).first(), 5000,
async waitForSnackBarToAppear(timeout = 5000) {
return BrowserVisibility.waitUntilElementIsVisible(element.all(this.snackBarContainerCss).first(), timeout,
'snackbar did not appear'
);
}
async waitForSnackBarToClose() {
return BrowserVisibility.waitUntilElementIsNotVisible(element.all(this.snackBarContainerCss).first(), 5000);
async waitForSnackBarToClose(timeout = 5000) {
return BrowserVisibility.waitUntilElementIsNotVisible(element.all(this.snackBarContainerCss).first(), timeout);
}
async getSnackBarMessage(): Promise<string> {

2
lib/testing/src/lib/process-services-cloud/pages/edit-task-filter-cloud-component.page.ts
View File

@@ -191,7 +191,7 @@ export class EditTaskFilterCloudComponentPage {
async clearAssignee(): Promise<void> {
await BrowserActions.clearWithBackSpace(this.assignee, 250);
await browser.driver.sleep(1000);
await this.dataTable.waitTillContentLoaded();
}
async clearField(locator: ElementFinder): Promise<void> {