diff --git a/e2e/core/pages/content-services.page.ts b/e2e/core/pages/content-services.page.ts index d5cbfcb56e..c8b5e6d777 100644 --- a/e2e/core/pages/content-services.page.ts +++ b/e2e/core/pages/content-services.page.ts @@ -49,7 +49,6 @@ export class ContentServicesPage { multipleFileUploadToggle = $('#adf-document-list-enable-drop-files'); uploadBorder = $('#document-list-container'); - contentServices = $('.app-sidenav-link[data-automation-id="Content Services"]'); currentFolder = $('div[class*="adf-breadcrumb-item adf-active"] div'); createFolderButton = $('button[data-automation-id="create-new-folder"]'); editFolderButton = $('button[data-automation-id="edit-folder"]'); @@ -60,20 +59,14 @@ export class ContentServicesPage { uploadFileButtonInput = $('input[data-automation-id="upload-single-file"]'); uploadMultipleFileButton = $('input[data-automation-id="upload-multiple-files"]'); uploadFolderButton = $('input[data-automation-id="uploadFolder"]'); - errorSnackBar = $('simple-snack-bar[class*="mat-simple-snackbar"]'); emptyPagination = $('adf-pagination[class*="adf-pagination__empty"]'); dragAndDrop = $$('adf-upload-drag-area div').first(); nameHeader = $$('div[data-automation-id="auto_header_content_id_name"] > span').first(); sizeHeader = $$('div[data-automation-id="auto_header_content_id_content.sizeInBytes"] > span').first(); createdByHeader = $$('div[data-automation-id="auto_header_content_id_createdByUser.displayName"] > span').first(); createdHeader = $$('div[data-automation-id="auto_header_content_id_createdAt"] > span').first(); - recentFiles = $('.app-container-recent'); - recentFilesExpanded = $('.app-container-recent mat-expansion-panel-header.mat-expanded'); - recentFilesClosed = $('.app-container-recent mat-expansion-panel-header'); - recentFileIcon = $('.app-container-recent mat-expansion-panel-header mat-icon'); emptyFolder = $('.adf-empty-folder-this-space-is-empty'); emptyFolderImage = $('.adf-empty-folder-image'); - emptyRecent = $('.app-container-recent .app-empty-list__title'); gridViewButton = $('button[data-automation-id="document-list-grid-view"]'); cardViewContainer = $('div.app-document-list-container div.adf-datatable-card'); shareNodeButton = element(by.cssContainingText('mat-icon', ' share ')); @@ -234,36 +227,6 @@ export class ContentServicesPage { return sorted; } - async checkRecentFileToBeShowed() { - await BrowserVisibility.waitUntilElementIsVisible(this.recentFiles); - } - - async expandRecentFiles(): Promise { - await this.checkRecentFileToBeShowed(); - await this.checkRecentFileToBeClosed(); - await BrowserActions.click(this.recentFilesClosed); - await this.checkRecentFileToBeOpened(); - } - - async closeRecentFiles(): Promise { - await this.checkRecentFileToBeShowed(); - await this.checkRecentFileToBeOpened(); - await BrowserActions.click(this.recentFilesExpanded); - await this.checkRecentFileToBeClosed(); - } - - async checkRecentFileToBeClosed(): Promise { - await BrowserVisibility.waitUntilElementIsVisible(this.recentFilesClosed); - } - - async checkRecentFileToBeOpened(): Promise { - await BrowserVisibility.waitUntilElementIsVisible(this.recentFilesExpanded); - } - - async getRecentFileIcon(): Promise { - return BrowserActions.getText(this.recentFileIcon); - } - // @deprecated prefer waitTillContentLoaded async checkDocumentListElementsAreDisplayed(): Promise { await this.checkAcsContainer(); @@ -286,10 +249,6 @@ export class ContentServicesPage { await this.contentList.dataTablePage().waitTillContentLoaded(); } - async clickOnContentServices(): Promise { - await BrowserActions.click(this.contentServices); - } - async numberOfResultsDisplayed(): Promise { return this.contentList.dataTablePage().numberOfRows(); } @@ -331,10 +290,6 @@ export class ContentServicesPage { return this.contentList.dataTablePage().checkListIsSorted(sortOrder, this.columns.createdBy); } - async checkListIsSortedBySizeColumn(sortOrder: string): Promise { - return this.contentList.dataTablePage().checkListIsSorted(sortOrder, this.columns.size); - } - async sortAndCheckListIsOrderedByAuthor(sortOrder: string): Promise { await this.sortByAuthor(sortOrder); return this.checkListIsSortedByAuthorColumn(sortOrder); @@ -460,11 +415,6 @@ export class ContentServicesPage { return BrowserActions.getAttribute(this.uploadMultipleFileButton, 'title'); } - async getFolderButtonTooltip(): Promise { - await BrowserVisibility.waitUntilElementIsPresent(this.uploadFolderButton); - return BrowserActions.getAttribute(this.uploadFolderButton, 'title'); - } - async checkUploadButton(): Promise { await BrowserVisibility.waitUntilElementIsClickable(this.uploadFileButton); } @@ -473,10 +423,6 @@ export class ContentServicesPage { return this.uploadFileButton.isEnabled(); } - async getErrorMessage(): Promise { - return BrowserActions.getText(this.errorSnackBar); - } - async enableInfiniteScrolling(): Promise { const infiniteScrollButton = element(by.cssContainingText('.mat-slide-toggle-content', 'Enable Infinite Scrolling')); await BrowserActions.click(infiniteScrollButton); @@ -532,11 +478,6 @@ export class ContentServicesPage { await DropActions.dropFile(this.dragAndDrop, file); } - async dragAndDropFolder(folderName: string): Promise { - await this.checkDragAndDropDIsDisplayed(); - await DropActions.dropFolder(this.dragAndDrop, folderName); - } - async checkLockIsDisplayedForElement(name): Promise { const lockButton = $(`div.adf-datatable-cell[data-automation-id="${name}"] button`); await BrowserVisibility.waitUntilElementIsVisible(lockButton); @@ -546,12 +487,6 @@ export class ContentServicesPage { return this.contentList.dataTablePage().getColumnValueForRow(this.columns.name, file, columnName); } - async getStyleValueForRowText(rowName, styleName): Promise { - const row = $(`div.adf-datatable-cell[data-automation-id="${rowName}"] span.adf-datatable-cell-value[title="${rowName}"]`); - await BrowserVisibility.waitUntilElementIsVisible(row); - return row.getCssValue(styleName); - } - async checkEmptyFolderTextToBe(text): Promise { await BrowserVisibility.waitUntilElementIsVisible(this.emptyFolder); await expect(await this.emptyFolder.getText()).toContain(text); @@ -561,10 +496,6 @@ export class ContentServicesPage { await expect(await BrowserActions.getAttribute(this.emptyFolderImage, 'src')).toContain(url); } - async checkEmptyRecentFileIsDisplayed(): Promise { - await BrowserVisibility.waitUntilElementIsVisible(this.emptyRecent); - } - async getRowIconImageUrl(fileName): Promise { const iconRow = $(`.app-document-list-container div.adf-datatable-cell[data-automation-id="${fileName}"] img`); return BrowserActions.getAttribute(iconRow, 'src'); diff --git a/e2e/search/components/search-sorting-picker.e2e.ts b/e2e/search/components/search-sorting-picker.e2e.ts index 2fd1e00626..5beadb5bbf 100644 --- a/e2e/search/components/search-sorting-picker.e2e.ts +++ b/e2e/search/components/search-sorting-picker.e2e.ts @@ -209,8 +209,8 @@ describe('Search Sorting Picker', () => { const nodeList = await getNodesDisplayed(numberOfElements, idList); const modifiedDateList = []; - for (let i = 0; i < nodeList.length; i++) { - modifiedDateList.push(new Date(nodeList[i].entry.modifiedAt)); + for (const item of nodeList) { + modifiedDateList.push(new Date(item.entry.modifiedAt)); } await expect(contentServices.checkElementsDateSortedAsc(modifiedDateList)).toBe(true); @@ -218,14 +218,12 @@ describe('Search Sorting Picker', () => { const getNodesDisplayed = async function(numberOfElements: number, idList: string[]) { const promises = []; - let nodeList; for (let i = 0; i < (numberOfElements - 1); i++) { if (idList[i] && idList[i].trim() !== '') { promises.push(nodesApi.getNode(idList[i])); } } - nodeList = await Promise.all(promises); - return nodeList; + return Promise.all(promises); }; }); diff --git a/e2e/search/search-page.e2e.ts b/e2e/search/search-page.e2e.ts index 25933be762..07428d4638 100644 --- a/e2e/search/search-page.e2e.ts +++ b/e2e/search/search-page.e2e.ts @@ -52,20 +52,18 @@ describe('Search component - Search Page', () => { const acsUser = new UserModel(); const emptyFolderModel = new FolderModel({ name: 'search' + StringUtil.generateRandomString() }); - let firstFileModel; const newFolderModel = new FolderModel(); - let fileNames = []; - const nrOfFiles = 15; - const adminNrOfFiles = 5; beforeAll(async () => { - fileNames = StringUtil.generateFilesNames(1, nrOfFiles, search.active.base, search.active.extension); + const nrOfFiles = 15; + const adminNrOfFiles = 5; + const fileNames = StringUtil.generateFilesNames(1, nrOfFiles, search.active.base, search.active.extension); const adminFileNames = StringUtil.generateFilesNames(nrOfFiles + 1, nrOfFiles + adminNrOfFiles, search.active.base, search.active.extension); search.active.firstFile = fileNames[0]; search.active.secondFile = fileNames[1]; fileNames.splice(0, 1); - firstFileModel = new FileModel({ + const firstFileModel = new FileModel({ name: search.active.firstFile, location: browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_path });