diff --git a/e2e/process-services-cloud/process-task-attach-content-file-cloud.e2e.ts b/e2e/process-services-cloud/process-task-attach-content-file-cloud.e2e.ts index b75b13af3f..b9829931a4 100644 --- a/e2e/process-services-cloud/process-task-attach-content-file-cloud.e2e.ts +++ b/e2e/process-services-cloud/process-task-attach-content-file-cloud.e2e.ts @@ -20,12 +20,16 @@ import { ApiService, AppListCloudPage, ContentNodeSelectorDialogPage, + GroupIdentityService, + IdentityService, LoginPage, + QueryService, ProcessCloudWidgetPage, ProcessDefinitionsService, ProcessInstancesService, StringUtil, TaskFormCloudComponent, + TasksService, UploadActions, ViewerPage } from '@alfresco/adf-testing'; @@ -49,6 +53,10 @@ describe('Process Task - Attach content file', () => { const uploadActions = new UploadActions(apiService); const processDefinitionService = new ProcessDefinitionsService(apiService); const processInstancesService = new ProcessInstancesService(apiService); + const identityService = new IdentityService(apiService); + const groupIdentityService = new GroupIdentityService(apiService); + const queryService = new QueryService(apiService); + const tasksService = new TasksService(apiService); const viewerPage = new ViewerPage(); const simpleApp = browser.params.resources.ACTIVITI_CLOUD_APPS.SIMPLE_APP.name; @@ -59,6 +67,8 @@ describe('Process Task - Attach content file', () => { let uploadedFolder: any; let processInstance: any; + let testUser: any; + let groupInfo: any; const pdfFileOne = { 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name, @@ -70,20 +80,33 @@ describe('Process Task - Attach content file', () => { 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_path }; - beforeAll(async (done) => { - await apiService.login(browser.params.testConfig.hrUser.email, browser.params.testConfig.hrUser.password); + beforeAll(async () => { + await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + testUser = await identityService.createIdentityUserWithRole( [identityService.ROLES.ACTIVITI_USER]); + groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr'); + await identityService.addUserToGroup(testUser.idIdentityService, groupInfo.id); + + await apiService.login(testUser.email, testUser.password); const processDefinition = await processDefinitionService.getProcessDefinitionByName(processDefinitionName, simpleApp); processInstance = await processInstancesService.createProcessInstance(processDefinition.entry.key, simpleApp, { name: 'upload process' }); - await apiService.getInstance().login(browser.params.testConfig.hrUser.email, browser.params.testConfig.hrUser.password); + + const task = await queryService.getProcessInstanceTasks(processInstance.entry.id, simpleApp); + await tasksService.claimTask(task.list.entries[0].entry.id, simpleApp); + await apiService.getInstance().login(testUser.email, testUser.password); uploadedFolder = await uploadActions.createFolder(folderName, '-my-'); await uploadActions.uploadFile(pdfFileOne.location, pdfFileOne.name, uploadedFolder.entry.id); await uploadActions.uploadFile(pdfFileTwo.location, pdfFileTwo.name, uploadedFolder.entry.id); - await loginSSOPage.login(browser.params.testConfig.hrUser.email, browser.params.testConfig.hrUser.password); + await loginSSOPage.login(testUser.email, testUser.password); await navigationBarPage.navigateToProcessServicesCloudPage(); await appListCloudComponent.checkApsContainer(); - done(); + }); + + afterAll(async () => { + await uploadActions.deleteFileOrFolder(uploadedFolder.entry.id); + await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await identityService.deleteIdentityUser(testUser.idIdentityService); }); afterAll(async () => { diff --git a/e2e/protractor.excludes.json b/e2e/protractor.excludes.json index 6661891991..fb3e06188b 100644 --- a/e2e/protractor.excludes.json +++ b/e2e/protractor.excludes.json @@ -4,6 +4,7 @@ "C362240": "Include once ADF starts using ACS 7 , https://issues.alfresco.com/jira/browse/ADF-5182", "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" + "C362265": "Include once ADF starts using ACS 7, https://issues.alfresco.com/jira/browse/ADF-5182", + "C311290": "Excluded until simpleapp zip is updated " } diff --git a/e2e/resources/activiti7/simpleapp.zip b/e2e/resources/activiti7/simpleapp.zip index eb7b8dbfa9..22aae3d7a1 100644 Binary files a/e2e/resources/activiti7/simpleapp.zip and b/e2e/resources/activiti7/simpleapp.zip differ