mirror of
https://github.com/Alfresco/alfresco-content-app.git
synced 2025-08-07 17:48:27 +00:00
Optimize e2e framework (#1428)
* reduce breadcrumb page * imrpove readability of code * reduce data-table page size * reduce datetime-picker code * fix datatable page * header and info drawer * update datatable page * toolbar cleanup * more test components cleanup * even move component cleanup * move wait utils to the Utils * unified waits * cleanup menu page * code fixes * fix code * code improvements * rename api * fix code * fix code * cleanup dialog pages * more fixes and dead code removal * code fixes * try to fix the flaky teset * fix code * fix code * update code * fix lint * unified text input * fix lint * add missing await * reduce the wrapper method around clear text * resolve element value Co-authored-by: Cilibiu Bogdan <bogdan.cilibiu@ness.com>
This commit is contained in:
@@ -25,20 +25,17 @@
|
||||
|
||||
import { by } from 'protractor';
|
||||
import { GenericDialog } from '../dialog/generic-dialog';
|
||||
import { isPresentAndEnabled } from '../../utilities/utils';
|
||||
|
||||
export class ConfirmDialog extends GenericDialog {
|
||||
private static selectors = {
|
||||
root: 'adf-confirm-dialog',
|
||||
|
||||
okButton: by.buttonText('OK'),
|
||||
cancelButton: by.buttonText('Cancel'),
|
||||
keepButton: by.buttonText('Keep'),
|
||||
deleteButton: by.buttonText('Delete'),
|
||||
removeButton: by.buttonText('Remove')
|
||||
}
|
||||
okButton = this.childElement(by.buttonText('OK'));
|
||||
cancelButton = this.childElement(by.buttonText('Cancel'));
|
||||
keepButton = this.childElement(by.buttonText('Keep'));
|
||||
deleteButton = this.childElement(by.buttonText('Delete'));
|
||||
removeButton = this.childElement(by.buttonText('Remove'));
|
||||
|
||||
constructor() {
|
||||
super(ConfirmDialog.selectors.root);
|
||||
super('adf-confirm-dialog');
|
||||
}
|
||||
|
||||
async getText(): Promise<string> {
|
||||
@@ -46,43 +43,22 @@ export class ConfirmDialog extends GenericDialog {
|
||||
}
|
||||
|
||||
async isOkEnabled(): Promise<boolean> {
|
||||
return this.isButtonEnabled(ConfirmDialog.selectors.okButton);
|
||||
return isPresentAndEnabled(this.okButton);
|
||||
}
|
||||
|
||||
async isCancelEnabled(): Promise<boolean> {
|
||||
return this.isButtonEnabled(ConfirmDialog.selectors.cancelButton);
|
||||
return isPresentAndEnabled(this.cancelButton);
|
||||
}
|
||||
|
||||
async isKeepEnabled(): Promise<boolean> {
|
||||
return this.isButtonEnabled(ConfirmDialog.selectors.keepButton);
|
||||
return isPresentAndEnabled(this.keepButton);
|
||||
}
|
||||
|
||||
async isDeleteEnabled(): Promise<boolean> {
|
||||
return this.isButtonEnabled(ConfirmDialog.selectors.deleteButton);
|
||||
return isPresentAndEnabled(this.deleteButton);
|
||||
}
|
||||
|
||||
async isRemoveEnabled(): Promise<boolean> {
|
||||
return this.isButtonEnabled(ConfirmDialog.selectors.removeButton);
|
||||
return isPresentAndEnabled(this.removeButton);
|
||||
}
|
||||
|
||||
async clickOk(): Promise<void> {
|
||||
await this.clickButton(ConfirmDialog.selectors.okButton);
|
||||
}
|
||||
|
||||
async clickCancel(): Promise<void> {
|
||||
await this.clickButton(ConfirmDialog.selectors.cancelButton);
|
||||
}
|
||||
|
||||
async clickKeep(): Promise<void> {
|
||||
await this.clickButton(ConfirmDialog.selectors.keepButton);
|
||||
}
|
||||
|
||||
async clickDelete(): Promise<void> {
|
||||
await this.clickButton(ConfirmDialog.selectors.deleteButton);
|
||||
}
|
||||
|
||||
async clickRemove(): Promise<void> {
|
||||
await this.clickButton(ConfirmDialog.selectors.removeButton);
|
||||
}
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user