mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2026-09-09 18:03:21 +00:00
[AAE-726] Add new return await rule (#5203)
* add new return await rule * update tslint * add lint exception
This commit is contained in:
committed by
Denys Vuika
parent
a4730cd9cf
commit
2e046945c7
@@ -15,6 +15,8 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
/* tslint:disable:no-console */
|
||||
|
||||
import { HttpClientModule } from '@angular/common/http';
|
||||
import { Component } from '@angular/core';
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
@@ -23,168 +25,168 @@ import { LogService } from './log.service';
|
||||
import { setupTestBed } from '../testing/setupTestBed';
|
||||
|
||||
@Component({
|
||||
template: '',
|
||||
providers: [LogService]
|
||||
template: '',
|
||||
providers: [LogService]
|
||||
})
|
||||
class ProvidesLogComponent {
|
||||
constructor(public logService: LogService) {
|
||||
constructor(public logService: LogService) {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
error() {
|
||||
this.logService.error('Test message');
|
||||
}
|
||||
error() {
|
||||
this.logService.error('Test message');
|
||||
}
|
||||
|
||||
info() {
|
||||
this.logService.info('Test message');
|
||||
}
|
||||
info() {
|
||||
this.logService.info('Test message');
|
||||
}
|
||||
|
||||
warn() {
|
||||
this.logService.warn('Test message');
|
||||
}
|
||||
warn() {
|
||||
this.logService.warn('Test message');
|
||||
}
|
||||
|
||||
log() {
|
||||
this.logService.log('Test message');
|
||||
}
|
||||
log() {
|
||||
this.logService.log('Test message');
|
||||
}
|
||||
|
||||
debug() {
|
||||
this.logService.debug('Test message');
|
||||
}
|
||||
debug() {
|
||||
this.logService.debug('Test message');
|
||||
}
|
||||
|
||||
trace() {
|
||||
this.logService.trace('Test message');
|
||||
}
|
||||
trace() {
|
||||
this.logService.trace('Test message');
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
describe('Log Service', () => {
|
||||
|
||||
let providesLogComponent: ComponentFixture<ProvidesLogComponent>;
|
||||
let appConfigService: AppConfigService;
|
||||
let providesLogComponent: ComponentFixture<ProvidesLogComponent>;
|
||||
let appConfigService: AppConfigService;
|
||||
|
||||
setupTestBed({
|
||||
imports: [
|
||||
HttpClientModule
|
||||
],
|
||||
declarations: [ProvidesLogComponent],
|
||||
providers: [
|
||||
LogService,
|
||||
AppConfigService
|
||||
]
|
||||
});
|
||||
setupTestBed({
|
||||
imports: [
|
||||
HttpClientModule
|
||||
],
|
||||
declarations: [ProvidesLogComponent],
|
||||
providers: [
|
||||
LogService,
|
||||
AppConfigService
|
||||
]
|
||||
});
|
||||
|
||||
beforeEach(() => {
|
||||
appConfigService = TestBed.get(AppConfigService);
|
||||
});
|
||||
beforeEach(() => {
|
||||
appConfigService = TestBed.get(AppConfigService);
|
||||
});
|
||||
|
||||
it('should not log anything if is silent', () => {
|
||||
appConfigService.config['logLevel'] = 'silent';
|
||||
providesLogComponent = TestBed.createComponent(ProvidesLogComponent);
|
||||
it('should not log anything if is silent', () => {
|
||||
appConfigService.config['logLevel'] = 'silent';
|
||||
providesLogComponent = TestBed.createComponent(ProvidesLogComponent);
|
||||
|
||||
spyOn(console, 'log');
|
||||
spyOn(console, 'trace');
|
||||
spyOn(console, 'debug');
|
||||
spyOn(console, 'info');
|
||||
spyOn(console, 'warn');
|
||||
spyOn(console, 'error');
|
||||
spyOn(console, 'log');
|
||||
spyOn(console, 'trace');
|
||||
spyOn(console, 'debug');
|
||||
spyOn(console, 'info');
|
||||
spyOn(console, 'warn');
|
||||
spyOn(console, 'error');
|
||||
|
||||
providesLogComponent.componentInstance.log();
|
||||
providesLogComponent.componentInstance.trace();
|
||||
providesLogComponent.componentInstance.debug();
|
||||
providesLogComponent.componentInstance.info();
|
||||
providesLogComponent.componentInstance.warn();
|
||||
providesLogComponent.componentInstance.error();
|
||||
providesLogComponent.componentInstance.log();
|
||||
providesLogComponent.componentInstance.trace();
|
||||
providesLogComponent.componentInstance.debug();
|
||||
providesLogComponent.componentInstance.info();
|
||||
providesLogComponent.componentInstance.warn();
|
||||
providesLogComponent.componentInstance.error();
|
||||
|
||||
expect(console.log).not.toHaveBeenCalled();
|
||||
expect(console.trace).not.toHaveBeenCalled();
|
||||
expect(console.debug).not.toHaveBeenCalled();
|
||||
expect(console.info).not.toHaveBeenCalled();
|
||||
expect(console.warn).not.toHaveBeenCalled();
|
||||
expect(console.error).not.toHaveBeenCalled();
|
||||
});
|
||||
expect(console.log).not.toHaveBeenCalled();
|
||||
expect(console.trace).not.toHaveBeenCalled();
|
||||
expect(console.debug).not.toHaveBeenCalled();
|
||||
expect(console.info).not.toHaveBeenCalled();
|
||||
expect(console.warn).not.toHaveBeenCalled();
|
||||
expect(console.error).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('should log only warning and errors if is warning level', () => {
|
||||
appConfigService.config['logLevel'] = 'WARN';
|
||||
providesLogComponent = TestBed.createComponent(ProvidesLogComponent);
|
||||
it('should log only warning and errors if is warning level', () => {
|
||||
appConfigService.config['logLevel'] = 'WARN';
|
||||
providesLogComponent = TestBed.createComponent(ProvidesLogComponent);
|
||||
|
||||
spyOn(console, 'log');
|
||||
spyOn(console, 'error');
|
||||
spyOn(console, 'trace');
|
||||
spyOn(console, 'warn');
|
||||
spyOn(console, 'log');
|
||||
spyOn(console, 'error');
|
||||
spyOn(console, 'trace');
|
||||
spyOn(console, 'warn');
|
||||
|
||||
providesLogComponent.componentInstance.log();
|
||||
providesLogComponent.componentInstance.error();
|
||||
providesLogComponent.componentInstance.trace();
|
||||
providesLogComponent.componentInstance.warn();
|
||||
providesLogComponent.componentInstance.log();
|
||||
providesLogComponent.componentInstance.error();
|
||||
providesLogComponent.componentInstance.trace();
|
||||
providesLogComponent.componentInstance.warn();
|
||||
|
||||
expect(console.log).not.toHaveBeenCalled();
|
||||
expect(console.error).toHaveBeenCalled();
|
||||
expect(console.warn).toHaveBeenCalled();
|
||||
expect(console.trace).not.toHaveBeenCalled();
|
||||
});
|
||||
expect(console.log).not.toHaveBeenCalled();
|
||||
expect(console.error).toHaveBeenCalled();
|
||||
expect(console.warn).toHaveBeenCalled();
|
||||
expect(console.trace).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('should debug level not log trace and log', () => {
|
||||
appConfigService.config['logLevel'] = 'debug';
|
||||
providesLogComponent = TestBed.createComponent(ProvidesLogComponent);
|
||||
it('should debug level not log trace and log', () => {
|
||||
appConfigService.config['logLevel'] = 'debug';
|
||||
providesLogComponent = TestBed.createComponent(ProvidesLogComponent);
|
||||
|
||||
spyOn(console, 'log');
|
||||
spyOn(console, 'trace');
|
||||
spyOn(console, 'debug');
|
||||
spyOn(console, 'info');
|
||||
spyOn(console, 'warn');
|
||||
spyOn(console, 'error');
|
||||
spyOn(console, 'log');
|
||||
spyOn(console, 'trace');
|
||||
spyOn(console, 'debug');
|
||||
spyOn(console, 'info');
|
||||
spyOn(console, 'warn');
|
||||
spyOn(console, 'error');
|
||||
|
||||
providesLogComponent.componentInstance.log();
|
||||
providesLogComponent.componentInstance.trace();
|
||||
providesLogComponent.componentInstance.debug();
|
||||
providesLogComponent.componentInstance.info();
|
||||
providesLogComponent.componentInstance.warn();
|
||||
providesLogComponent.componentInstance.error();
|
||||
providesLogComponent.componentInstance.log();
|
||||
providesLogComponent.componentInstance.trace();
|
||||
providesLogComponent.componentInstance.debug();
|
||||
providesLogComponent.componentInstance.info();
|
||||
providesLogComponent.componentInstance.warn();
|
||||
providesLogComponent.componentInstance.error();
|
||||
|
||||
expect(console.log).not.toHaveBeenCalled();
|
||||
expect(console.trace).not.toHaveBeenCalled();
|
||||
expect(console.debug).toHaveBeenCalled();
|
||||
expect(console.info).toHaveBeenCalled();
|
||||
expect(console.warn).toHaveBeenCalled();
|
||||
expect(console.error).toHaveBeenCalled();
|
||||
});
|
||||
expect(console.log).not.toHaveBeenCalled();
|
||||
expect(console.trace).not.toHaveBeenCalled();
|
||||
expect(console.debug).toHaveBeenCalled();
|
||||
expect(console.info).toHaveBeenCalled();
|
||||
expect(console.warn).toHaveBeenCalled();
|
||||
expect(console.error).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('should trace level log all', () => {
|
||||
appConfigService.config['logLevel'] = 'trace';
|
||||
providesLogComponent = TestBed.createComponent(ProvidesLogComponent);
|
||||
it('should trace level log all', () => {
|
||||
appConfigService.config['logLevel'] = 'trace';
|
||||
providesLogComponent = TestBed.createComponent(ProvidesLogComponent);
|
||||
|
||||
spyOn(console, 'log');
|
||||
spyOn(console, 'trace');
|
||||
spyOn(console, 'debug');
|
||||
spyOn(console, 'info');
|
||||
spyOn(console, 'warn');
|
||||
spyOn(console, 'error');
|
||||
spyOn(console, 'log');
|
||||
spyOn(console, 'trace');
|
||||
spyOn(console, 'debug');
|
||||
spyOn(console, 'info');
|
||||
spyOn(console, 'warn');
|
||||
spyOn(console, 'error');
|
||||
|
||||
providesLogComponent.componentInstance.log();
|
||||
providesLogComponent.componentInstance.trace();
|
||||
providesLogComponent.componentInstance.debug();
|
||||
providesLogComponent.componentInstance.info();
|
||||
providesLogComponent.componentInstance.warn();
|
||||
providesLogComponent.componentInstance.error();
|
||||
providesLogComponent.componentInstance.log();
|
||||
providesLogComponent.componentInstance.trace();
|
||||
providesLogComponent.componentInstance.debug();
|
||||
providesLogComponent.componentInstance.info();
|
||||
providesLogComponent.componentInstance.warn();
|
||||
providesLogComponent.componentInstance.error();
|
||||
|
||||
expect(console.log).toHaveBeenCalled();
|
||||
expect(console.trace).toHaveBeenCalled();
|
||||
expect(console.debug).toHaveBeenCalled();
|
||||
expect(console.info).toHaveBeenCalled();
|
||||
expect(console.warn).toHaveBeenCalled();
|
||||
expect(console.error).toHaveBeenCalled();
|
||||
});
|
||||
expect(console.log).toHaveBeenCalled();
|
||||
expect(console.trace).toHaveBeenCalled();
|
||||
expect(console.debug).toHaveBeenCalled();
|
||||
expect(console.info).toHaveBeenCalled();
|
||||
expect(console.warn).toHaveBeenCalled();
|
||||
expect(console.error).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('message Observable', (done) => {
|
||||
appConfigService.config['logLevel'] = 'trace';
|
||||
providesLogComponent = TestBed.createComponent(ProvidesLogComponent);
|
||||
it('message Observable', (done) => {
|
||||
appConfigService.config['logLevel'] = 'trace';
|
||||
providesLogComponent = TestBed.createComponent(ProvidesLogComponent);
|
||||
|
||||
providesLogComponent.componentInstance.logService.onMessage.subscribe(() => {
|
||||
done();
|
||||
});
|
||||
providesLogComponent.componentInstance.logService.onMessage.subscribe(() => {
|
||||
done();
|
||||
});
|
||||
|
||||
providesLogComponent.componentInstance.log();
|
||||
providesLogComponent.componentInstance.log();
|
||||
|
||||
});
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
@@ -123,7 +123,7 @@ export class ViewUtilService {
|
||||
} else {
|
||||
retries += 1;
|
||||
await this.wait(1000);
|
||||
return await this.waitRendition(nodeId, renditionId, retries);
|
||||
return this.waitRendition(nodeId, renditionId, retries);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -216,7 +216,7 @@ export class PeopleCloudComponent implements OnInit, OnChanges, OnDestroy {
|
||||
const isUserValid: boolean = this.userExists(result);
|
||||
return isUserValid ? result : null;
|
||||
});
|
||||
return await Promise.all(promiseBatch);
|
||||
return Promise.all(promiseBatch);
|
||||
}
|
||||
|
||||
async searchUser(user: IdentityUserModel) {
|
||||
@@ -231,7 +231,7 @@ export class PeopleCloudComponent implements OnInit, OnChanges, OnDestroy {
|
||||
}
|
||||
|
||||
switch (key) {
|
||||
case 'id': return await this.identityUserService.findUserById(user[key]).toPromise();
|
||||
case 'id': return this.identityUserService.findUserById(user[key]).toPromise();
|
||||
case 'username': return (await this.identityUserService.findUserByUsername(user[key]).toPromise())[0];
|
||||
case 'email': return (await this.identityUserService.findUserByEmail(user[key]).toPromise())[0];
|
||||
default: return of([]);
|
||||
|
||||
@@ -39,7 +39,7 @@ export class ContentNodeSelectorDialogPage {
|
||||
}
|
||||
|
||||
async getDialogHeaderText(): Promise<string> {
|
||||
return await BrowserActions.getText(this.header);
|
||||
return BrowserActions.getText(this.header);
|
||||
}
|
||||
|
||||
async checkSearchInputIsDisplayed(): Promise<void> {
|
||||
@@ -47,7 +47,7 @@ export class ContentNodeSelectorDialogPage {
|
||||
}
|
||||
|
||||
async getSearchLabel(): Promise<string> {
|
||||
return await BrowserActions.getText(this.searchLabel);
|
||||
return BrowserActions.getText(this.searchLabel);
|
||||
}
|
||||
|
||||
async checkSelectedSiteIsDisplayed(siteName): Promise<void> {
|
||||
@@ -63,11 +63,11 @@ export class ContentNodeSelectorDialogPage {
|
||||
}
|
||||
|
||||
async checkCancelButtonIsEnabled(): Promise<boolean> {
|
||||
return await this.cancelButton.isEnabled();
|
||||
return this.cancelButton.isEnabled();
|
||||
}
|
||||
|
||||
async checkCopyMoveButtonIsEnabled(): Promise<boolean> {
|
||||
return await this.moveCopyButton.isEnabled();
|
||||
return this.moveCopyButton.isEnabled();
|
||||
}
|
||||
|
||||
async checkMoveCopyButtonIsDisplayed(): Promise<void> {
|
||||
@@ -75,7 +75,7 @@ export class ContentNodeSelectorDialogPage {
|
||||
}
|
||||
|
||||
async getMoveCopyButtonText(): Promise<string> {
|
||||
return await BrowserActions.getText(this.moveCopyButton);
|
||||
return BrowserActions.getText(this.moveCopyButton);
|
||||
}
|
||||
|
||||
async clickMoveCopyButton(): Promise<void> {
|
||||
@@ -83,7 +83,7 @@ export class ContentNodeSelectorDialogPage {
|
||||
}
|
||||
|
||||
async numberOfResultsDisplayed(): Promise<number> {
|
||||
return await this.contentList.dataTablePage().numberOfRows();
|
||||
return this.contentList.dataTablePage().numberOfRows();
|
||||
}
|
||||
|
||||
async typeIntoNodeSelectorSearchField(text): Promise<void> {
|
||||
|
||||
@@ -50,7 +50,7 @@ export class DocumentListPage {
|
||||
}
|
||||
|
||||
async getTooltip(nodeName: string): Promise<string> {
|
||||
return await this.dataTable.getTooltip('Display name', nodeName);
|
||||
return this.dataTable.getTooltip('Display name', nodeName);
|
||||
}
|
||||
|
||||
async selectRow(nodeName: string): Promise<void> {
|
||||
@@ -78,7 +78,7 @@ export class DocumentListPage {
|
||||
}
|
||||
|
||||
async getAllRowsColumnValues(column: string) {
|
||||
return await this.dataTable.getAllRowsColumnValues(column);
|
||||
return this.dataTable.getAllRowsColumnValues(column);
|
||||
}
|
||||
|
||||
async doubleClickRow(nodeName: string): Promise<void> {
|
||||
|
||||
@@ -37,7 +37,7 @@ export class DateRangeFilterPage {
|
||||
}
|
||||
|
||||
async getFromDate(): Promise<string> {
|
||||
return await this.filter.element(this.fromField).getAttribute('value');
|
||||
return this.filter.element(this.fromField).getAttribute('value');
|
||||
}
|
||||
|
||||
async putFromDate(date): Promise<void> {
|
||||
@@ -91,7 +91,7 @@ export class DateRangeFilterPage {
|
||||
}
|
||||
|
||||
async getToDate(): Promise<string> {
|
||||
return await this.filter.element(this.toField).getAttribute('value');
|
||||
return this.filter.element(this.toField).getAttribute('value');
|
||||
}
|
||||
|
||||
async putToDate(date): Promise<void> {
|
||||
|
||||
@@ -40,7 +40,7 @@ export class NumberRangeFilterPage {
|
||||
}
|
||||
|
||||
async getFromNumber(): Promise<string> {
|
||||
return await this.filter.element(this.fromInput).getAttribute('value');
|
||||
return this.filter.element(this.fromInput).getAttribute('value');
|
||||
}
|
||||
|
||||
async putFromNumber(value): Promise<void> {
|
||||
@@ -50,7 +50,7 @@ export class NumberRangeFilterPage {
|
||||
}
|
||||
|
||||
async getFromErrorRequired(): Promise<string> {
|
||||
return await BrowserActions.getText(this.filter.element(this.fromErrorRequired));
|
||||
return BrowserActions.getText(this.filter.element(this.fromErrorRequired));
|
||||
}
|
||||
|
||||
async checkFromErrorRequiredIsDisplayed(): Promise<void> {
|
||||
@@ -58,7 +58,7 @@ export class NumberRangeFilterPage {
|
||||
}
|
||||
|
||||
async getFromErrorInvalid(): Promise<string> {
|
||||
return await BrowserActions.getText(this.filter.element(this.fromErrorInvalid));
|
||||
return BrowserActions.getText(this.filter.element(this.fromErrorInvalid));
|
||||
}
|
||||
|
||||
async checkFromErrorInvalidIsDisplayed(): Promise<void> {
|
||||
@@ -75,7 +75,7 @@ export class NumberRangeFilterPage {
|
||||
}
|
||||
|
||||
async getToNumber(): Promise<string> {
|
||||
return await this.filter.element(this.toInput).getAttribute('value');
|
||||
return this.filter.element(this.toInput).getAttribute('value');
|
||||
}
|
||||
|
||||
async putToNumber(value): Promise<void> {
|
||||
@@ -85,7 +85,7 @@ export class NumberRangeFilterPage {
|
||||
}
|
||||
|
||||
async getToErrorRequired(): Promise<string> {
|
||||
return await BrowserActions.getText(this.filter.element(this.toErrorRequired));
|
||||
return BrowserActions.getText(this.filter.element(this.toErrorRequired));
|
||||
}
|
||||
|
||||
async checkToErrorRequiredIsDisplayed(): Promise<void> {
|
||||
@@ -93,7 +93,7 @@ export class NumberRangeFilterPage {
|
||||
}
|
||||
|
||||
async getToErrorInvalid(): Promise<string> {
|
||||
return await BrowserActions.getText(this.filter.element(this.toErrorInvalid));
|
||||
return BrowserActions.getText(this.filter.element(this.toErrorInvalid));
|
||||
}
|
||||
|
||||
async checkToErrorInvalidIsDisplayed(): Promise<void> {
|
||||
@@ -113,7 +113,7 @@ export class NumberRangeFilterPage {
|
||||
}
|
||||
|
||||
async checkApplyButtonIsEnabled(): Promise<boolean> {
|
||||
return await this.filter.element(this.applyButton).isEnabled();
|
||||
return this.filter.element(this.applyButton).isEnabled();
|
||||
}
|
||||
|
||||
async clickClearButton(): Promise<void> {
|
||||
|
||||
@@ -31,15 +31,15 @@ export class SearchSliderPage {
|
||||
}
|
||||
|
||||
async getMaxValue() {
|
||||
return await this.filter.element(this.slider).getAttribute('aria-valuemax');
|
||||
return this.filter.element(this.slider).getAttribute('aria-valuemax');
|
||||
}
|
||||
|
||||
async getMinValue() {
|
||||
return await this.filter.element(this.slider).getAttribute('aria-valuemin');
|
||||
return this.filter.element(this.slider).getAttribute('aria-valuemin');
|
||||
}
|
||||
|
||||
async getValue() {
|
||||
return await this.filter.element(this.slider).getAttribute('aria-valuenow');
|
||||
return this.filter.element(this.slider).getAttribute('aria-valuenow');
|
||||
}
|
||||
|
||||
async setValue(value: number): Promise<void> {
|
||||
@@ -65,7 +65,7 @@ export class SearchSliderPage {
|
||||
}
|
||||
|
||||
async checkClearButtonIsEnabled() {
|
||||
return await this.filter.element(this.clearButton).isEnabled();
|
||||
return this.filter.element(this.clearButton).isEnabled();
|
||||
}
|
||||
|
||||
async checkClearButtonIsDisplayed(): Promise<void> {
|
||||
|
||||
@@ -81,7 +81,7 @@ export class DataTableComponentPage {
|
||||
}
|
||||
|
||||
async getNumberOfSelectedRows(): Promise<number> {
|
||||
return await this.allSelectedRows.count();
|
||||
return this.allSelectedRows.count();
|
||||
}
|
||||
|
||||
async selectRow(columnName, columnValue): Promise<void> {
|
||||
@@ -110,7 +110,7 @@ export class DataTableComponentPage {
|
||||
const row = this.getRow(identifyingColumn, identifyingValue);
|
||||
await BrowserVisibility.waitUntilElementIsVisible(row);
|
||||
const rowColumn = row.element(by.css(`div[title="${columnName}"] span`));
|
||||
return await BrowserActions.getText(rowColumn);
|
||||
return BrowserActions.getText(rowColumn);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -146,7 +146,7 @@ export class DataTableComponentPage {
|
||||
}
|
||||
|
||||
async getTooltip(columnName, columnValue): Promise<string> {
|
||||
return await this.getCellElementByValue(columnName, columnValue).getAttribute('title');
|
||||
return this.getCellElementByValue(columnName, columnValue).getAttribute('title');
|
||||
}
|
||||
|
||||
async rightClickOnRowByIndex(index: number): Promise<void> {
|
||||
@@ -160,15 +160,15 @@ export class DataTableComponentPage {
|
||||
}
|
||||
|
||||
async numberOfRows(): Promise<number> {
|
||||
return await this.rootElement.all(this.rows).count();
|
||||
return this.rootElement.all(this.rows).count();
|
||||
}
|
||||
|
||||
async getAllRowsColumnValues(column: string) {
|
||||
const columnLocator = by.css("adf-datatable div[class*='adf-datatable-body'] adf-datatable-row[class*='adf-datatable-row'] div[title='" + column + "'] span");
|
||||
await BrowserVisibility.waitUntilElementIsPresent(element.all(columnLocator).first());
|
||||
return await element.all(columnLocator)
|
||||
.filter(async (el) => await el.isPresent())
|
||||
.map(async (el) => await el.getText());
|
||||
return element.all(columnLocator)
|
||||
.filter(async (el) => el.isPresent())
|
||||
.map(async (el) => el.getText());
|
||||
}
|
||||
|
||||
async getRowsWithSameColumnValues(columnName: string, columnValue) {
|
||||
@@ -189,7 +189,7 @@ export class DataTableComponentPage {
|
||||
|
||||
async getFirstElementDetail(detail: string): Promise<string> {
|
||||
const firstNode = element.all(by.css(`adf-datatable div[title="${detail}"] span`)).first();
|
||||
return await BrowserActions.getText(firstNode);
|
||||
return BrowserActions.getText(firstNode);
|
||||
}
|
||||
|
||||
geCellElementDetail(detail: string): ElementArrayFinder {
|
||||
@@ -241,7 +241,7 @@ export class DataTableComponentPage {
|
||||
|
||||
async contentInPosition(position: number): Promise<string> {
|
||||
await BrowserVisibility.waitUntilElementIsVisible(this.contents.first());
|
||||
return await BrowserActions.getText(this.contents.get(position - 1));
|
||||
return BrowserActions.getText(this.contents.get(position - 1));
|
||||
}
|
||||
|
||||
getCellElementByValue(columnName: string, columnValue: string): ElementFinder {
|
||||
@@ -261,11 +261,11 @@ export class DataTableComponentPage {
|
||||
}
|
||||
|
||||
async getNumberOfColumns(): Promise<number> {
|
||||
return await this.allColumns.count();
|
||||
return this.allColumns.count();
|
||||
}
|
||||
|
||||
async getNumberOfRows(): Promise<number> {
|
||||
return await this.list.count();
|
||||
return this.list.count();
|
||||
}
|
||||
|
||||
getCellByRowNumberAndColumnName(rowNumber, columnName): ElementFinder {
|
||||
@@ -333,7 +333,7 @@ export class DataTableComponentPage {
|
||||
}
|
||||
|
||||
async getCopyContentTooltip(): Promise<string> {
|
||||
return await BrowserActions.getText(this.copyColumnTooltip);
|
||||
return BrowserActions.getText(this.copyColumnTooltip);
|
||||
}
|
||||
|
||||
async copyContentTooltipIsNotDisplayed(): Promise<void> {
|
||||
|
||||
@@ -31,7 +31,7 @@ export class AmountWidget {
|
||||
|
||||
async getAmountFieldCurrency(fieldId): Promise<string> {
|
||||
const widget = await this.formFields.getWidget(fieldId);
|
||||
return await BrowserActions.getText(widget.element(this.currency));
|
||||
return BrowserActions.getText(widget.element(this.currency));
|
||||
}
|
||||
|
||||
async setFieldValue(fieldId, value): Promise<void> {
|
||||
|
||||
@@ -127,7 +127,7 @@ export class LoginPage {
|
||||
|
||||
async getSignInButtonIsEnabled(): Promise<boolean> {
|
||||
await BrowserVisibility.waitUntilElementIsVisible(this.signInButton);
|
||||
return await this.signInButton.isEnabled();
|
||||
return this.signInButton.isEnabled();
|
||||
}
|
||||
|
||||
async loginToAllUsingUserModel(userModel): Promise<void> {
|
||||
|
||||
@@ -73,11 +73,11 @@ export class SettingsPage {
|
||||
}
|
||||
|
||||
async getBpmHostUrl() {
|
||||
return await this.bpmText.getAttribute('value');
|
||||
return this.bpmText.getAttribute('value');
|
||||
}
|
||||
|
||||
async getEcmHostUrl() {
|
||||
return await this.ecmText.getAttribute('value');
|
||||
return this.ecmText.getAttribute('value');
|
||||
}
|
||||
|
||||
getBpmOption() {
|
||||
|
||||
@@ -118,20 +118,20 @@ export class ViewerPage {
|
||||
}
|
||||
|
||||
async getZoom(): Promise<string> {
|
||||
return await BrowserActions.getText(this.percentage);
|
||||
return BrowserActions.getText(this.percentage);
|
||||
}
|
||||
|
||||
async getCanvasWidth(): Promise<string> {
|
||||
return await this.canvasLayer.getAttribute(`width`);
|
||||
return this.canvasLayer.getAttribute(`width`);
|
||||
}
|
||||
|
||||
async getCanvasHeight(): Promise<string> {
|
||||
return await this.canvasLayer.getAttribute(`height`);
|
||||
return this.canvasLayer.getAttribute(`height`);
|
||||
}
|
||||
|
||||
async getDisplayedFileName(): Promise<string> {
|
||||
await BrowserVisibility.waitUntilElementIsVisible(this.fileName);
|
||||
return await BrowserActions.getText(this.fileName);
|
||||
return BrowserActions.getText(this.fileName);
|
||||
}
|
||||
|
||||
async exitFullScreen(): Promise<void> {
|
||||
@@ -209,11 +209,11 @@ export class ViewerPage {
|
||||
}
|
||||
|
||||
async getLastButtonTitle(): Promise<string> {
|
||||
return await this.lastButton.getAttribute('title');
|
||||
return this.lastButton.getAttribute('title');
|
||||
}
|
||||
|
||||
async getMoreActionsMenuTitle(): Promise<string> {
|
||||
return await this.moreActionsMenu.getAttribute('title');
|
||||
return this.moreActionsMenu.getAttribute('title');
|
||||
}
|
||||
|
||||
async checkDownloadButtonIsDisplayed(): Promise<void> {
|
||||
@@ -428,7 +428,7 @@ export class ViewerPage {
|
||||
}
|
||||
|
||||
async getActiveTab(): Promise<string> {
|
||||
return await BrowserActions.getText(this.activeTab);
|
||||
return BrowserActions.getText(this.activeTab);
|
||||
}
|
||||
|
||||
async clickOnCommentsTab(): Promise<void> {
|
||||
@@ -617,12 +617,12 @@ export class ViewerPage {
|
||||
|
||||
async getTabLabelById(index: number): Promise<string> {
|
||||
const tab: ElementFinder = element(by.css(`div[id="mat-tab-label-1-${index}"] div[class="mat-tab-label-content"] span`));
|
||||
return await BrowserActions.getText(tab);
|
||||
return BrowserActions.getText(tab);
|
||||
}
|
||||
|
||||
async getTabIconById(index: number): Promise<string> {
|
||||
const tab: ElementFinder = element(by.css(`div[id="mat-tab-label-1-${index}"] div[class="mat-tab-label-content"] mat-icon`));
|
||||
return await BrowserActions.getText(tab);
|
||||
return BrowserActions.getText(tab);
|
||||
}
|
||||
|
||||
async checkUnknownFormatIsDisplayed(): Promise<void> {
|
||||
@@ -631,6 +631,6 @@ export class ViewerPage {
|
||||
|
||||
async getUnknownFormatMessage(): Promise<string> {
|
||||
const unknownFormatLabel = this.unknownFormat.element(by.css(`.label`));
|
||||
return await BrowserActions.getText(unknownFormatLabel);
|
||||
return BrowserActions.getText(unknownFormatLabel);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -72,7 +72,7 @@ export class BrowserActions {
|
||||
static async getColor(elementFinder: ElementFinder): Promise<string> {
|
||||
await BrowserVisibility.waitUntilElementIsVisible(elementFinder);
|
||||
const webElem = await elementFinder.getWebElement();
|
||||
return await webElem.getCssValue('color');
|
||||
return webElem.getCssValue('color');
|
||||
}
|
||||
|
||||
static async clearWithBackSpace(elementFinder: ElementFinder) {
|
||||
|
||||
@@ -27,7 +27,7 @@ export class DatePickerPage {
|
||||
previousMonthButton: ElementFinder = element(by.css('button[class*="mat-calendar-previous-button"]'));
|
||||
|
||||
async getSelectedDate(): Promise<string> {
|
||||
return await element(by.css('td[class*="mat-calendar-body-active"]')).getAttribute('aria-label');
|
||||
return element(by.css('td[class*="mat-calendar-body-active"]')).getAttribute('aria-label');
|
||||
}
|
||||
|
||||
async checkDatesAfterDateAreDisabled(date): Promise<void> {
|
||||
|
||||
@@ -41,7 +41,7 @@ export class AppListCloudPage {
|
||||
}
|
||||
|
||||
async getNameOfTheApplications(): Promise<string> {
|
||||
return await BrowserActions.getArrayText(this.nameOfAllApps);
|
||||
return BrowserActions.getArrayText(this.nameOfAllApps);
|
||||
}
|
||||
|
||||
async checkAppIsNotDisplayed(applicationName): Promise<void> {
|
||||
|
||||
+4
-4
@@ -36,7 +36,7 @@ export class EditProcessFilterCloudComponentPage {
|
||||
}
|
||||
|
||||
async isFilterDisplayed(): Promise<boolean> {
|
||||
return await BrowserVisibility.waitUntilElementIsVisible(this.filter);
|
||||
return BrowserVisibility.waitUntilElementIsVisible(this.filter);
|
||||
}
|
||||
|
||||
async openFilter(): Promise<void> {
|
||||
@@ -71,7 +71,7 @@ export class EditProcessFilterCloudComponentPage {
|
||||
|
||||
async getSortFilterDropDownValue(): Promise<string> {
|
||||
const sortLocator = element.all(by.css("mat-form-field[data-automation-id='sort'] span")).first();
|
||||
return await BrowserActions.getText(sortLocator);
|
||||
return BrowserActions.getText(sortLocator);
|
||||
}
|
||||
|
||||
async setOrderFilterDropDown(option): Promise<void> {
|
||||
@@ -100,7 +100,7 @@ export class EditProcessFilterCloudComponentPage {
|
||||
|
||||
async getApplicationSelected(): Promise<string> {
|
||||
const applicationDropdown = element(by.css(`[data-automation-id='adf-cloud-edit-process-property-appName']`));
|
||||
return await applicationDropdown.getText();
|
||||
return applicationDropdown.getText();
|
||||
}
|
||||
|
||||
async checkAppNamesAreUnique(): Promise<boolean> {
|
||||
@@ -121,7 +121,7 @@ export class EditProcessFilterCloudComponentPage {
|
||||
|
||||
async isApplicationListLoaded(): Promise<boolean> {
|
||||
const emptyList = element(by.css(`[data-automation-id='adf-cloud-edit-process-property-appName'] .mat-select-placeholder`));
|
||||
return await BrowserVisibility.waitUntilElementIsNotVisible(emptyList);
|
||||
return BrowserVisibility.waitUntilElementIsNotVisible(emptyList);
|
||||
}
|
||||
|
||||
async setProcessInstanceId(option): Promise<void> {
|
||||
|
||||
+1
-1
@@ -47,7 +47,7 @@ export class EditTaskFilterCloudComponentPage {
|
||||
}
|
||||
|
||||
async isFilterDisplayed(): Promise<boolean> {
|
||||
return await BrowserVisibility.waitUntilElementIsVisible(this.filter);
|
||||
return BrowserVisibility.waitUntilElementIsVisible(this.filter);
|
||||
}
|
||||
|
||||
async openFilter(): Promise<void> {
|
||||
|
||||
+1
-1
@@ -87,7 +87,7 @@ export class ProcessListCloudComponentPage {
|
||||
}
|
||||
|
||||
async getAllRowsNameColumn() {
|
||||
return await this.dataTable.getAllRowsColumnValues(this.columns.name);
|
||||
return this.dataTable.getAllRowsColumnValues(this.columns.name);
|
||||
}
|
||||
|
||||
async checkProcessListIsLoaded(): Promise<void> {
|
||||
|
||||
@@ -118,39 +118,39 @@ export class TaskListCloudComponentPage {
|
||||
}
|
||||
|
||||
async getAllRowsNameColumn() {
|
||||
return await this.dataTable.getAllRowsColumnValues(column.name);
|
||||
return this.dataTable.getAllRowsColumnValues(column.name);
|
||||
}
|
||||
|
||||
async getAllRowsByIdColumn() {
|
||||
return await this.dataTable.getAllRowsColumnValues(column.id);
|
||||
return this.dataTable.getAllRowsColumnValues(column.id);
|
||||
}
|
||||
|
||||
async getAllRowsByProcessDefIdColumn() {
|
||||
return await this.dataTable.getAllRowsColumnValues(column.processDefinitionId);
|
||||
return this.dataTable.getAllRowsColumnValues(column.processDefinitionId);
|
||||
}
|
||||
|
||||
async getAllRowsByProcessInstanceIdColumn() {
|
||||
return await this.dataTable.getAllRowsColumnValues(column.processInstanceId);
|
||||
return this.dataTable.getAllRowsColumnValues(column.processInstanceId);
|
||||
}
|
||||
|
||||
async getAllRowsByAssigneeColumn() {
|
||||
return await this.dataTable.getAllRowsColumnValues(column.assignee);
|
||||
return this.dataTable.getAllRowsColumnValues(column.assignee);
|
||||
}
|
||||
|
||||
async getAllRowsByParentTaskIdColumn() {
|
||||
return await this.dataTable.getAllRowsColumnValues(column.parentTaskId);
|
||||
return this.dataTable.getAllRowsColumnValues(column.parentTaskId);
|
||||
}
|
||||
|
||||
async getAllRowsByPriorityColumn() {
|
||||
return await this.dataTable.getAllRowsColumnValues(column.priority);
|
||||
return this.dataTable.getAllRowsColumnValues(column.priority);
|
||||
}
|
||||
|
||||
async getAllRowsByStandAloneColumn() {
|
||||
return await this.dataTable.getAllRowsColumnValues(column.standAlone);
|
||||
return this.dataTable.getAllRowsColumnValues(column.standAlone);
|
||||
}
|
||||
|
||||
async getAllRowsByOwnerColumn() {
|
||||
return await this.dataTable.getAllRowsColumnValues(column.owner);
|
||||
return this.dataTable.getAllRowsColumnValues(column.owner);
|
||||
}
|
||||
|
||||
async getIdCellValue(rowName): Promise<string> {
|
||||
|
||||
@@ -60,13 +60,13 @@ export class FormFieldsPage {
|
||||
const widget: ElementFinder = await this.getWidget(fieldId);
|
||||
const value = widget.element(valueLocatorParam || this.valueLocator);
|
||||
await BrowserVisibility.waitUntilElementIsVisible(value);
|
||||
return await value.getAttribute('value');
|
||||
return value.getAttribute('value');
|
||||
}
|
||||
|
||||
async getFieldLabel(fieldId, labelLocatorParam): Promise<string> {
|
||||
const widget = await this.getWidget(fieldId);
|
||||
const label = widget.all(labelLocatorParam || this.labelLocator).first();
|
||||
return await BrowserActions.getText(label);
|
||||
return BrowserActions.getText(label);
|
||||
}
|
||||
|
||||
async getFieldErrorMessage(fieldId): Promise<string> {
|
||||
|
||||
Reference in New Issue
Block a user