From fffa97c7f872fc80b466ebc5baf7c73d989d2cf6 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Tue, 9 Jun 2020 01:25:08 +0100 Subject: [PATCH] use new static drop actions --- .../document-list/document-list-properties.e2e.ts | 6 ++---- e2e/content-services/upload/excluded-file.e2e.ts | 4 +--- e2e/content-services/upload/uploader-component.e2e.ts | 5 ++--- e2e/core/datatable/data-table-component.e2e.ts | 5 ++--- e2e/pages/adf/content-services.page.ts | 5 ++--- 5 files changed, 9 insertions(+), 16 deletions(-) diff --git a/e2e/content-services/document-list/document-list-properties.e2e.ts b/e2e/content-services/document-list/document-list-properties.e2e.ts index 364143e25d..abd93af1b2 100644 --- a/e2e/content-services/document-list/document-list-properties.e2e.ts +++ b/e2e/content-services/document-list/document-list-properties.e2e.ts @@ -68,8 +68,7 @@ describe('Document List Component - Properties', () => { const dragAndDropArea = contentServicesPage.getRowByName(subFolder.entry.name); - const dragAndDrop = new DropActions(); - await dragAndDrop.dropFile(dragAndDropArea, pngFile.location); + await DropActions.dropFile(dragAndDropArea, pngFile.location); await contentServicesPage.checkContentIsDisplayed(pngFile.name); await contentServicesPage.doubleClickRow(subFolder.entry.name); await contentServicesPage.checkEmptyFolderTextToBe('This folder is empty'); @@ -83,8 +82,7 @@ describe('Document List Component - Properties', () => { const dragAndDropArea = contentServicesPage.getRowByName(subFolder.entry.name); - const dragAndDrop = new DropActions(); - await dragAndDrop.dropFile(dragAndDropArea, pngFile.location); + await DropActions.dropFile(dragAndDropArea, pngFile.location); await contentServicesPage.checkContentIsNotDisplayed(pngFile.name); await contentServicesPage.doubleClickRow(subFolder.entry.name); diff --git a/e2e/content-services/upload/excluded-file.e2e.ts b/e2e/content-services/upload/excluded-file.e2e.ts index cee27f09bc..41a511df50 100644 --- a/e2e/content-services/upload/excluded-file.e2e.ts +++ b/e2e/content-services/upload/excluded-file.e2e.ts @@ -92,9 +92,7 @@ describe('Upload component - Excluded Files', () => { const dragAndDropArea = element.all(by.css('adf-upload-drag-area div')).first(); - const dragAndDrop = new DropActions(); - - await dragAndDrop.dropFile(dragAndDropArea, iniExcludedFile.location); + await DropActions.dropFile(dragAndDropArea, iniExcludedFile.location); await browser.sleep(5000); diff --git a/e2e/content-services/upload/uploader-component.e2e.ts b/e2e/content-services/upload/uploader-component.e2e.ts index 87c9dd2757..4e0ec239a8 100644 --- a/e2e/content-services/upload/uploader-component.e2e.ts +++ b/e2e/content-services/upload/uploader-component.e2e.ts @@ -261,10 +261,9 @@ describe('Upload component', () => { await browser.sleep(1000); await uploadToggles.addExtension('.docx'); - const dragAndDrop = new DropActions(); const dragAndDropArea = element.all(by.css('adf-upload-drag-area div')).first(); - await dragAndDrop.dropFile(dragAndDropArea, docxFileModel.location); + await DropActions.dropFile(dragAndDropArea, docxFileModel.location); await contentServicesPage.checkContentIsDisplayed(docxFileModel.name); await uploadDialog.removeUploadedFile(docxFileModel.name); @@ -272,7 +271,7 @@ describe('Upload component', () => { await uploadDialog.clickOnCloseButton(); await uploadDialog.dialogIsNotDisplayed(); - await dragAndDrop.dropFile(dragAndDropArea, pngFileModel.location); + await DropActions.dropFile(dragAndDropArea, pngFileModel.location); await contentServicesPage.checkContentIsNotDisplayed(pngFileModel.name); await uploadDialog.dialogIsNotDisplayed(); await uploadToggles.disableExtensionFilter(); diff --git a/e2e/core/datatable/data-table-component.e2e.ts b/e2e/core/datatable/data-table-component.e2e.ts index aa2590d653..0a3c939048 100644 --- a/e2e/core/datatable/data-table-component.e2e.ts +++ b/e2e/core/datatable/data-table-component.e2e.ts @@ -38,7 +38,6 @@ describe('Datatable component', () => { const apiService = new ApiService(); const usersActions = new UsersActions(apiService); - const dragAndDrop = new DropActions(); beforeAll(async () => { await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password); @@ -144,11 +143,11 @@ describe('Datatable component', () => { it('[C307984] Should trigger the event handling header-drop and cell-drop', async () => { const dragAndDropHeader = dragAndDropDataTablePage.getDropTargetIdColumnHeader(); - await dragAndDrop.dropFile(dragAndDropHeader, pngFile.location); + await DropActions.dropFile(dragAndDropHeader, pngFile.location); await notificationHistoryPage.checkNotifyContains('Dropped data on [ id ] header'); const dragAndDropCell = dragAndDropDataTablePage.getDropTargetIdColumnCell(1); - await dragAndDrop.dropFile(dragAndDropCell, pngFile.location); + await DropActions.dropFile(dragAndDropCell, pngFile.location); await notificationHistoryPage.checkNotifyContains('Dropped data on [ id ] cell'); }); }); diff --git a/e2e/pages/adf/content-services.page.ts b/e2e/pages/adf/content-services.page.ts index 87fee3cfc8..b43844ab45 100644 --- a/e2e/pages/adf/content-services.page.ts +++ b/e2e/pages/adf/content-services.page.ts @@ -37,7 +37,6 @@ export class ContentServicesPage { togglePage: TogglePage = new TogglePage(); createFolderDialog: FolderDialogPage = new FolderDialogPage(); createLibraryDialog: CreateLibraryDialogPage = new CreateLibraryDialogPage(); - dragAndDropAction: DropActions = new DropActions(); multipleFileUploadToggle: ElementFinder = element(by.id('adf-document-list-enable-drop-files')); uploadBorder: ElementFinder = element(by.id('document-list-container')); @@ -529,12 +528,12 @@ export class ContentServicesPage { async dragAndDropFile(file: string): Promise { await this.checkDragAndDropDIsDisplayed(); - await this.dragAndDropAction.dropFile(this.dragAndDrop, file); + await DropActions.dropFile(this.dragAndDrop, file); } async dragAndDropFolder(folderName: string): Promise { await this.checkDragAndDropDIsDisplayed(); - await this.dragAndDropAction.dropFolder(this.dragAndDrop, folderName); + await DropActions.dropFolder(this.dragAndDrop, folderName); } async checkLockIsDisplayedForElement(name): Promise {