From 7fd3ffcf3f56128c3a8b1d3097b87d195c6fc075 Mon Sep 17 00:00:00 2001 From: Marouan Bentaleb <38426175+marouanbentaleb@users.noreply.github.com> Date: Mon, 10 Sep 2018 09:53:37 +0100 Subject: [PATCH] Fixing failing tests for Document List - Actions (#3755) --- .../document_list_actions.e2e.ts | 30 +++++++----------- e2e/pages/adf/contentServicesPage.js | 2 +- e2e/resources/apps/App.zip | Bin 0 -> 4420 bytes 3 files changed, 13 insertions(+), 19 deletions(-) create mode 100644 e2e/resources/apps/App.zip diff --git a/e2e/content-services/document_list_actions.e2e.ts b/e2e/content-services/document_list_actions.e2e.ts index 5bc28234b7..1b1b6352dc 100644 --- a/e2e/content-services/document_list_actions.e2e.ts +++ b/e2e/content-services/document_list_actions.e2e.ts @@ -80,12 +80,16 @@ describe('Document List Component - Actions', () => { pdfUploadedNode = await uploadActions.uploadFile(this.alfrescoJsApi, pdfFileModel.location, pdfFileModel.name, '-my-'); testFileNode = await uploadActions.uploadFile(this.alfrescoJsApi, testFileModel.location, testFileModel.name, '-my-'); uploadedFolder = await uploadActions.uploadFolder(this.alfrescoJsApi, folderName, '-my-'); + + loginPage.loginToContentServicesUsingUserModel(acsUser); + contentServicesPage.goToDocumentList(); + done(); }); it('[C213257] - Copy File', () => { - loginPage.loginToContentServicesUsingUserModel(acsUser); - contentServicesPage.goToDocumentList(); + browser.driver.sleep(12000); + contentListPage.rightClickOnRowNamed(pdfUploadedNode.entry.name); contentListPage.pressContextMenuActionNamed('Copy'); contentServicesPage.typeIntoNodeSelectorSearchField(folderName); @@ -99,16 +103,12 @@ describe('Document List Component - Actions', () => { }); it('[C280561] - Delete File', () => { - loginPage.loginToContentServicesUsingUserModel(acsUser); - contentServicesPage.goToDocumentList(); contentListPage.deleteContent(pdfFileModel.name); contentListPage.checkContentIsNotDisplayed(pdfFileModel.name); pdfUploadedNode = null; }); it('[C280562] - Multiple Files Delete - Dropdown Menu', () => { - loginPage.loginToContentServicesUsingUserModel(acsUser); - contentServicesPage.goToDocumentList(); contentListPage.clickRowToSelect(pdfFileModel.name); contentListPage.clickRowToSelect(testFileModel.name); contentListPage.deleteContent(pdfFileModel.name); @@ -117,8 +117,6 @@ describe('Document List Component - Actions', () => { }); it('[C280565] - Delete - Right Click', () => { - loginPage.loginToContentServicesUsingUserModel(acsUser); - contentServicesPage.goToDocumentList(); contentListPage.rightClickOnRowNamed(pdfFileModel.name); contentListPage.pressContextMenuActionNamed('Delete'); contentListPage.checkContentIsNotDisplayed(pdfFileModel.name); @@ -126,8 +124,6 @@ describe('Document List Component - Actions', () => { }); it('[C280566] - Context Menu - Actions for file', () => { - loginPage.loginToContentServicesUsingUserModel(acsUser); - contentServicesPage.goToDocumentList(); contentListPage.rightClickOnRowNamed(pdfFileModel.name); contentListPage.checkContextActionIsVisible('Download'); contentListPage.checkContextActionIsVisible('Copy'); @@ -140,8 +136,6 @@ describe('Document List Component - Actions', () => { }); it('[C280567] - Delete - Right click after multiselection of files', () => { - loginPage.loginToContentServicesUsingUserModel(acsUser); - contentServicesPage.goToDocumentList(); contentListPage.clickRowToSelect(pdfFileModel.name); contentListPage.clickRowToSelect(testFileModel.name); contentListPage.rightClickOnRowNamed(pdfFileModel.name); @@ -165,20 +159,20 @@ describe('Document List Component - Actions', () => { await this.alfrescoJsApi.login(acsUser.id, acsUser.password); uploadedFolder = await uploadActions.uploadFolder(this.alfrescoJsApi, folderName, '-my-'); secondUploadedFolder = await uploadActions.uploadFolder(this.alfrescoJsApi, secondfolderName, '-my-'); + + loginPage.loginToContentServicesUsingUserModel(acsUser); + contentServicesPage.goToDocumentList(); + done(); }); it('[C260123] - Delete - Dropdown Menu', () => { - loginPage.loginToContentServicesUsingUserModel(acsUser); - contentServicesPage.goToDocumentList(); contentListPage.deleteContent(folderName); contentListPage.checkContentIsNotDisplayed(folderName); uploadedFolder = null; }); it('[C280566] - Context Menu - Actions for folder', () => { - loginPage.loginToContentServicesUsingUserModel(acsUser); - contentServicesPage.goToDocumentList(); contentListPage.rightClickOnRowNamed(folderName); contentListPage.checkContextActionIsVisible('Download'); contentListPage.checkContextActionIsVisible('Copy'); @@ -189,8 +183,8 @@ describe('Document List Component - Actions', () => { }); it('[C260138] - Copy - folder', () => { - loginPage.loginToContentServicesUsingUserModel(acsUser); - contentServicesPage.goToDocumentList(); + browser.driver.sleep(12000); + contentListPage.copyContent(folderName); contentServicesPage.typeIntoNodeSelectorSearchField(secondfolderName); contentServicesPage.clickContentNodeSelectorResult(secondfolderName); diff --git a/e2e/pages/adf/contentServicesPage.js b/e2e/pages/adf/contentServicesPage.js index b1835516d8..2d4c8073b7 100644 --- a/e2e/pages/adf/contentServicesPage.js +++ b/e2e/pages/adf/contentServicesPage.js @@ -592,7 +592,7 @@ var ContentServicesPage = function () { } this.clickContentNodeSelectorResult = function(name){ - let resultElement = element(by.css(`div[data-automation-id="content-node-selector-content-list"] div[filename="${name}"`)); + let resultElement = element.all(by.css(`div[data-automation-id="content-node-selector-content-list"] div[filename="${name}"`)).first(); Util.waitUntilElementIsVisible(resultElement); resultElement.click(); } diff --git a/e2e/resources/apps/App.zip b/e2e/resources/apps/App.zip new file mode 100644 index 0000000000000000000000000000000000000000..43d74d8488d2a5210ad3c446fc73f8a97211072e GIT binary patch literal 4420 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