inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-26 17:24:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AAE-3177] Fix tests that are using attach file widget (#5939)

Browse Source 
* 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
This commit is contained in:
Cristina Jalba 2020-08-02 01:07:41 +03:00 committed by GitHub
parent 4ea73ec8f3
commit dc912aea5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
e2e/process-services-cloud/start-task-form-cloud.e2e.ts
View File

@ -36,7 +36,8 @@ import {
ContentNodeSelectorDialogPage, ContentNodeSelectorDialogPage,
ProcessInstancesService, ProcessInstancesService,
ProcessDefinitionsService, ProcessDefinitionsService,
FileBrowserUtil, ProcessCloudWidgetPage FileBrowserUtil, ProcessCloudWidgetPage,
QueryService
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { StartProcessCloudConfiguration } from './config/start-process-cloud.config'; import { StartProcessCloudConfiguration } from './config/start-process-cloud.config';
import { ProcessCloudDemoPage } from './pages/process-cloud-demo.page'; import { ProcessCloudDemoPage } from './pages/process-cloud-demo.page';
@ -66,6 +67,8 @@ describe('Start Task Form', () => {
const uploadActions = new UploadActions(apiService); const uploadActions = new UploadActions(apiService);
const identityService = new IdentityService(apiService); const identityService = new IdentityService(apiService);
const groupIdentityService = new GroupIdentityService(apiService); const groupIdentityService = new GroupIdentityService(apiService);
const queryService = new QueryService(apiService);
const tasksService = new TasksService(apiService);
const startProcessCloudConfiguration = new StartProcessCloudConfiguration(); const startProcessCloudConfiguration = new StartProcessCloudConfiguration();
const startProcessCloudConfig = startProcessCloudConfiguration.getConfiguration(); const startProcessCloudConfig = startProcessCloudConfiguration.getConfiguration();
@ -115,6 +118,8 @@ describe('Start Task Form', () => {
'name': StringUtil.generateRandomString(), 'name': StringUtil.generateRandomString(),
'businessKey': 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, { uploadDefaultFileProcess = await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp, {
'name': StringUtil.generateRandomString(), 'name': StringUtil.generateRandomString(),
@ -148,7 +153,6 @@ describe('Start Task Form', () => {
afterAll(async () => { afterAll(async () => {
await uploadActions.deleteFileOrFolder(uploadedFolder.entry.id); await uploadActions.deleteFileOrFolder(uploadedFolder.entry.id);
await apiService.login(testUser.email, testUser.password); await apiService.login(testUser.email, testUser.password);
const tasksService = new TasksService(apiService);
const standaloneTaskId = await tasksService.getTaskId(standaloneTaskName, candidateBaseApp); const standaloneTaskId = await tasksService.getTaskId(standaloneTaskName, candidateBaseApp);
await tasksService.deleteTask(standaloneTaskId, candidateBaseApp); await tasksService.deleteTask(standaloneTaskId, candidateBaseApp);
@ -313,18 +317,10 @@ describe('Start Task Form', () => {
await processCloudDemoPage.processListCloudComponent().selectRow(uploadContentFileProcess.entry.name); await processCloudDemoPage.processListCloudComponent().selectRow(uploadContentFileProcess.entry.name);
await processDetailsCloudDemoPage.checkTaskIsDisplayed('UploadFileTask'); await processDetailsCloudDemoPage.checkTaskIsDisplayed('UploadFileTask');
await processDetailsCloudDemoPage.selectProcessTaskByName('UploadFileTask'); await processDetailsCloudDemoPage.selectProcessTaskByName('UploadFileTask');
await taskFormCloudComponent.clickClaimButton();
const contentFileWidget = await widget.attachFileWidgetCloud('Attachsinglecontentfile'); const contentFileWidget = await widget.attachFileWidgetCloud('Attachsinglecontentfile');
await contentFileWidget.clickAttachContentFile('Attachsinglecontentfile'); await contentFileWidget.clickAttachContentFile('Attachsinglecontentfile');
await contentNodeSelectorDialogPage.checkDialogIsDisplayed(); await contentNodeSelectorDialogPage.attachFileFromContentNode(folderName, testFileModel.name);
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 contentFileWidget.checkFileIsAttached(testFileModel.name); await contentFileWidget.checkFileIsAttached(testFileModel.name);
await contentFileWidget.removeFile(testFileModel.name); await contentFileWidget.removeFile(testFileModel.name);
@ -389,15 +385,8 @@ describe('Start Task Form', () => {
const contentFileWidget = await widget.attachFileWidgetCloud('Attachsinglecontentfile'); const contentFileWidget = await widget.attachFileWidgetCloud('Attachsinglecontentfile');
await contentFileWidget.clickAttachContentFile('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.checkFileIsAttached(testFileModel.name);
await contentFileWidget.checkUploadContentButtonIsNotDisplayed('Attachsinglecontentfile'); await contentFileWidget.checkUploadContentButtonIsNotDisplayed('Attachsinglecontentfile');
}); });
@ -411,14 +400,8 @@ describe('Start Task Form', () => {
const contentFileWidget = await widget.attachFileWidgetCloud('Attachsinglecontentfile'); const contentFileWidget = await widget.attachFileWidgetCloud('Attachsinglecontentfile');
await contentFileWidget.clickAttachContentFile('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.attachFileFromContentNode(folderName, testFileModel.name);
await contentNodeSelectorDialogPage.checkDialogIsNotDisplayed();
await contentFileWidget.checkFileIsAttached(testFileModel.name); await contentFileWidget.checkFileIsAttached(testFileModel.name);
await contentFileWidget.checkUploadContentButtonIsNotDisplayed('Attachsinglecontentfile'); await contentFileWidget.checkUploadContentButtonIsNotDisplayed('Attachsinglecontentfile');
@ -437,13 +420,9 @@ describe('Start Task Form', () => {
const contentFileWidget = await widget.attachFileWidgetCloud('Attachsinglecontentfile'); const contentFileWidget = await widget.attachFileWidgetCloud('Attachsinglecontentfile');
await contentFileWidget.clickAttachContentFile('Attachsinglecontentfile'); await contentFileWidget.clickAttachContentFile('Attachsinglecontentfile');
await contentNodeSelectorDialogPage.checkDialogIsDisplayed();
await contentNodeSelectorDialogPage.contentListPage().dataTablePage().doubleClickRowByContent(folderName); await contentNodeSelectorDialogPage.attachFileFromContentNode(folderName, testFileModel.name);
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 contentFileWidget.checkFileIsAttached(testFileModel.name); await contentFileWidget.checkFileIsAttached(testFileModel.name);
await contentFileWidget.checkUploadContentButtonIsNotDisplayed('Attachsinglecontentfile'); await contentFileWidget.checkUploadContentButtonIsNotDisplayed('Attachsinglecontentfile');
await taskFormCloudComponent.clickSaveButton(); await taskFormCloudComponent.clickSaveButton();
@ -463,13 +442,9 @@ describe('Start Task Form', () => {
const contentFileWidget = await widget.attachFileWidgetCloud('Attachsinglecontentfile'); const contentFileWidget = await widget.attachFileWidgetCloud('Attachsinglecontentfile');
await contentFileWidget.clickAttachContentFile('Attachsinglecontentfile'); await contentFileWidget.clickAttachContentFile('Attachsinglecontentfile');
await contentNodeSelectorDialogPage.checkDialogIsDisplayed();
await contentNodeSelectorDialogPage.contentListPage().dataTablePage().doubleClickRowByContent(folderName); await contentNodeSelectorDialogPage.attachFileFromContentNode(folderName, testFileModel.name);
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 contentFileWidget.checkFileIsAttached(testFileModel.name); await contentFileWidget.checkFileIsAttached(testFileModel.name);
await contentFileWidget.checkUploadContentButtonIsNotDisplayed('Attachsinglecontentfile'); await contentFileWidget.checkUploadContentButtonIsNotDisplayed('Attachsinglecontentfile');
const taskId = await taskHeaderCloudPage.getId(); const taskId = await taskHeaderCloudPage.getId();

17
e2e/protractor.excludes.json
View File

@ -5,18 +5,11 @@
"C362241": "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", "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": "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", "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", "C311290": "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"
} }

BIN
e2e/resources/activiti7/candidatebaseapp.zip
View File

Binary file not shown.

1
lib/testing/src/lib/content-services/dialog/content-node-selector-dialog.page.ts
View File

@ -101,6 +101,7 @@ export class ContentNodeSelectorDialogPage {
async clickContentNodeSelectorResult(name: string): Promise<void> { async clickContentNodeSelectorResult(name: string): Promise<void> {
await this.dataTable.clickRowByContent(name); await this.dataTable.clickRowByContent(name);
await this.dataTable.checkRowByContentIsSelected(name);
} }
async doubleClickContentNodeSelectorResult(name: string): Promise<void> { async doubleClickContentNodeSelectorResult(name: string): Promise<void> {

4
lib/testing/src/lib/process-services-cloud/pages/form/widget/attach-file-widget-cloud.page.ts
View File

@ -35,7 +35,7 @@ export class AttachFileWidgetCloudPage {
async attachLocalFile(fileLocation: string): Promise<void> { async attachLocalFile(fileLocation: string): Promise<void> {
await browser.setFileDetector(new remote.FileDetector()); 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 BrowserVisibility.waitUntilElementIsPresent(uploadButton);
await uploadButton.sendKeys(fileLocation); await uploadButton.sendKeys(fileLocation);
await BrowserVisibility.waitUntilElementIsPresent(uploadButton); await BrowserVisibility.waitUntilElementIsPresent(uploadButton);
@ -44,8 +44,6 @@ export class AttachFileWidgetCloudPage {
async clickAttachContentFile(fileId: string): Promise<void> { async clickAttachContentFile(fileId: string): Promise<void> {
const uploadButton = this.widget.element(by.css(`button[id=${fileId}]`)); const uploadButton = this.widget.element(by.css(`button[id=${fileId}]`));
await BrowserActions.click(uploadButton); await BrowserActions.click(uploadButton);
await browser.sleep(1000);
await BrowserActions.clickExecuteScript('button[id="attach-Alfresco Content"]');
} }
async checkUploadContentButtonIsDisplayed(fileId: string): Promise<void> { async checkUploadContentButtonIsDisplayed(fileId: string): Promise<void> {