mirror of
https://github.com/Alfresco/alfresco-content-app.git
synced 2025-07-31 17:38:28 +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:
@@ -23,44 +23,24 @@
|
||||
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
import { ElementFinder, by, browser, ExpectedConditions as EC } from 'protractor';
|
||||
import { BROWSER_WAIT_TIMEOUT } from '../../configs';
|
||||
import { by, browser } from 'protractor';
|
||||
import { Component } from '../component';
|
||||
import * as moment from 'moment';
|
||||
import { isPresentAndDisplayed } from '../../utilities/utils';
|
||||
import { isPresentAndDisplayed, waitForStaleness } from '../../utilities/utils';
|
||||
|
||||
export class DateTimePicker extends Component {
|
||||
private static selectors = {
|
||||
root: '.mat-datetimepicker-popup',
|
||||
|
||||
header: '.mat-datetimepicker-calendar-header',
|
||||
year: '.mat-datetimepicker-calendar-header-year',
|
||||
date: '.mat-datetimepicker-calendar-header-date',
|
||||
|
||||
content: '.mat-datetimepicker-calendar-content',
|
||||
dayPicker: 'mat-datetimepicker-month-view',
|
||||
|
||||
today: '.mat-datetimepicker-calendar-body-today',
|
||||
firstActiveDay: '.mat-datetimepicker-calendar-body-active .mat-datetimepicker-calendar-body-cell-content',
|
||||
};
|
||||
|
||||
calendar: ElementFinder = browser.element(by.css(DateTimePicker.selectors.root));
|
||||
headerDate: ElementFinder = this.component.element(by.css(DateTimePicker.selectors.date));
|
||||
headerYear: ElementFinder = this.component.element(by.css(DateTimePicker.selectors.year));
|
||||
dayPicker: ElementFinder = this.component.element(by.css(DateTimePicker.selectors.dayPicker));
|
||||
|
||||
rootElemLocator = by.css(DateTimePicker.selectors.root);
|
||||
calendar = this.byCss('.mat-datetimepicker-popup', browser);
|
||||
headerDate = this.byCss('.mat-datetimepicker-calendar-header-date');
|
||||
headerYear = this.byCss('.mat-datetimepicker-calendar-header-year');
|
||||
dayPicker = this.byCss('mat-datetimepicker-month-view');
|
||||
rootElemLocator = by.css('.mat-datetimepicker-popup');
|
||||
|
||||
constructor(ancestor?: string) {
|
||||
super(DateTimePicker.selectors.root, ancestor);
|
||||
}
|
||||
|
||||
async waitForDateTimePickerToOpen(): Promise<void> {
|
||||
await browser.wait(EC.presenceOf(this.calendar), BROWSER_WAIT_TIMEOUT);
|
||||
super('.mat-datetimepicker-popup', ancestor);
|
||||
}
|
||||
|
||||
async waitForDateTimePickerToClose(): Promise<void> {
|
||||
await browser.wait(EC.stalenessOf(this.calendar), BROWSER_WAIT_TIMEOUT);
|
||||
return waitForStaleness(this.calendar);
|
||||
}
|
||||
|
||||
async isCalendarOpen(): Promise<boolean> {
|
||||
@@ -69,21 +49,14 @@ export class DateTimePicker extends Component {
|
||||
return isPresentAndDisplayed(element);
|
||||
}
|
||||
|
||||
async getDate(): Promise<string> {
|
||||
return this.headerDate.getText();
|
||||
}
|
||||
|
||||
async getYear(): Promise<string> {
|
||||
return this.headerYear.getText();
|
||||
}
|
||||
|
||||
async setDefaultDay(): Promise<string> {
|
||||
const today = moment();
|
||||
const tomorrow = today.add(1, 'day');
|
||||
const dayOfTomorrow = tomorrow.date();
|
||||
const date = await this.getDate();
|
||||
const year = await this.getYear();
|
||||
const elem = this.dayPicker.element(by.cssContainingText(DateTimePicker.selectors.firstActiveDay, `${dayOfTomorrow}`));
|
||||
const date = await this.headerDate.getText();
|
||||
const year = await this.headerYear.getText();
|
||||
const firstActiveDay = '.mat-datetimepicker-calendar-body-active .mat-datetimepicker-calendar-body-cell-content';
|
||||
const elem = this.dayPicker.element(by.cssContainingText(firstActiveDay, `${dayOfTomorrow}`));
|
||||
await elem.click();
|
||||
return `${date} ${year}`;
|
||||
}
|
||||
|
Reference in New Issue
Block a user