From 2e046945c7c043d199ed5380365a8d273e83c500 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Wed, 30 Oct 2019 19:29:43 +0000 Subject: [PATCH] [AAE-726] Add new return await rule (#5203) * add new return await rule * update tslint * add lint exception --- e2e/actions/APS/apps.actions.ts | 4 +- e2e/actions/APS/appsRuntime.actions.ts | 2 +- e2e/actions/APS/models.actions.ts | 4 +- e2e/actions/drop.actions.ts | 4 +- .../adf/content-services/treeViewPage.ts | 4 +- e2e/pages/adf/contentServicesPage.ts | 50 ++-- e2e/pages/adf/demo-shell/dataTablePage.ts | 4 +- .../process-services/tasksCloudDemoPage.ts | 6 +- e2e/pages/adf/dialog/createLibraryDialog.ts | 32 +-- e2e/pages/adf/dialog/folderDialog.ts | 6 +- e2e/pages/adf/dialog/searchDialog.ts | 6 +- e2e/pages/adf/dialog/shareDialog.ts | 4 +- e2e/pages/adf/dialog/uploadDialog.ts | 4 +- e2e/pages/adf/iconsPage.ts | 4 +- e2e/pages/adf/metadataViewPage.ts | 36 +-- e2e/pages/adf/permissionsPage.ts | 4 +- e2e/pages/adf/process-services/filtersPage.ts | 2 +- .../process-services/processFiltersPage.ts | 6 +- .../adf/process-services/taskDetailsPage.ts | 2 +- e2e/pages/adf/process-services/tasksPage.ts | 4 +- e2e/pages/adf/searchFiltersPage.ts | 4 +- e2e/pages/adf/searchResultsPage.ts | 2 +- e2e/pages/adf/tagPage.ts | 12 +- e2e/pages/adf/trashcanPage.ts | 2 +- e2e/pages/adf/versionManagerPage.ts | 6 +- lib/core/services/log.service.spec.ts | 256 +++++++++--------- lib/core/viewer/services/view-util.service.ts | 2 +- .../people-cloud/people-cloud.component.ts | 4 +- .../content-node-selector-dialog.page.ts | 12 +- .../pages/document-list.page.ts | 4 +- .../pages/search/date-range-filter.page.ts | 4 +- .../pages/search/number-range-filter.page.ts | 14 +- .../pages/search/search-slider.page.ts | 8 +- .../core/pages/data-table-component.page.ts | 24 +- .../core/pages/form/widgets/amountWidget.ts | 2 +- lib/testing/src/lib/core/pages/login.page.ts | 2 +- .../src/lib/core/pages/settings.page.ts | 4 +- lib/testing/src/lib/core/pages/viewerPage.ts | 20 +- .../src/lib/core/utils/browser-actions.ts | 2 +- .../lib/material/pages/date-picker.page.ts | 2 +- .../app/app-list-cloud.page.ts | 2 +- ...dit-process-filter-cloud-component.page.ts | 8 +- .../edit-task-filter-cloud-component.page.ts | 2 +- .../process-list-cloud-component.page.ts | 2 +- .../pages/task-list-cloud-component.page.ts | 18 +- .../pages/form-fields.page.ts | 4 +- package.json | 2 +- tslint.json | 1 + 48 files changed, 308 insertions(+), 305 deletions(-) diff --git a/e2e/actions/APS/apps.actions.ts b/e2e/actions/APS/apps.actions.ts index 5e30428dc4..cfff1272d9 100644 --- a/e2e/actions/APS/apps.actions.ts +++ b/e2e/actions/APS/apps.actions.ts @@ -65,7 +65,7 @@ export class AppsActions { const pathFile = path.join(browser.params.testConfig.main.rootPath + appFileLocation); const file = fs.createReadStream(pathFile); - return await alfrescoJsApi.activiti.appsApi.importAppDefinition(file); + return alfrescoJsApi.activiti.appsApi.importAppDefinition(file); } async publishDeployApp(alfrescoJsApi, appId) { @@ -116,7 +116,7 @@ export class AppsActions { startProcessOptions.name = processName; } - return await alfrescoJsApi.activiti.processApi.startNewProcessInstance(startProcessOptions); + return alfrescoJsApi.activiti.processApi.startNewProcessInstance(startProcessOptions); } diff --git a/e2e/actions/APS/appsRuntime.actions.ts b/e2e/actions/APS/appsRuntime.actions.ts index 32249c1aa5..07c25189f1 100644 --- a/e2e/actions/APS/appsRuntime.actions.ts +++ b/e2e/actions/APS/appsRuntime.actions.ts @@ -33,7 +33,7 @@ export class AppsRuntimeActions { async getRuntimeAppDefinitions(alfrescoJsApi) { - return await alfrescoJsApi.activiti.appsRuntimeApi.getAppDefinitions(); + return alfrescoJsApi.activiti.appsRuntimeApi.getAppDefinitions(); } } diff --git a/e2e/actions/APS/models.actions.ts b/e2e/actions/APS/models.actions.ts index 918fc20f8a..0c9d10cd52 100644 --- a/e2e/actions/APS/models.actions.ts +++ b/e2e/actions/APS/models.actions.ts @@ -19,12 +19,12 @@ export class ModelsActions { async deleteVersionModel(alfrescoJsApi, modelId) { - return await alfrescoJsApi.activiti.modelsApi.deleteModel(modelId, { cascade: false, deleteRuntimeApp : true }); + return alfrescoJsApi.activiti.modelsApi.deleteModel(modelId, { cascade: false, deleteRuntimeApp : true }); } async deleteEntireModel(alfrescoJsApi, modelId) { - return await alfrescoJsApi.activiti.modelsApi.deleteModel(modelId, { cascade: true, deleteRuntimeApp : true }); + return alfrescoJsApi.activiti.modelsApi.deleteModel(modelId, { cascade: true, deleteRuntimeApp : true }); } } diff --git a/e2e/actions/drop.actions.ts b/e2e/actions/drop.actions.ts index 94958ada1a..e0dd5888a9 100644 --- a/e2e/actions/drop.actions.ts +++ b/e2e/actions/drop.actions.ts @@ -84,7 +84,7 @@ export class DropActions { fs.accessSync(absolutePath, fs.constants.F_OK); const elem = await dropArea.getWebElement(); const input: any = await browser.executeScript(JS_BIND_INPUT, elem); - return await input.sendKeys(absolutePath); + return input.sendKeys(absolutePath); } async dropFolder(dropArea, folderPath) { @@ -95,6 +95,6 @@ export class DropActions { const elem = await dropArea.getWebElement(); const input: any = await browser.executeScript(JS_BIND_INPUT_FOLDER, elem); - return await input.sendKeys(absolutePath); + return input.sendKeys(absolutePath); } } diff --git a/e2e/pages/adf/content-services/treeViewPage.ts b/e2e/pages/adf/content-services/treeViewPage.ts index 228df5a2e5..a14c12c6cf 100644 --- a/e2e/pages/adf/content-services/treeViewPage.ts +++ b/e2e/pages/adf/content-services/treeViewPage.ts @@ -31,7 +31,7 @@ export class TreeViewPage { async getNodeId(): Promise { await BrowserVisibility.waitUntilElementIsVisible(this.nodeIdInput); - return await this.nodeIdInput.getAttribute('value'); + return this.nodeIdInput.getAttribute('value'); } async clickNode(nodeName): Promise { @@ -81,6 +81,6 @@ export class TreeViewPage { } async getTotalNodes() { - return await this.nodesOnPage.count(); + return this.nodesOnPage.count(); } } diff --git a/e2e/pages/adf/contentServicesPage.ts b/e2e/pages/adf/contentServicesPage.ts index 63ea7db8cc..668dd614c7 100644 --- a/e2e/pages/adf/contentServicesPage.ts +++ b/e2e/pages/adf/contentServicesPage.ts @@ -112,11 +112,11 @@ export class ContentServicesPage { } async checkLockedIcon(content): Promise { - return await this.contentList.checkLockedIcon(content); + return this.contentList.checkLockedIcon(content); } async checkUnlockedIcon(content): Promise { - return await this.contentList.checkUnlockedIcon(content); + return this.contentList.checkUnlockedIcon(content); } async checkDeleteIsDisabled(content): Promise { @@ -186,7 +186,7 @@ export class ContentServicesPage { } async getElementsDisplayedId() { - return await this.contentList.dataTablePage().getAllRowsColumnValues(this.columns.nodeId); + return this.contentList.dataTablePage().getAllRowsColumnValues(this.columns.nodeId); } checkElementsDateSortedAsc(elements) { @@ -248,7 +248,7 @@ export class ContentServicesPage { } async getRecentFileIcon(): Promise { - return await BrowserActions.getText(this.recentFileIcon); + return BrowserActions.getText(this.recentFileIcon); } async checkAcsContainer(): Promise { @@ -269,15 +269,15 @@ export class ContentServicesPage { } async numberOfResultsDisplayed(): Promise { - return await this.contentList.dataTablePage().numberOfRows(); + return this.contentList.dataTablePage().numberOfRows(); } async currentFolderName(): Promise { - return await BrowserActions.getText(this.currentFolder); + return BrowserActions.getText(this.currentFolder); } async getAllRowsNameColumn(): Promise { - return await this.contentList.getAllRowsColumnValues(this.columns.name); + return this.contentList.getAllRowsColumnValues(this.columns.name); } async sortByName(sortOrder: string): Promise { @@ -294,33 +294,33 @@ export class ContentServicesPage { async sortAndCheckListIsOrderedByName(sortOrder: string): Promise { await this.sortByName(sortOrder); - return await this.checkListIsSortedByNameColumn(sortOrder); + return this.checkListIsSortedByNameColumn(sortOrder); } async checkListIsSortedByNameColumn(sortOrder: string): Promise { - return await this.contentList.dataTablePage().checkListIsSorted(sortOrder, this.columns.name); + return this.contentList.dataTablePage().checkListIsSorted(sortOrder, this.columns.name); } async checkListIsSortedByCreatedColumn(sortOrder: string): Promise { - return await this.contentList.dataTablePage().checkListIsSorted(sortOrder, this.columns.created); + return this.contentList.dataTablePage().checkListIsSorted(sortOrder, this.columns.created); } async checkListIsSortedByAuthorColumn(sortOrder: string): Promise { - return await this.contentList.dataTablePage().checkListIsSorted(sortOrder, this.columns.createdBy); + return this.contentList.dataTablePage().checkListIsSorted(sortOrder, this.columns.createdBy); } async checkListIsSortedBySizeColumn(sortOrder: string): Promise { - return await this.contentList.dataTablePage().checkListIsSorted(sortOrder, this.columns.size); + return this.contentList.dataTablePage().checkListIsSorted(sortOrder, this.columns.size); } async sortAndCheckListIsOrderedByAuthor(sortOrder: string): Promise { await this.sortByAuthor(sortOrder); - return await this.checkListIsSortedByAuthorColumn(sortOrder); + return this.checkListIsSortedByAuthorColumn(sortOrder); } async sortAndCheckListIsOrderedByCreated(sortOrder: string): Promise { await this.sortByCreated(sortOrder); - return await this.checkListIsSortedByCreatedColumn(sortOrder); + return this.checkListIsSortedByCreatedColumn(sortOrder); } async doubleClickRow(nodeName): Promise { @@ -378,7 +378,7 @@ export class ContentServicesPage { async getActiveBreadcrumb(): Promise { await BrowserVisibility.waitUntilElementIsVisible(this.activeBreadcrumb); - return await this.activeBreadcrumb.getAttribute('title'); + return this.activeBreadcrumb.getAttribute('title'); } async uploadFile(fileLocation): Promise { @@ -405,17 +405,17 @@ export class ContentServicesPage { async getSingleFileButtonTooltip(): Promise { await BrowserVisibility.waitUntilElementIsPresent(this.uploadFileButton); - return await this.uploadFileButtonInput.getAttribute('title'); + return this.uploadFileButtonInput.getAttribute('title'); } async getMultipleFileButtonTooltip(): Promise { await BrowserVisibility.waitUntilElementIsPresent(this.uploadMultipleFileButton); - return await this.uploadMultipleFileButton.getAttribute('title'); + return this.uploadMultipleFileButton.getAttribute('title'); } async getFolderButtonTooltip(): Promise { await BrowserVisibility.waitUntilElementIsPresent(this.uploadFolderButton); - return await this.uploadFolderButton.getAttribute('title'); + return this.uploadFolderButton.getAttribute('title'); } async checkUploadButton(): Promise { @@ -423,7 +423,7 @@ export class ContentServicesPage { } async uploadButtonIsEnabled(): Promise { - return await this.uploadFileButton.isEnabled(); + return this.uploadFileButton.isEnabled(); } async getErrorMessage(): Promise { @@ -457,7 +457,7 @@ export class ContentServicesPage { async getDocumentListRowNumber(): Promise { const documentList: ElementFinder = element(by.css('adf-upload-drag-area adf-document-list')); await BrowserVisibility.waitUntilElementIsVisible(documentList); - return await $$('adf-upload-drag-area adf-document-list .adf-datatable-row').count(); + return $$('adf-upload-drag-area adf-document-list .adf-datatable-row').count(); } async checkColumnNameHeader(): Promise { @@ -496,13 +496,13 @@ export class ContentServicesPage { } async getColumnValueForRow(file, columnName): Promise { - return await this.contentList.dataTablePage().getColumnValueForRow(this.columns.name, file, columnName); + return this.contentList.dataTablePage().getColumnValueForRow(this.columns.name, file, columnName); } async getStyleValueForRowText(rowName, styleName): Promise { const row: ElementFinder = element(by.css(`div.adf-datatable-cell[data-automation-id="${rowName}"] span.adf-datatable-cell-value[title="${rowName}"]`)); await BrowserVisibility.waitUntilElementIsVisible(row); - return await row.getCssValue(styleName); + return row.getCssValue(styleName); } async checkEmptyFolderTextToBe(text): Promise { @@ -522,7 +522,7 @@ export class ContentServicesPage { async getRowIconImageUrl(fileName): Promise { const iconRow: ElementFinder = element(by.css(`.app-document-list-container div.adf-datatable-cell[data-automation-id="${fileName}"] img`)); await BrowserVisibility.waitUntilElementIsVisible(iconRow); - return await iconRow.getAttribute('src'); + return iconRow.getAttribute('src'); } async checkGridViewButtonIsVisible(): Promise { @@ -545,7 +545,7 @@ export class ContentServicesPage { async getDocumentCardIconForElement(elementName): Promise { const elementIcon: ElementFinder = element(by.css(`.app-document-list-container div.adf-datatable-cell[data-automation-id="${elementName}"] img`)); - return await elementIcon.getAttribute('src'); + return elementIcon.getAttribute('src'); } async checkDocumentCardPropertyIsShowed(elementName, propertyName): Promise { @@ -555,7 +555,7 @@ export class ContentServicesPage { async getAttributeValueForElement(elementName, propertyName): Promise { const elementSize = element(by.css(`.app-document-list-container div.adf-datatable-cell[data-automation-id="${elementName}"][title="${propertyName}"] span`)); - return await BrowserActions.getText(elementSize); + return BrowserActions.getText(elementSize); } async checkMenuIsShowedForElementIndex(elementIndex): Promise { diff --git a/e2e/pages/adf/demo-shell/dataTablePage.ts b/e2e/pages/adf/demo-shell/dataTablePage.ts index cc50832e61..37a5ed0345 100644 --- a/e2e/pages/adf/demo-shell/dataTablePage.ts +++ b/e2e/pages/adf/demo-shell/dataTablePage.ts @@ -138,7 +138,7 @@ export class DataTablePage { } async getCopyContentTooltip(): Promise { - return await this.dataTable.getCopyContentTooltip(); + return this.dataTable.getCopyContentTooltip(); } async mouseOverNameColumn(name: string): Promise { @@ -191,6 +191,6 @@ export class DataTablePage { async getClipboardInputText(): Promise { await BrowserVisibility.waitUntilElementIsVisible(this.pasteClipboardInput); - return await this.pasteClipboardInput.getAttribute('value'); + return this.pasteClipboardInput.getAttribute('value'); } } diff --git a/e2e/pages/adf/demo-shell/process-services/tasksCloudDemoPage.ts b/e2e/pages/adf/demo-shell/process-services/tasksCloudDemoPage.ts index a584e9da4b..afe049d316 100644 --- a/e2e/pages/adf/demo-shell/process-services/tasksCloudDemoPage.ts +++ b/e2e/pages/adf/demo-shell/process-services/tasksCloudDemoPage.ts @@ -100,7 +100,7 @@ export class TasksCloudDemoPage { } async getActiveFilterName(): Promise { - return await BrowserActions.getText(this.activeFilter); + return BrowserActions.getText(this.activeFilter); } customTaskFilter(filterName): TaskFiltersCloudComponentPage { @@ -146,13 +146,13 @@ export class TasksCloudDemoPage { async getNoOfSelectedRows(): Promise { await this.checkSelectedRowsIsDisplayed(); - return await this.noOfSelectedRows.count(); + return this.noOfSelectedRows.count(); } async getSelectedTaskRowText(rowNo: string): Promise { await this.checkSelectedRowsIsDisplayed(); const row: ElementFinder = element(by.xpath(`//div[text()=' Selected Rows: ']//li[${rowNo}]`)); - return await BrowserActions.getText(row); + return BrowserActions.getText(row); } async addActionIsDisplayed(): Promise { diff --git a/e2e/pages/adf/dialog/createLibraryDialog.ts b/e2e/pages/adf/dialog/createLibraryDialog.ts index 3425a2fc22..369e081198 100644 --- a/e2e/pages/adf/dialog/createLibraryDialog.ts +++ b/e2e/pages/adf/dialog/createLibraryDialog.ts @@ -35,7 +35,7 @@ export class CreateLibraryDialog { async getSelectedRadio(): Promise { const radio: ElementFinder = element(by.css('.mat-radio-button[class*="checked"]')); - return await BrowserActions.getText(radio); + return BrowserActions.getText(radio); } async waitForDialogToOpen(): Promise { @@ -47,27 +47,27 @@ export class CreateLibraryDialog { } async isDialogOpen(): Promise { - return await browser.isElementPresent(this.libraryDialog); + return browser.isElementPresent(this.libraryDialog); } async getTitle(): Promise { - return await BrowserActions.getText(this.libraryTitle); + return BrowserActions.getText(this.libraryTitle); } async getLibraryIdText(): Promise { - return await this.libraryIdField.getAttribute('value'); + return this.libraryIdField.getAttribute('value'); } async isErrorMessageDisplayed(): Promise { - return await this.errorMessage.isDisplayed(); + return this.errorMessage.isDisplayed(); } async getErrorMessage(): Promise { - return await BrowserActions.getText(this.errorMessage); + return BrowserActions.getText(this.errorMessage); } async getErrorMessages(position): Promise { - return await BrowserActions.getText(this.errorMessages.get(position)); + return BrowserActions.getText(this.errorMessages.get(position)); } async waitForLibraryNameHint(): Promise { @@ -75,39 +75,39 @@ export class CreateLibraryDialog { } async getLibraryNameHint(): Promise { - return await BrowserActions.getText(this.libraryNameHint); + return BrowserActions.getText(this.libraryNameHint); } async isNameDisplayed(): Promise { - return await this.libraryNameField.isDisplayed(); + return this.libraryNameField.isDisplayed(); } async isLibraryIdDisplayed(): Promise { - return await this.libraryIdField.isDisplayed(); + return this.libraryIdField.isDisplayed(); } async isDescriptionDisplayed(): Promise { - return await this.libraryDescriptionField.isDisplayed(); + return this.libraryDescriptionField.isDisplayed(); } async isPublicDisplayed(): Promise { - return await this.publicRadioButton.isDisplayed(); + return this.publicRadioButton.isDisplayed(); } async isModeratedDisplayed(): Promise { - return await this.moderatedRadioButton.isDisplayed(); + return this.moderatedRadioButton.isDisplayed(); } async isPrivateDisplayed(): Promise { - return await this.privateRadioButton.isDisplayed(); + return this.privateRadioButton.isDisplayed(); } async isCreateEnabled(): Promise { - return await this.createButton.isEnabled(); + return this.createButton.isEnabled(); } async isCancelEnabled(): Promise { - return await this.cancelButton.isEnabled(); + return this.cancelButton.isEnabled(); } async clickCreate(): Promise { diff --git a/e2e/pages/adf/dialog/folderDialog.ts b/e2e/pages/adf/dialog/folderDialog.ts index fef5cb7ae5..99173dd60b 100644 --- a/e2e/pages/adf/dialog/folderDialog.ts +++ b/e2e/pages/adf/dialog/folderDialog.ts @@ -28,7 +28,7 @@ export class FolderDialog { validationMessage: ElementFinder = this.folderDialog.element(by.css('div.mat-form-field-subscript-wrapper mat-hint span')); async getDialogTitle(): Promise { - return await BrowserActions.getText(this.folderTitle); + return BrowserActions.getText(this.folderTitle); } async checkFolderDialogIsDisplayed(): Promise { @@ -62,11 +62,11 @@ export class FolderDialog { } async getFolderName(): Promise { - return await this.folderNameField.getAttribute('value'); + return this.folderNameField.getAttribute('value'); } async getValidationMessage(): Promise { - return await BrowserActions.getText(this.validationMessage); + return BrowserActions.getText(this.validationMessage); } async checkValidationMessageIsNotDisplayed(): Promise { diff --git a/e2e/pages/adf/dialog/searchDialog.ts b/e2e/pages/adf/dialog/searchDialog.ts index 4bd61d643d..0e3fc1ee0b 100644 --- a/e2e/pages/adf/dialog/searchDialog.ts +++ b/e2e/pages/adf/dialog/searchDialog.ts @@ -84,15 +84,15 @@ export class SearchDialog { } async getSpecificRowsHighlightName(name): Promise { - return await BrowserActions.getText(this.getRowByRowName(name).element(this.highlightName)); + return BrowserActions.getText(this.getRowByRowName(name).element(this.highlightName)); } async getSpecificRowsCompleteName(name): Promise { - return await BrowserActions.getText(this.getRowByRowName(name).element(this.completeName)); + return BrowserActions.getText(this.getRowByRowName(name).element(this.completeName)); } async getSpecificRowsAuthor(name): Promise { - return await BrowserActions.getText(this.getRowByRowName(name).element(this.rowsAuthor)); + return BrowserActions.getText(this.getRowByRowName(name).element(this.rowsAuthor)); } async clearText(): Promise { diff --git a/e2e/pages/adf/dialog/shareDialog.ts b/e2e/pages/adf/dialog/shareDialog.ts index f484e5290a..13e7aed2db 100644 --- a/e2e/pages/adf/dialog/shareDialog.ts +++ b/e2e/pages/adf/dialog/shareDialog.ts @@ -61,7 +61,7 @@ export class ShareDialog { async getShareLink(): Promise { await BrowserVisibility.waitUntilElementIsVisible(this.shareLink); - return await this.shareLink.getAttribute('value'); + return this.shareLink.getAttribute('value'); } async clickCloseButton(): Promise { @@ -120,7 +120,7 @@ export class ShareDialog { } async getExpirationDate(): Promise { - return await this.expirationDateInput.getAttribute('value'); + return this.expirationDateInput.getAttribute('value'); } async expirationDateInputHasValue(value): Promise { diff --git a/e2e/pages/adf/dialog/uploadDialog.ts b/e2e/pages/adf/dialog/uploadDialog.ts index 9492568231..cb4d8a952e 100644 --- a/e2e/pages/adf/dialog/uploadDialog.ts +++ b/e2e/pages/adf/dialog/uploadDialog.ts @@ -107,7 +107,7 @@ export class UploadDialog { async getTitleText(): Promise { await BrowserVisibility.waitUntilElementIsVisible(this.title); - return await this.title.getText(); + return this.title.getText(); } async getConfirmationDialogTitleText(): Promise { @@ -152,7 +152,7 @@ export class UploadDialog { } async getTooltip(): Promise { - return await BrowserActions.getText(this.errorTooltip); + return BrowserActions.getText(this.errorTooltip); } } diff --git a/e2e/pages/adf/iconsPage.ts b/e2e/pages/adf/iconsPage.ts index 517a2dd182..7ee21b2751 100644 --- a/e2e/pages/adf/iconsPage.ts +++ b/e2e/pages/adf/iconsPage.ts @@ -30,7 +30,7 @@ export class IconsPage { async isCustomIconDisplayed(name) { const present = await browser.isElementPresent(this.locateCustomIcon(name)); if (present) { - return await this.locateCustomIcon(name).isDisplayed(); + return this.locateCustomIcon(name).isDisplayed(); } else { return false; } @@ -39,7 +39,7 @@ export class IconsPage { async isLigatureIconDisplayed(name) { const present = await browser.isElementPresent(this.locateLigatureIcon(name)); if (present) { - return await this.locateLigatureIcon(name).isDisplayed(); + return this.locateLigatureIcon(name).isDisplayed(); } else { return false; } diff --git a/e2e/pages/adf/metadataViewPage.ts b/e2e/pages/adf/metadataViewPage.ts index 7612d7266c..d4919abcc6 100644 --- a/e2e/pages/adf/metadataViewPage.ts +++ b/e2e/pages/adf/metadataViewPage.ts @@ -47,51 +47,51 @@ export class MetadataViewPage { applyAspect: ElementFinder = element(by.cssContainingText(`button span.mat-button-wrapper`, 'Apply Aspect')); async getTitle(): Promise { - return await BrowserActions.getText(this.title); + return BrowserActions.getText(this.title); } async getExpandedAspectName(): Promise { - return await BrowserActions.getText(this.expandedAspect.element(this.aspectTitle)); + return BrowserActions.getText(this.expandedAspect.element(this.aspectTitle)); } async getName(): Promise { - return await BrowserActions.getText(this.name); + return BrowserActions.getText(this.name); } async getCreator(): Promise { - return await BrowserActions.getText(this.creator); + return BrowserActions.getText(this.creator); } async getCreatedDate(): Promise { - return await BrowserActions.getText(this.createdDate); + return BrowserActions.getText(this.createdDate); } async getModifier(): Promise { - return await BrowserActions.getText(this.modifier); + return BrowserActions.getText(this.modifier); } async getModifiedDate(): Promise { - return await BrowserActions.getText(this.modifiedDate); + return BrowserActions.getText(this.modifiedDate); } async getMimetypeName(): Promise { - return await BrowserActions.getText(this.mimetypeName); + return BrowserActions.getText(this.mimetypeName); } async getSize(): Promise { - return await BrowserActions.getText(this.size); + return BrowserActions.getText(this.size); } async getDescription(): Promise { - return await BrowserActions.getText(this.description); + return BrowserActions.getText(this.description); } async getAuthor(): Promise { - return await BrowserActions.getText(this.author); + return BrowserActions.getText(this.author); } async getTitleProperty(): Promise { - return await BrowserActions.getText(this.titleProperty); + return BrowserActions.getText(this.titleProperty); } async editIconIsDisplayed(): Promise { @@ -119,11 +119,11 @@ export class MetadataViewPage { } async getInformationButtonText(): Promise { - return await BrowserActions.getText(this.informationSpan); + return BrowserActions.getText(this.informationSpan); } async getInformationIconText(): Promise { - return await BrowserActions.getText(this.informationIcon); + return BrowserActions.getText(this.informationIcon); } async clickOnPropertiesTab(): Promise { @@ -132,7 +132,7 @@ export class MetadataViewPage { } async getEditIconTooltip(): Promise { - return await this.editIcon.getAttribute('title'); + return this.editIcon.getAttribute('title'); } async editPropertyIconIsDisplayed(propertyName: string) { @@ -179,7 +179,7 @@ export class MetadataViewPage { const propertyType = type || 'textitem'; const textField: ElementFinder = element(by.css('span[data-automation-id="card-' + propertyType + '-value-' + propertyName + '"]')); - return await BrowserActions.getText(textField); + return BrowserActions.getText(textField); } async clearPropertyIconIsDisplayed(propertyName: string): Promise { @@ -194,7 +194,7 @@ export class MetadataViewPage { async getPropertyIconTooltip(propertyName: string): Promise { const editPropertyIcon: ElementFinder = element(by.css('button[data-automation-id="card-textitem-edit-icon-' + propertyName + '"]')); - return await editPropertyIcon.getAttribute('title'); + return editPropertyIcon.getAttribute('title'); } async clickMetadataGroup(groupName: string): Promise { @@ -226,7 +226,7 @@ export class MetadataViewPage { async getMetadataGroupTitle(groupName: string): Promise { const group = element(by.css('mat-expansion-panel[data-automation-id="adf-metadata-group-' + groupName + '"] > mat-expansion-panel-header > span > mat-panel-title')); - return await BrowserActions.getText(group); + return BrowserActions.getText(group); } async checkPropertyIsVisible(propertyName: string, type: string): Promise { diff --git a/e2e/pages/adf/permissionsPage.ts b/e2e/pages/adf/permissionsPage.ts index 96f58559b2..380422ec90 100644 --- a/e2e/pages/adf/permissionsPage.ts +++ b/e2e/pages/adf/permissionsPage.ts @@ -100,7 +100,7 @@ export class PermissionsPage { } async getPermissionInheritedButtonText(): Promise { - return await BrowserActions.getText(this.permissionInheritedButton); + return BrowserActions.getText(this.permissionInheritedButton); } async checkPermissionsDatatableIsDisplayed(): Promise { @@ -109,7 +109,7 @@ export class PermissionsPage { async getRoleCellValue(rowName): Promise { const locator = this.dataTableComponentPage.getCellByRowContentAndColumn('Authority ID', rowName, column.role); - return await BrowserActions.getText(locator); + return BrowserActions.getText(locator); } async clickRoleDropdownByUserOrGroupName(name): Promise { diff --git a/e2e/pages/adf/process-services/filtersPage.ts b/e2e/pages/adf/process-services/filtersPage.ts index 48be289bf9..9fb1df58a6 100644 --- a/e2e/pages/adf/process-services/filtersPage.ts +++ b/e2e/pages/adf/process-services/filtersPage.ts @@ -38,7 +38,7 @@ export class FiltersPage { } async getAllRowsNameColumn() { - return await this.dataTable.getAllRowsColumnValues('Name'); + return this.dataTable.getAllRowsColumnValues('Name'); } } diff --git a/e2e/pages/adf/process-services/processFiltersPage.ts b/e2e/pages/adf/process-services/processFiltersPage.ts index 626b39f0a4..4f631290c7 100644 --- a/e2e/pages/adf/process-services/processFiltersPage.ts +++ b/e2e/pages/adf/process-services/processFiltersPage.ts @@ -85,7 +85,7 @@ export class ProcessFiltersPage { } async numberOfProcessRows(): Promise { - return await element.all(this.rows).count(); + return element.all(this.rows).count(); } async waitForTableBody(): Promise { @@ -102,7 +102,7 @@ export class ProcessFiltersPage { } async getAllRowsNameColumn() { - return await this.dataTable.getAllRowsColumnValues('Name'); + return this.dataTable.getAllRowsColumnValues('Name'); } async checkFilterIsDisplayed(name): Promise { @@ -120,7 +120,7 @@ export class ProcessFiltersPage { const filterName: ElementFinder = element(by.css(`span[data-automation-id='${name}_filter']`)); await BrowserVisibility.waitUntilElementIsVisible(filterName); const icon = filterName.element(this.processIcon); - return await BrowserActions.getText(icon); + return BrowserActions.getText(icon); } async checkFilterIsNotDisplayed(name): Promise { diff --git a/e2e/pages/adf/process-services/taskDetailsPage.ts b/e2e/pages/adf/process-services/taskDetailsPage.ts index 8d1894584d..175adc15d7 100644 --- a/e2e/pages/adf/process-services/taskDetailsPage.ts +++ b/e2e/pages/adf/process-services/taskDetailsPage.ts @@ -372,7 +372,7 @@ export class TaskDetailsPage { } async isCompleteButtonWithFormEnabled(): Promise { - return await this.completeFormTask.isEnabled(); + return this.completeFormTask.isEnabled(); } } diff --git a/e2e/pages/adf/process-services/tasksPage.ts b/e2e/pages/adf/process-services/tasksPage.ts index 6404f965b4..582111ef42 100644 --- a/e2e/pages/adf/process-services/tasksPage.ts +++ b/e2e/pages/adf/process-services/tasksPage.ts @@ -141,11 +141,11 @@ export class TasksPage { } async clickSortByNameAsc(): Promise { - return await this.tasksListPage().getDataTable().sortByColumn('ASC', 'name'); + return this.tasksListPage().getDataTable().sortByColumn('ASC', 'name'); } async clickSortByNameDesc(): Promise { - return await this.tasksListPage().getDataTable().sortByColumn('DESC', 'name'); + return this.tasksListPage().getDataTable().sortByColumn('DESC', 'name'); } } diff --git a/e2e/pages/adf/searchFiltersPage.ts b/e2e/pages/adf/searchFiltersPage.ts index 1c06415920..e9398bed28 100644 --- a/e2e/pages/adf/searchFiltersPage.ts +++ b/e2e/pages/adf/searchFiltersPage.ts @@ -120,11 +120,11 @@ export class SearchFiltersPage { } async isTypeFacetQueryGroupPresent(): Promise { - return await this.facetQueriesTypeGroup.isPresent(); + return this.facetQueriesTypeGroup.isPresent(); } async isSizeFacetQueryGroupPresent(): Promise { - return await this.facetQueriesSizeGroup.isPresent(); + return this.facetQueriesSizeGroup.isPresent(); } async clickCheckListFilter(): Promise { diff --git a/e2e/pages/adf/searchResultsPage.ts b/e2e/pages/adf/searchResultsPage.ts index 0707b2c49e..8f44852e74 100644 --- a/e2e/pages/adf/searchResultsPage.ts +++ b/e2e/pages/adf/searchResultsPage.ts @@ -40,7 +40,7 @@ export class SearchResultsPage { } async numberOfResultsDisplayed(): Promise { - return await this.dataTable.numberOfRows(); + return this.dataTable.numberOfRows(); } async checkContentIsNotDisplayed(content): Promise { diff --git a/e2e/pages/adf/tagPage.ts b/e2e/pages/adf/tagPage.ts index 7e3e39f56e..318af34263 100644 --- a/e2e/pages/adf/tagPage.ts +++ b/e2e/pages/adf/tagPage.ts @@ -37,7 +37,7 @@ export class TagPage { async getNodeId(): Promise { await BrowserVisibility.waitUntilElementIsVisible(this.insertNodeIdElement); - return await this.insertNodeIdElement.getAttribute('value'); + return this.insertNodeIdElement.getAttribute('value'); } async insertNodeId(nodeId) { @@ -72,17 +72,17 @@ export class TagPage { async getNewTagInput(): Promise { await BrowserVisibility.waitUntilElementIsVisible(this.newTagInput); - return await this.newTagInput.getAttribute('value'); + return this.newTagInput.getAttribute('value'); } async getNewTagPlaceholder(): Promise { await BrowserVisibility.waitUntilElementIsVisible(this.newTagInput); - return await this.newTagInput.getAttribute('placeholder'); + return this.newTagInput.getAttribute('placeholder'); } async addTagButtonIsEnabled(): Promise { await BrowserVisibility.waitUntilElementIsVisible(this.addTagButton); - return await this.addTagButton.isEnabled(); + return this.addTagButton.isEnabled(); } async checkTagIsDisplayedInTagList(tagName): Promise { @@ -119,7 +119,7 @@ export class TagPage { } async getErrorMessage(): Promise { - return await BrowserActions.getText(this.errorMessage); + return BrowserActions.getText(this.errorMessage); } async checkTagListIsOrderedAscending(): Promise { @@ -181,7 +181,7 @@ export class TagPage { } async checkTagsOnList(): Promise { - return await this.tagsOnPage.count(); + return this.tagsOnPage.count(); } async checkShowLessButtonIsDisplayed(): Promise { diff --git a/e2e/pages/adf/trashcanPage.ts b/e2e/pages/adf/trashcanPage.ts index 1d57bbba98..f3f0e7f6a6 100644 --- a/e2e/pages/adf/trashcanPage.ts +++ b/e2e/pages/adf/trashcanPage.ts @@ -29,7 +29,7 @@ export class TrashcanPage { restoreButton: ElementFinder = element(by.css(`button[title='Restore']`)); async numberOfResultsDisplayed(): Promise { - return await element.all(this.rows).count(); + return element.all(this.rows).count(); } async waitForTableBody(): Promise { diff --git a/e2e/pages/adf/versionManagerPage.ts b/e2e/pages/adf/versionManagerPage.ts index f50b63e5f3..f9b6b27df4 100644 --- a/e2e/pages/adf/versionManagerPage.ts +++ b/e2e/pages/adf/versionManagerPage.ts @@ -52,7 +52,7 @@ export class VersionManagePage { async getFileVersionName(version): Promise { const fileElement: ElementFinder = element(by.css(`[id="adf-version-list-item-name-${version}"]`)); - return await BrowserActions.getText(fileElement); + return BrowserActions.getText(fileElement); } async checkFileVersionExist(version): Promise { @@ -67,12 +67,12 @@ export class VersionManagePage { async getFileVersionComment(version): Promise { const fileComment: ElementFinder = element(by.id(`adf-version-list-item-comment-${version}`)); - return await BrowserActions.getText(fileComment); + return BrowserActions.getText(fileComment); } async getFileVersionDate(version): Promise { const fileDate: ElementFinder = element(by.id(`adf-version-list-item-date-${version}`)); - return await BrowserActions.getText(fileDate); + return BrowserActions.getText(fileDate); } async enterCommentText(text): Promise { diff --git a/lib/core/services/log.service.spec.ts b/lib/core/services/log.service.spec.ts index 8a4732fea5..0a7370b95f 100644 --- a/lib/core/services/log.service.spec.ts +++ b/lib/core/services/log.service.spec.ts @@ -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; - let appConfigService: AppConfigService; + let providesLogComponent: ComponentFixture; + 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(); - }); + }); }); diff --git a/lib/core/viewer/services/view-util.service.ts b/lib/core/viewer/services/view-util.service.ts index ffaf1b0b72..0b8a1dbb41 100644 --- a/lib/core/viewer/services/view-util.service.ts +++ b/lib/core/viewer/services/view-util.service.ts @@ -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); } } diff --git a/lib/process-services-cloud/src/lib/task/start-task/components/people-cloud/people-cloud.component.ts b/lib/process-services-cloud/src/lib/task/start-task/components/people-cloud/people-cloud.component.ts index 2412b8cd2b..c64b5f2632 100644 --- a/lib/process-services-cloud/src/lib/task/start-task/components/people-cloud/people-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/task/start-task/components/people-cloud/people-cloud.component.ts @@ -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([]); diff --git a/lib/testing/src/lib/content-services/dialog/content-node-selector-dialog.page.ts b/lib/testing/src/lib/content-services/dialog/content-node-selector-dialog.page.ts index b1b58d7416..09c04f50bb 100644 --- a/lib/testing/src/lib/content-services/dialog/content-node-selector-dialog.page.ts +++ b/lib/testing/src/lib/content-services/dialog/content-node-selector-dialog.page.ts @@ -39,7 +39,7 @@ export class ContentNodeSelectorDialogPage { } async getDialogHeaderText(): Promise { - return await BrowserActions.getText(this.header); + return BrowserActions.getText(this.header); } async checkSearchInputIsDisplayed(): Promise { @@ -47,7 +47,7 @@ export class ContentNodeSelectorDialogPage { } async getSearchLabel(): Promise { - return await BrowserActions.getText(this.searchLabel); + return BrowserActions.getText(this.searchLabel); } async checkSelectedSiteIsDisplayed(siteName): Promise { @@ -63,11 +63,11 @@ export class ContentNodeSelectorDialogPage { } async checkCancelButtonIsEnabled(): Promise { - return await this.cancelButton.isEnabled(); + return this.cancelButton.isEnabled(); } async checkCopyMoveButtonIsEnabled(): Promise { - return await this.moveCopyButton.isEnabled(); + return this.moveCopyButton.isEnabled(); } async checkMoveCopyButtonIsDisplayed(): Promise { @@ -75,7 +75,7 @@ export class ContentNodeSelectorDialogPage { } async getMoveCopyButtonText(): Promise { - return await BrowserActions.getText(this.moveCopyButton); + return BrowserActions.getText(this.moveCopyButton); } async clickMoveCopyButton(): Promise { @@ -83,7 +83,7 @@ export class ContentNodeSelectorDialogPage { } async numberOfResultsDisplayed(): Promise { - return await this.contentList.dataTablePage().numberOfRows(); + return this.contentList.dataTablePage().numberOfRows(); } async typeIntoNodeSelectorSearchField(text): Promise { diff --git a/lib/testing/src/lib/content-services/pages/document-list.page.ts b/lib/testing/src/lib/content-services/pages/document-list.page.ts index 1bdd25c94c..e2ffaeb3f2 100644 --- a/lib/testing/src/lib/content-services/pages/document-list.page.ts +++ b/lib/testing/src/lib/content-services/pages/document-list.page.ts @@ -50,7 +50,7 @@ export class DocumentListPage { } async getTooltip(nodeName: string): Promise { - return await this.dataTable.getTooltip('Display name', nodeName); + return this.dataTable.getTooltip('Display name', nodeName); } async selectRow(nodeName: string): Promise { @@ -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 { diff --git a/lib/testing/src/lib/content-services/pages/search/date-range-filter.page.ts b/lib/testing/src/lib/content-services/pages/search/date-range-filter.page.ts index 5e9766f3a0..b7475bd754 100644 --- a/lib/testing/src/lib/content-services/pages/search/date-range-filter.page.ts +++ b/lib/testing/src/lib/content-services/pages/search/date-range-filter.page.ts @@ -37,7 +37,7 @@ export class DateRangeFilterPage { } async getFromDate(): Promise { - return await this.filter.element(this.fromField).getAttribute('value'); + return this.filter.element(this.fromField).getAttribute('value'); } async putFromDate(date): Promise { @@ -91,7 +91,7 @@ export class DateRangeFilterPage { } async getToDate(): Promise { - return await this.filter.element(this.toField).getAttribute('value'); + return this.filter.element(this.toField).getAttribute('value'); } async putToDate(date): Promise { diff --git a/lib/testing/src/lib/content-services/pages/search/number-range-filter.page.ts b/lib/testing/src/lib/content-services/pages/search/number-range-filter.page.ts index 76d9ebe563..74188e38a4 100644 --- a/lib/testing/src/lib/content-services/pages/search/number-range-filter.page.ts +++ b/lib/testing/src/lib/content-services/pages/search/number-range-filter.page.ts @@ -40,7 +40,7 @@ export class NumberRangeFilterPage { } async getFromNumber(): Promise { - return await this.filter.element(this.fromInput).getAttribute('value'); + return this.filter.element(this.fromInput).getAttribute('value'); } async putFromNumber(value): Promise { @@ -50,7 +50,7 @@ export class NumberRangeFilterPage { } async getFromErrorRequired(): Promise { - return await BrowserActions.getText(this.filter.element(this.fromErrorRequired)); + return BrowserActions.getText(this.filter.element(this.fromErrorRequired)); } async checkFromErrorRequiredIsDisplayed(): Promise { @@ -58,7 +58,7 @@ export class NumberRangeFilterPage { } async getFromErrorInvalid(): Promise { - return await BrowserActions.getText(this.filter.element(this.fromErrorInvalid)); + return BrowserActions.getText(this.filter.element(this.fromErrorInvalid)); } async checkFromErrorInvalidIsDisplayed(): Promise { @@ -75,7 +75,7 @@ export class NumberRangeFilterPage { } async getToNumber(): Promise { - return await this.filter.element(this.toInput).getAttribute('value'); + return this.filter.element(this.toInput).getAttribute('value'); } async putToNumber(value): Promise { @@ -85,7 +85,7 @@ export class NumberRangeFilterPage { } async getToErrorRequired(): Promise { - return await BrowserActions.getText(this.filter.element(this.toErrorRequired)); + return BrowserActions.getText(this.filter.element(this.toErrorRequired)); } async checkToErrorRequiredIsDisplayed(): Promise { @@ -93,7 +93,7 @@ export class NumberRangeFilterPage { } async getToErrorInvalid(): Promise { - return await BrowserActions.getText(this.filter.element(this.toErrorInvalid)); + return BrowserActions.getText(this.filter.element(this.toErrorInvalid)); } async checkToErrorInvalidIsDisplayed(): Promise { @@ -113,7 +113,7 @@ export class NumberRangeFilterPage { } async checkApplyButtonIsEnabled(): Promise { - return await this.filter.element(this.applyButton).isEnabled(); + return this.filter.element(this.applyButton).isEnabled(); } async clickClearButton(): Promise { diff --git a/lib/testing/src/lib/content-services/pages/search/search-slider.page.ts b/lib/testing/src/lib/content-services/pages/search/search-slider.page.ts index c152916778..5edd5c6852 100644 --- a/lib/testing/src/lib/content-services/pages/search/search-slider.page.ts +++ b/lib/testing/src/lib/content-services/pages/search/search-slider.page.ts @@ -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 { @@ -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 { diff --git a/lib/testing/src/lib/core/pages/data-table-component.page.ts b/lib/testing/src/lib/core/pages/data-table-component.page.ts index 7aff53df03..b1c3de65d1 100644 --- a/lib/testing/src/lib/core/pages/data-table-component.page.ts +++ b/lib/testing/src/lib/core/pages/data-table-component.page.ts @@ -81,7 +81,7 @@ export class DataTableComponentPage { } async getNumberOfSelectedRows(): Promise { - return await this.allSelectedRows.count(); + return this.allSelectedRows.count(); } async selectRow(columnName, columnValue): Promise { @@ -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 { - return await this.getCellElementByValue(columnName, columnValue).getAttribute('title'); + return this.getCellElementByValue(columnName, columnValue).getAttribute('title'); } async rightClickOnRowByIndex(index: number): Promise { @@ -160,15 +160,15 @@ export class DataTableComponentPage { } async numberOfRows(): Promise { - 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 { 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 { 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 { - return await this.allColumns.count(); + return this.allColumns.count(); } async getNumberOfRows(): Promise { - return await this.list.count(); + return this.list.count(); } getCellByRowNumberAndColumnName(rowNumber, columnName): ElementFinder { @@ -333,7 +333,7 @@ export class DataTableComponentPage { } async getCopyContentTooltip(): Promise { - return await BrowserActions.getText(this.copyColumnTooltip); + return BrowserActions.getText(this.copyColumnTooltip); } async copyContentTooltipIsNotDisplayed(): Promise { diff --git a/lib/testing/src/lib/core/pages/form/widgets/amountWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/amountWidget.ts index 91cb483dd9..05e1cf3338 100644 --- a/lib/testing/src/lib/core/pages/form/widgets/amountWidget.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/amountWidget.ts @@ -31,7 +31,7 @@ export class AmountWidget { async getAmountFieldCurrency(fieldId): Promise { 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 { diff --git a/lib/testing/src/lib/core/pages/login.page.ts b/lib/testing/src/lib/core/pages/login.page.ts index 6797394924..669400b58a 100644 --- a/lib/testing/src/lib/core/pages/login.page.ts +++ b/lib/testing/src/lib/core/pages/login.page.ts @@ -127,7 +127,7 @@ export class LoginPage { async getSignInButtonIsEnabled(): Promise { await BrowserVisibility.waitUntilElementIsVisible(this.signInButton); - return await this.signInButton.isEnabled(); + return this.signInButton.isEnabled(); } async loginToAllUsingUserModel(userModel): Promise { diff --git a/lib/testing/src/lib/core/pages/settings.page.ts b/lib/testing/src/lib/core/pages/settings.page.ts index 2fef54a23d..5c50cf3394 100644 --- a/lib/testing/src/lib/core/pages/settings.page.ts +++ b/lib/testing/src/lib/core/pages/settings.page.ts @@ -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() { diff --git a/lib/testing/src/lib/core/pages/viewerPage.ts b/lib/testing/src/lib/core/pages/viewerPage.ts index 7838b24e9f..2df678d2fb 100644 --- a/lib/testing/src/lib/core/pages/viewerPage.ts +++ b/lib/testing/src/lib/core/pages/viewerPage.ts @@ -118,20 +118,20 @@ export class ViewerPage { } async getZoom(): Promise { - return await BrowserActions.getText(this.percentage); + return BrowserActions.getText(this.percentage); } async getCanvasWidth(): Promise { - return await this.canvasLayer.getAttribute(`width`); + return this.canvasLayer.getAttribute(`width`); } async getCanvasHeight(): Promise { - return await this.canvasLayer.getAttribute(`height`); + return this.canvasLayer.getAttribute(`height`); } async getDisplayedFileName(): Promise { await BrowserVisibility.waitUntilElementIsVisible(this.fileName); - return await BrowserActions.getText(this.fileName); + return BrowserActions.getText(this.fileName); } async exitFullScreen(): Promise { @@ -209,11 +209,11 @@ export class ViewerPage { } async getLastButtonTitle(): Promise { - return await this.lastButton.getAttribute('title'); + return this.lastButton.getAttribute('title'); } async getMoreActionsMenuTitle(): Promise { - return await this.moreActionsMenu.getAttribute('title'); + return this.moreActionsMenu.getAttribute('title'); } async checkDownloadButtonIsDisplayed(): Promise { @@ -428,7 +428,7 @@ export class ViewerPage { } async getActiveTab(): Promise { - return await BrowserActions.getText(this.activeTab); + return BrowserActions.getText(this.activeTab); } async clickOnCommentsTab(): Promise { @@ -617,12 +617,12 @@ export class ViewerPage { async getTabLabelById(index: number): Promise { 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 { 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 { @@ -631,6 +631,6 @@ export class ViewerPage { async getUnknownFormatMessage(): Promise { const unknownFormatLabel = this.unknownFormat.element(by.css(`.label`)); - return await BrowserActions.getText(unknownFormatLabel); + return BrowserActions.getText(unknownFormatLabel); } } diff --git a/lib/testing/src/lib/core/utils/browser-actions.ts b/lib/testing/src/lib/core/utils/browser-actions.ts index be7f499965..742fa2cb3b 100644 --- a/lib/testing/src/lib/core/utils/browser-actions.ts +++ b/lib/testing/src/lib/core/utils/browser-actions.ts @@ -72,7 +72,7 @@ export class BrowserActions { static async getColor(elementFinder: ElementFinder): Promise { await BrowserVisibility.waitUntilElementIsVisible(elementFinder); const webElem = await elementFinder.getWebElement(); - return await webElem.getCssValue('color'); + return webElem.getCssValue('color'); } static async clearWithBackSpace(elementFinder: ElementFinder) { diff --git a/lib/testing/src/lib/material/pages/date-picker.page.ts b/lib/testing/src/lib/material/pages/date-picker.page.ts index 7cf745ebce..e828233dd5 100644 --- a/lib/testing/src/lib/material/pages/date-picker.page.ts +++ b/lib/testing/src/lib/material/pages/date-picker.page.ts @@ -27,7 +27,7 @@ export class DatePickerPage { previousMonthButton: ElementFinder = element(by.css('button[class*="mat-calendar-previous-button"]')); async getSelectedDate(): Promise { - 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 { diff --git a/lib/testing/src/lib/process-services-cloud/app/app-list-cloud.page.ts b/lib/testing/src/lib/process-services-cloud/app/app-list-cloud.page.ts index f347582ea0..36c86667d1 100644 --- a/lib/testing/src/lib/process-services-cloud/app/app-list-cloud.page.ts +++ b/lib/testing/src/lib/process-services-cloud/app/app-list-cloud.page.ts @@ -41,7 +41,7 @@ export class AppListCloudPage { } async getNameOfTheApplications(): Promise { - return await BrowserActions.getArrayText(this.nameOfAllApps); + return BrowserActions.getArrayText(this.nameOfAllApps); } async checkAppIsNotDisplayed(applicationName): Promise { diff --git a/lib/testing/src/lib/process-services-cloud/pages/edit-process-filter-cloud-component.page.ts b/lib/testing/src/lib/process-services-cloud/pages/edit-process-filter-cloud-component.page.ts index 7d844a3133..ae98b34d4e 100644 --- a/lib/testing/src/lib/process-services-cloud/pages/edit-process-filter-cloud-component.page.ts +++ b/lib/testing/src/lib/process-services-cloud/pages/edit-process-filter-cloud-component.page.ts @@ -36,7 +36,7 @@ export class EditProcessFilterCloudComponentPage { } async isFilterDisplayed(): Promise { - return await BrowserVisibility.waitUntilElementIsVisible(this.filter); + return BrowserVisibility.waitUntilElementIsVisible(this.filter); } async openFilter(): Promise { @@ -71,7 +71,7 @@ export class EditProcessFilterCloudComponentPage { async getSortFilterDropDownValue(): Promise { 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 { @@ -100,7 +100,7 @@ export class EditProcessFilterCloudComponentPage { async getApplicationSelected(): Promise { const applicationDropdown = element(by.css(`[data-automation-id='adf-cloud-edit-process-property-appName']`)); - return await applicationDropdown.getText(); + return applicationDropdown.getText(); } async checkAppNamesAreUnique(): Promise { @@ -121,7 +121,7 @@ export class EditProcessFilterCloudComponentPage { async isApplicationListLoaded(): Promise { 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 { diff --git a/lib/testing/src/lib/process-services-cloud/pages/edit-task-filter-cloud-component.page.ts b/lib/testing/src/lib/process-services-cloud/pages/edit-task-filter-cloud-component.page.ts index 5d45d3cd3e..982af86802 100644 --- a/lib/testing/src/lib/process-services-cloud/pages/edit-task-filter-cloud-component.page.ts +++ b/lib/testing/src/lib/process-services-cloud/pages/edit-task-filter-cloud-component.page.ts @@ -47,7 +47,7 @@ export class EditTaskFilterCloudComponentPage { } async isFilterDisplayed(): Promise { - return await BrowserVisibility.waitUntilElementIsVisible(this.filter); + return BrowserVisibility.waitUntilElementIsVisible(this.filter); } async openFilter(): Promise { diff --git a/lib/testing/src/lib/process-services-cloud/pages/process-list-cloud-component.page.ts b/lib/testing/src/lib/process-services-cloud/pages/process-list-cloud-component.page.ts index 2e5b636ddc..a9bca8e3aa 100644 --- a/lib/testing/src/lib/process-services-cloud/pages/process-list-cloud-component.page.ts +++ b/lib/testing/src/lib/process-services-cloud/pages/process-list-cloud-component.page.ts @@ -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 { diff --git a/lib/testing/src/lib/process-services-cloud/pages/task-list-cloud-component.page.ts b/lib/testing/src/lib/process-services-cloud/pages/task-list-cloud-component.page.ts index 40de34f74b..f300aac24b 100644 --- a/lib/testing/src/lib/process-services-cloud/pages/task-list-cloud-component.page.ts +++ b/lib/testing/src/lib/process-services-cloud/pages/task-list-cloud-component.page.ts @@ -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 { diff --git a/lib/testing/src/lib/process-services/pages/form-fields.page.ts b/lib/testing/src/lib/process-services/pages/form-fields.page.ts index bfb7a32fe2..2fe3185cef 100644 --- a/lib/testing/src/lib/process-services/pages/form-fields.page.ts +++ b/lib/testing/src/lib/process-services/pages/form-fields.page.ts @@ -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 { 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 { diff --git a/package.json b/package.json index b0c6e7f8c7..ac9e8ec360 100644 --- a/package.json +++ b/package.json @@ -198,7 +198,7 @@ "tsconfig-paths": "^3.8.0", "tsickle": "^0.34.0", "tslib": "^1.9.0", - "tslint": "5.9.1", + "tslint": "5.20.0", "tslint-consistent-codestyle": "^1.15.1", "typedoc": "^0.15.0", "typescript": "3.1.6", diff --git a/tslint.json b/tslint.json index 757058016a..80cd0964b8 100644 --- a/tslint.json +++ b/tslint.json @@ -87,6 +87,7 @@ "no-var-keyword": true, "no-var-requires": true, "object-literal-sort-keys": false, + "no-return-await": true, "one-line": [ true, "check-open-brace",