From dc912aea5bf21f833aa764c46da6f3334d4a4b0d Mon Sep 17 00:00:00 2001 From: Cristina Jalba Date: Sun, 2 Aug 2020 01:07:41 +0300 Subject: [PATCH] [AAE-3177] Fix tests that are using attach file widget (#5939) * Fix few tests with alfresco content type * Fix start-task-form-cloud suite: make tests independent * no message * Add new candidatebaseapp.zip - fix attach file widget with alfresco content & local type to have destination folder empty * Fix json --- .../start-task-form-cloud.e2e.ts | 55 +++++------------- e2e/protractor.excludes.json | 17 ++---- e2e/resources/activiti7/candidatebaseapp.zip | Bin 21236 -> 21249 bytes .../content-node-selector-dialog.page.ts | 1 + .../widget/attach-file-widget-cloud.page.ts | 4 +- 5 files changed, 22 insertions(+), 55 deletions(-) diff --git a/e2e/process-services-cloud/start-task-form-cloud.e2e.ts b/e2e/process-services-cloud/start-task-form-cloud.e2e.ts index 3a1d6bf5e2..433cf28f3a 100644 --- a/e2e/process-services-cloud/start-task-form-cloud.e2e.ts +++ b/e2e/process-services-cloud/start-task-form-cloud.e2e.ts @@ -36,7 +36,8 @@ import { ContentNodeSelectorDialogPage, ProcessInstancesService, ProcessDefinitionsService, - FileBrowserUtil, ProcessCloudWidgetPage + FileBrowserUtil, ProcessCloudWidgetPage, + QueryService } from '@alfresco/adf-testing'; import { StartProcessCloudConfiguration } from './config/start-process-cloud.config'; import { ProcessCloudDemoPage } from './pages/process-cloud-demo.page'; @@ -66,6 +67,8 @@ describe('Start Task Form', () => { const uploadActions = new UploadActions(apiService); const identityService = new IdentityService(apiService); const groupIdentityService = new GroupIdentityService(apiService); + const queryService = new QueryService(apiService); + const tasksService = new TasksService(apiService); const startProcessCloudConfiguration = new StartProcessCloudConfiguration(); const startProcessCloudConfig = startProcessCloudConfiguration.getConfiguration(); @@ -115,6 +118,8 @@ describe('Start Task Form', () => { 'name': StringUtil.generateRandomString(), 'businessKey': StringUtil.generateRandomString() }); + const task = await queryService.getProcessInstanceTasks(uploadContentFileProcess.entry.id, candidateBaseApp); + await tasksService.claimTask(task.list.entries[0].entry.id, candidateBaseApp); uploadDefaultFileProcess = await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp, { 'name': StringUtil.generateRandomString(), @@ -148,7 +153,6 @@ describe('Start Task Form', () => { afterAll(async () => { await uploadActions.deleteFileOrFolder(uploadedFolder.entry.id); await apiService.login(testUser.email, testUser.password); - const tasksService = new TasksService(apiService); const standaloneTaskId = await tasksService.getTaskId(standaloneTaskName, candidateBaseApp); await tasksService.deleteTask(standaloneTaskId, candidateBaseApp); @@ -313,18 +317,10 @@ describe('Start Task Form', () => { await processCloudDemoPage.processListCloudComponent().selectRow(uploadContentFileProcess.entry.name); await processDetailsCloudDemoPage.checkTaskIsDisplayed('UploadFileTask'); await processDetailsCloudDemoPage.selectProcessTaskByName('UploadFileTask'); - await taskFormCloudComponent.clickClaimButton(); const contentFileWidget = await widget.attachFileWidgetCloud('Attachsinglecontentfile'); await contentFileWidget.clickAttachContentFile('Attachsinglecontentfile'); - await contentNodeSelectorDialogPage.checkDialogIsDisplayed(); - await contentNodeSelectorDialogPage.contentListPage().dataTablePage().doubleClickRowByContent(folderName); - await contentNodeSelectorDialogPage.contentListPage().dataTablePage().waitTillContentLoaded(); - await contentNodeSelectorDialogPage.contentListPage().dataTablePage().clickRowByContent(testFileModel.name); - await contentNodeSelectorDialogPage.contentListPage().dataTablePage().checkRowByContentIsSelected(testFileModel.name); - - await contentNodeSelectorDialogPage.clickMoveCopyButton(); - await contentNodeSelectorDialogPage.checkDialogIsNotDisplayed(); + await contentNodeSelectorDialogPage.attachFileFromContentNode(folderName, testFileModel.name); await contentFileWidget.checkFileIsAttached(testFileModel.name); await contentFileWidget.removeFile(testFileModel.name); @@ -389,15 +385,8 @@ describe('Start Task Form', () => { const contentFileWidget = await widget.attachFileWidgetCloud('Attachsinglecontentfile'); await contentFileWidget.clickAttachContentFile('Attachsinglecontentfile'); - await contentNodeSelectorDialogPage.checkDialogIsDisplayed(); - await contentNodeSelectorDialogPage.contentListPage().dataTablePage().doubleClickRowByContent(folderName); - await contentNodeSelectorDialogPage.contentListPage().dataTablePage().waitTillContentLoaded(); - await contentNodeSelectorDialogPage.contentListPage().dataTablePage().clickRowByContent(testFileModel.name); - await contentNodeSelectorDialogPage.contentListPage().dataTablePage().checkRowByContentIsSelected(testFileModel.name); - - await contentNodeSelectorDialogPage.clickMoveCopyButton(); - await contentNodeSelectorDialogPage.checkDialogIsNotDisplayed(); + await contentNodeSelectorDialogPage.attachFileFromContentNode(folderName, testFileModel.name); await contentFileWidget.checkFileIsAttached(testFileModel.name); await contentFileWidget.checkUploadContentButtonIsNotDisplayed('Attachsinglecontentfile'); }); @@ -411,14 +400,8 @@ describe('Start Task Form', () => { const contentFileWidget = await widget.attachFileWidgetCloud('Attachsinglecontentfile'); await contentFileWidget.clickAttachContentFile('Attachsinglecontentfile'); - await contentNodeSelectorDialogPage.checkDialogIsDisplayed(); - await contentNodeSelectorDialogPage.contentListPage().dataTablePage().doubleClickRowByContent(folderName); - await contentNodeSelectorDialogPage.contentListPage().dataTablePage().waitTillContentLoaded(); - await contentNodeSelectorDialogPage.contentListPage().dataTablePage().clickRowByContent(testFileModel.name); - await contentNodeSelectorDialogPage.contentListPage().dataTablePage().checkRowByContentIsSelected(testFileModel.name); - await contentNodeSelectorDialogPage.clickMoveCopyButton(); - await contentNodeSelectorDialogPage.checkDialogIsNotDisplayed(); + await contentNodeSelectorDialogPage.attachFileFromContentNode(folderName, testFileModel.name); await contentFileWidget.checkFileIsAttached(testFileModel.name); await contentFileWidget.checkUploadContentButtonIsNotDisplayed('Attachsinglecontentfile'); @@ -437,13 +420,9 @@ describe('Start Task Form', () => { const contentFileWidget = await widget.attachFileWidgetCloud('Attachsinglecontentfile'); await contentFileWidget.clickAttachContentFile('Attachsinglecontentfile'); - await contentNodeSelectorDialogPage.checkDialogIsDisplayed(); - await contentNodeSelectorDialogPage.contentListPage().dataTablePage().doubleClickRowByContent(folderName); - await contentNodeSelectorDialogPage.contentListPage().dataTablePage().waitTillContentLoaded(); - await contentNodeSelectorDialogPage.contentListPage().dataTablePage().clickRowByContent(testFileModel.name); - await contentNodeSelectorDialogPage.contentListPage().dataTablePage().checkRowByContentIsSelected(testFileModel.name); - await contentNodeSelectorDialogPage.clickMoveCopyButton(); - await contentNodeSelectorDialogPage.checkDialogIsNotDisplayed(); + + await contentNodeSelectorDialogPage.attachFileFromContentNode(folderName, testFileModel.name); + await contentFileWidget.checkFileIsAttached(testFileModel.name); await contentFileWidget.checkUploadContentButtonIsNotDisplayed('Attachsinglecontentfile'); await taskFormCloudComponent.clickSaveButton(); @@ -463,13 +442,9 @@ describe('Start Task Form', () => { const contentFileWidget = await widget.attachFileWidgetCloud('Attachsinglecontentfile'); await contentFileWidget.clickAttachContentFile('Attachsinglecontentfile'); - await contentNodeSelectorDialogPage.checkDialogIsDisplayed(); - await contentNodeSelectorDialogPage.contentListPage().dataTablePage().doubleClickRowByContent(folderName); - await contentNodeSelectorDialogPage.contentListPage().dataTablePage().waitTillContentLoaded(); - await contentNodeSelectorDialogPage.contentListPage().dataTablePage().clickRowByContent(testFileModel.name); - await contentNodeSelectorDialogPage.contentListPage().dataTablePage().checkRowByContentIsSelected(testFileModel.name); - await contentNodeSelectorDialogPage.clickMoveCopyButton(); - await contentNodeSelectorDialogPage.checkDialogIsNotDisplayed(); + + await contentNodeSelectorDialogPage.attachFileFromContentNode(folderName, testFileModel.name); + await contentFileWidget.checkFileIsAttached(testFileModel.name); await contentFileWidget.checkUploadContentButtonIsNotDisplayed('Attachsinglecontentfile'); const taskId = await taskHeaderCloudPage.getId(); diff --git a/e2e/protractor.excludes.json b/e2e/protractor.excludes.json index 05c3b07429..4c1f2513ad 100644 --- a/e2e/protractor.excludes.json +++ b/e2e/protractor.excludes.json @@ -5,18 +5,11 @@ "C362241": "Include once ADF starts using ACS 7, https://issues.alfresco.com/jira/browse/ADF-5182", "C362242": "Include once ADF starts using ACS 7, https://issues.alfresco.com/jira/browse/ADF-5182", "C362265": "Include once ADF starts using ACS 7, https://issues.alfresco.com/jira/browse/ADF-5182", - "C311290": "Include once process storage services removed, https://issues.alfresco.com/jira/browse/AAE-3177", + "C311287": "https://issues.alfresco.com/jira/browse/AAE-3200", + "C260140": "https://issues.alfresco.com/jira/browse/AAE-3200", + "C261160": "https://issues.alfresco.com/jira/browse/AAE-3200", + "C246534": "https://issues.alfresco.com/jira/browse/AAE-3200", "C310358": "Include once process storage services removed, https://issues.alfresco.com/jira/browse/AAE-3177", - "C311285": "Include once process storage services removed, https://issues.alfresco.com/jira/browse/AAE-3177", - "C311287": "Include once process storage services removed, https://issues.alfresco.com/jira/browse/AAE-3177", - "C311288": "Include once process storage services removed, https://issues.alfresco.com/jira/browse/AAE-3177", - "C311289": "Include once process storage services removed, https://issues.alfresco.com/jira/browse/AAE-3177", - "C311292": "Include once process storage services removed, https://issues.alfresco.com/jira/browse/AAE-3177", - "C311293": "Include once process storage services removed, https://issues.alfresco.com/jira/browse/AAE-3177", - "C311295": "Include once process storage services removed, https://issues.alfresco.com/jira/browse/AAE-3177", - "C315292": "Include once process storage services removed, https://issues.alfresco.com/jira/browse/AAE-3177", - "C260140": "Include once process storage services removed, https://issues.alfresco.com/jira/browse/AAE-3177", - "C261160": "Include once process storage services removed, https://issues.alfresco.com/jira/browse/AAE-3177", - "C246534": "Include once process storage services removed, https://issues.alfresco.com/jira/browse/AAE-3177" + "C311290": "Include once process storage services removed, https://issues.alfresco.com/jira/browse/AAE-3177" } diff --git a/e2e/resources/activiti7/candidatebaseapp.zip b/e2e/resources/activiti7/candidatebaseapp.zip index 28e721ec64c9555745d7d3530b1a8dde05721562..cfaaf91ab7635031d6aaab2ad2a2e3b1204b8bdf 100644 GIT binary patch delta 13912 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 delta 13924 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%0ApNy9{5_j;g?r_*dgjm8sz%=15(8!^DJ?@%#RH2 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 B>1_Z2 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 2067c238a8..8f223a227f 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 @@ -101,6 +101,7 @@ export class ContentNodeSelectorDialogPage { async clickContentNodeSelectorResult(name: string): Promise { await this.dataTable.clickRowByContent(name); + await this.dataTable.checkRowByContentIsSelected(name); } async doubleClickContentNodeSelectorResult(name: string): Promise { diff --git a/lib/testing/src/lib/process-services-cloud/pages/form/widget/attach-file-widget-cloud.page.ts b/lib/testing/src/lib/process-services-cloud/pages/form/widget/attach-file-widget-cloud.page.ts index f6d6609233..a96baafef1 100644 --- a/lib/testing/src/lib/process-services-cloud/pages/form/widget/attach-file-widget-cloud.page.ts +++ b/lib/testing/src/lib/process-services-cloud/pages/form/widget/attach-file-widget-cloud.page.ts @@ -35,7 +35,7 @@ export class AttachFileWidgetCloudPage { async attachLocalFile(fileLocation: string): Promise { await browser.setFileDetector(new remote.FileDetector()); - const uploadButton = this.widget.element(by.css(`a input`)); + const uploadButton = element(by.css('adf-upload-button input')); await BrowserVisibility.waitUntilElementIsPresent(uploadButton); await uploadButton.sendKeys(fileLocation); await BrowserVisibility.waitUntilElementIsPresent(uploadButton); @@ -44,8 +44,6 @@ export class AttachFileWidgetCloudPage { async clickAttachContentFile(fileId: string): Promise { const uploadButton = this.widget.element(by.css(`button[id=${fileId}]`)); await BrowserActions.click(uploadButton); - await browser.sleep(1000); - await BrowserActions.clickExecuteScript('button[id="attach-Alfresco Content"]'); } async checkUploadContentButtonIsDisplayed(fileId: string): Promise {