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

Refactor e2e PS-Cloud and add sleep before query (#4919)

Browse Source 
* add sleep before query process service and refactor resources process name

* fix spell problem and increase size build check core
This commit is contained in:
Eugenio Romano 2019-07-11 16:25:26 +01:00 committed by GitHub
parent 79a95ecd5d
commit 10587dd842
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 61 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cspell.json
View File

@ -127,6 +127,7 @@
"subfolders", "subfolders",
"ECMBPM", "ECMBPM",
"processwithvariables", "processwithvariables",
"dropdownrestprocess",
"devops" "devops"
], ],
"dictionaries": [ "dictionaries": [

3
e2e/process-services-cloud/form-field/dropdown-widget.e2e.ts
View File

@ -63,7 +63,8 @@ describe('Form Field Component - Dropdown Widget', () => {
await apiService.login(testUser.email, testUser.password); await apiService.login(testUser.email, testUser.password);
processDefinitionService = new ProcessDefinitionsService(apiService); processDefinitionService = new ProcessDefinitionsService(apiService);
const processDefinition = await processDefinitionService.getProcessDefinitionByName('dropdownrestprocess', simpleApp); const processDefinition = await processDefinitionService
.getProcessDefinitionByName(resources.ACTIVITI7_APPS.SIMPLE_APP.processes.dropdownrestprocess, simpleApp);
processInstancesService = new ProcessInstancesService(apiService); processInstancesService = new ProcessInstancesService(apiService);
await processInstancesService.createProcessInstance(processDefinition.entry.key, simpleApp); await processInstancesService.createProcessInstance(processDefinition.entry.key, simpleApp);

11
e2e/process-services-cloud/process-custom-filters.e2e.ts
View File

@ -53,7 +53,8 @@ describe('Process list cloud', () => {
let processInstancesService: ProcessInstancesService; let processInstancesService: ProcessInstancesService;
let queryService: QueryService; let queryService: QueryService;
let completedProcess, runningProcessInstance, switchProcessInstance, noOfApps, testUser, groupInfo, anotherProcessInstance; let completedProcess, runningProcessInstance, switchProcessInstance, noOfApps, testUser, groupInfo,
anotherProcessInstance;
const candidateBaseApp = resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name; const candidateBaseApp = resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name;
beforeAll(async (done) => { beforeAll(async (done) => {
@ -68,8 +69,11 @@ describe('Process list cloud', () => {
await apiService.login(testUser.email, testUser.password); await apiService.login(testUser.email, testUser.password);
processDefinitionService = new ProcessDefinitionsService(apiService); processDefinitionService = new ProcessDefinitionsService(apiService);
const processDefinition = await processDefinitionService.getProcessDefinitionByName('candidateGroupProcess', candidateBaseApp); const processDefinition = await processDefinitionService
const anotherProcessDefinition = await processDefinitionService.getProcessDefinitionByName('anotherCandidateGroupProcess', candidateBaseApp); .getProcessDefinitionByName(resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.candidateGroupProcess, candidateBaseApp);
const anotherProcessDefinition = await processDefinitionService
.getProcessDefinitionByName(resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.anotherCandidateGroupProcess, candidateBaseApp);
processInstancesService = new ProcessInstancesService(apiService); processInstancesService = new ProcessInstancesService(apiService);
await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp); await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp);
@ -95,6 +99,7 @@ describe('Process list cloud', () => {
}); });
queryService = new QueryService(apiService); queryService = new QueryService(apiService);
await browser.driver.sleep(4000); // eventual consistency query
const task = await queryService.getProcessInstanceTasks(completedProcess.entry.id, candidateBaseApp); const task = await queryService.getProcessInstanceTasks(completedProcess.entry.id, candidateBaseApp);
tasksService = new TasksService(apiService); tasksService = new TasksService(apiService);
const claimedTask = await tasksService.claimTask(task.list.entries[0].entry.id, candidateBaseApp); const claimedTask = await tasksService.claimTask(task.list.entries[0].entry.id, candidateBaseApp);

15
e2e/process-services-cloud/process-filter-results.e2e.ts
View File

@ -57,7 +57,8 @@ describe('Process filters cloud', () => {
let processInstancesService: ProcessInstancesService; let processInstancesService: ProcessInstancesService;
let queryService: QueryService; let queryService: QueryService;
let completedProcess, runningProcessInstance, suspendProcessInstance, testUser, anotherUser, groupInfo, anotherProcessInstance, processDefinition, anotherProcessDefinition, let completedProcess, runningProcessInstance, suspendProcessInstance, testUser, anotherUser, groupInfo,
anotherProcessInstance, processDefinition, anotherProcessDefinition,
differentAppUserProcessInstance, simpleAppProcessDefinition; differentAppUserProcessInstance, simpleAppProcessDefinition;
const candidateBaseApp = resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name; const candidateBaseApp = resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name;
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name;
@ -76,7 +77,9 @@ describe('Process filters cloud', () => {
await apiService.login(anotherUser.email, anotherUser.password); await apiService.login(anotherUser.email, anotherUser.password);
processDefinitionService = new ProcessDefinitionsService(apiService); processDefinitionService = new ProcessDefinitionsService(apiService);
simpleAppProcessDefinition = await processDefinitionService.getProcessDefinitionByName('simpleProcess', simpleApp); simpleAppProcessDefinition = await processDefinitionService
.getProcessDefinitionByName(resources.ACTIVITI7_APPS.SIMPLE_APP.processes.simpleProcess, simpleApp);
processInstancesService = new ProcessInstancesService(apiService); processInstancesService = new ProcessInstancesService(apiService);
differentAppUserProcessInstance = await processInstancesService.createProcessInstance(simpleAppProcessDefinition.entry.key, simpleApp, { differentAppUserProcessInstance = await processInstancesService.createProcessInstance(simpleAppProcessDefinition.entry.key, simpleApp, {
'name': StringUtil.generateRandomString(), 'name': StringUtil.generateRandomString(),
@ -84,8 +87,11 @@ describe('Process filters cloud', () => {
}); });
await apiService.login(testUser.email, testUser.password); await apiService.login(testUser.email, testUser.password);
processDefinition = await processDefinitionService.getProcessDefinitionByName('candidateGroupProcess', candidateBaseApp); processDefinition = await processDefinitionService
anotherProcessDefinition = await processDefinitionService.getProcessDefinitionByName('anotherCandidateGroupProcess', candidateBaseApp); .getProcessDefinitionByName(resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.candidateGroupProcess, candidateBaseApp);
anotherProcessDefinition = await processDefinitionService
.getProcessDefinitionByName(resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.anotherCandidateGroupProcess, candidateBaseApp);
runningProcessInstance = await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp, { runningProcessInstance = await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp, {
'name': StringUtil.generateRandomString(), 'name': StringUtil.generateRandomString(),
@ -109,6 +115,7 @@ describe('Process filters cloud', () => {
}); });
queryService = new QueryService(apiService); queryService = new QueryService(apiService);
await browser.driver.sleep(4000); // eventual consistency query
const task = await queryService.getProcessInstanceTasks(completedProcess.entry.id, candidateBaseApp); const task = await queryService.getProcessInstanceTasks(completedProcess.entry.id, candidateBaseApp);
tasksService = new TasksService(apiService); tasksService = new TasksService(apiService);
const claimedTask = await tasksService.claimTask(task.list.entries[0].entry.id, candidateBaseApp); const claimedTask = await tasksService.claimTask(task.list.entries[0].entry.id, candidateBaseApp);

10
e2e/process-services-cloud/process-filters-cloud.e2e.ts
View File

@ -68,12 +68,16 @@ describe('Process filters cloud', () => {
await apiService.login(testUser.email, testUser.password); await apiService.login(testUser.email, testUser.password);
processDefinitionService = new ProcessDefinitionsService(apiService); processDefinitionService = new ProcessDefinitionsService(apiService);
const processDefinition = await processDefinitionService.getProcessDefinitionByName('candidateGroupProcess', candidateBaseApp); const processDefinition = await processDefinitionService
processInstancesService = new ProcessInstancesService(apiService); .getProcessDefinitionByName(resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.candidateGroupProcess, candidateBaseApp);
processInstancesService = new ProcessInstancesService(apiService);
runningProcess = await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp); runningProcess = await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp);
completedProcess = await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp); completedProcess = await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp);
queryService = new QueryService(apiService); queryService = new QueryService(apiService);
await browser.driver.sleep(4000); // eventual consistency query
const task = await queryService.getProcessInstanceTasks(completedProcess.entry.id, candidateBaseApp); const task = await queryService.getProcessInstanceTasks(completedProcess.entry.id, candidateBaseApp);
tasksService = new TasksService(apiService); tasksService = new TasksService(apiService);
const claimedTask = await tasksService.claimTask(task.list.entries[0].entry.id, candidateBaseApp); const claimedTask = await tasksService.claimTask(task.list.entries[0].entry.id, candidateBaseApp);
@ -87,7 +91,7 @@ describe('Process filters cloud', () => {
done(); done();
}, 5 * 60 * 1000); }, 5 * 60 * 1000);
afterAll(async(done) => { afterAll(async (done) => {
await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password);
await identityService.deleteIdentityUser(testUser.idIdentityService); await identityService.deleteIdentityUser(testUser.idIdentityService);
done(); done();

6
e2e/process-services-cloud/process-list-cloud-component.e2e.ts
View File

@ -62,7 +62,9 @@ describe('Process list cloud', () => {
await apiService.login(testUser.email, testUser.password); await apiService.login(testUser.email, testUser.password);
processDefinitionService = new ProcessDefinitionsService(apiService); processDefinitionService = new ProcessDefinitionsService(apiService);
const processDefinition = await processDefinitionService.getProcessDefinitionByName('candidateGroupProcess', candidateBaseApp); const processDefinition = await processDefinitionService
.getProcessDefinitionByName(resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.candidateGroupProcess, candidateBaseApp);
processInstancesService = new ProcessInstancesService(apiService); processInstancesService = new ProcessInstancesService(apiService);
runningProcess = await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp); runningProcess = await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp);
@ -74,7 +76,7 @@ describe('Process list cloud', () => {
done(); done();
}); });
afterAll(async(done) => { afterAll(async (done) => {
await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password);
await identityService.deleteIdentityUser(testUser.idIdentityService); await identityService.deleteIdentityUser(testUser.idIdentityService);
done(); done();

3
e2e/process-services-cloud/process-list-selection-cloud.e2e.ts
View File

@ -58,7 +58,8 @@ describe('Process list cloud', () => {
await apiService.login(testUser.email, testUser.password); await apiService.login(testUser.email, testUser.password);
processDefinitionService = new ProcessDefinitionsService(apiService); processDefinitionService = new ProcessDefinitionsService(apiService);
const processDefinition = await processDefinitionService.getProcessDefinitionByName('simpleProcess', simpleApp); const processDefinition = await processDefinitionService
.getProcessDefinitionByName(resources.ACTIVITI7_APPS.SIMPLE_APP.processes.simpleProcess, simpleApp);
processInstancesService = new ProcessInstancesService(apiService); processInstancesService = new ProcessInstancesService(apiService);
for (let i = 0; i < noOfProcesses; i++) { for (let i = 0; i < noOfProcesses; i++) {

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

@ -113,7 +113,9 @@ describe('Start Task Form', () => {
await apiService.login(testUser.email, testUser.password); await apiService.login(testUser.email, testUser.password);
processDefinitionService = new ProcessDefinitionsService(apiService); processDefinitionService = new ProcessDefinitionsService(apiService);
processInstancesService = new ProcessInstancesService(apiService); processInstancesService = new ProcessInstancesService(apiService);
processDefinition = await processDefinitionService.getProcessDefinitionByName('uploadFileProcess', candidateBaseApp); processDefinition = await processDefinitionService
.getProcessDefinitionByName(resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.uploadFileProcess, candidateBaseApp);
await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp); await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp);
uploadLocalFileProcess = await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp, { uploadLocalFileProcess = await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp, {

4
e2e/process-services-cloud/task-form-cloud-component.e2e.ts
View File

@ -78,11 +78,13 @@ describe('Task form cloud component', () => {
await tasksService.createAndCompleteTask(completedTaskName, candidateBaseApp); await tasksService.createAndCompleteTask(completedTaskName, candidateBaseApp);
processDefinitionService = new ProcessDefinitionsService(apiService); processDefinitionService = new ProcessDefinitionsService(apiService);
const processDefinition = await processDefinitionService.getProcessDefinitionByName('candidateUserProcess', candidateBaseApp); const processDefinition = await processDefinitionService
.getProcessDefinitionByName(resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.candidateUserProcess, candidateBaseApp);
processInstancesService = new ProcessInstancesService(apiService); processInstancesService = new ProcessInstancesService(apiService);
completedProcess = await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp); completedProcess = await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp);
await browser.driver.sleep(4000); // eventual consistency query
const task = await queryService.getProcessInstanceTasks(completedProcess.entry.id, candidateBaseApp); const task = await queryService.getProcessInstanceTasks(completedProcess.entry.id, candidateBaseApp);
claimedTask = await tasksService.claimTask(task.list.entries[0].entry.id, candidateBaseApp); claimedTask = await tasksService.claimTask(task.list.entries[0].entry.id, candidateBaseApp);

4
e2e/process-services-cloud/task-list-properties.e2e.ts
View File

@ -81,7 +81,9 @@ describe('Edit task filters and task list properties', () => {
await tasksService.claimTask(notDisplayedTask.entry.id, candidateBaseApp); await tasksService.claimTask(notDisplayedTask.entry.id, candidateBaseApp);
processDefinitionService = new ProcessDefinitionsService(apiService); processDefinitionService = new ProcessDefinitionsService(apiService);
processDefinition = await processDefinitionService.getProcessDefinitionByName('simpleProcess', simpleApp); processDefinition = await processDefinitionService
.getProcessDefinitionByName(resources.ACTIVITI7_APPS.SIMPLE_APP.processes.simpleProcess, simpleApp);
processInstancesService = new ProcessInstancesService(apiService); processInstancesService = new ProcessInstancesService(apiService);
processInstance = await processInstancesService.createProcessInstance(processDefinition.entry.key, simpleApp); processInstance = await processInstancesService.createProcessInstance(processDefinition.entry.key, simpleApp);

6
e2e/process-services-cloud/tasks-custom-filters.e2e.ts
View File

@ -84,12 +84,16 @@ describe('Task filters cloud', () => {
} }
processDefinitionService = new ProcessDefinitionsService(apiService); processDefinitionService = new ProcessDefinitionsService(apiService);
const processDefinition = await processDefinitionService.getProcessDefinitionByName('simpleProcess', simpleApp); const processDefinition = await processDefinitionService
.getProcessDefinitionByName(resources.ACTIVITI7_APPS.SIMPLE_APP.processes.simpleProcess, simpleApp);
processInstancesService = new ProcessInstancesService(apiService); processInstancesService = new ProcessInstancesService(apiService);
const processInstance = await processInstancesService.createProcessInstance(processDefinition.entry.key, simpleApp); const processInstance = await processInstancesService.createProcessInstance(processDefinition.entry.key, simpleApp);
const secondProcessInstance = await processInstancesService.createProcessInstance(processDefinition.entry.key, simpleApp); const secondProcessInstance = await processInstancesService.createProcessInstance(processDefinition.entry.key, simpleApp);
queryService = new QueryService(apiService); queryService = new QueryService(apiService);
await browser.driver.sleep(4000); // eventual consistency query
await queryService.getProcessInstanceTasks(secondProcessInstance.entry.id, simpleApp); await queryService.getProcessInstanceTasks(secondProcessInstance.entry.id, simpleApp);
await processInstancesService.suspendProcessInstance(processInstance.entry.id, simpleApp); await processInstancesService.suspendProcessInstance(processInstance.entry.id, simpleApp);
await processInstancesService.deleteProcessInstance(secondProcessInstance.entry.id, simpleApp); await processInstancesService.deleteProcessInstance(secondProcessInstance.entry.id, simpleApp);

11
e2e/util/resources.js
View File

@ -516,14 +516,21 @@ exports.Files = {
exports.ACTIVITI7_APPS = { exports.ACTIVITI7_APPS = {
CANDIDATE_BASE_APP: { CANDIDATE_BASE_APP: {
name: "candidatebaseapp", name: "candidatebaseapp",
file_location: "/resources/activiti7/candidatebaseapp.zip" file_location: "/resources/activiti7/candidatebaseapp.zip",
processes: {
candidateUserProcess: "candidateUserProcess",
candidateGroupProcess: "candidateGroupProcess",
anotherCandidateGroupProcess: "anotherCandidateGroupProcess",
uploadFileProcess: "uploadFileProcess"
}
}, },
SIMPLE_APP: { SIMPLE_APP: {
name: "simpleapp", name: "simpleapp",
file_location: "/resources/activiti7/simpleapp.zip", file_location: "/resources/activiti7/simpleapp.zip",
processes: { processes: {
processwithvariables: "processwithvariables", processwithvariables: "processwithvariables",
simpleProcess: "simpleProcess" simpleProcess: "simpleProcess",
dropdownrestprocess: "dropdownrestprocess"
} }
}, },
SUB_PROCESS_APP: { SUB_PROCESS_APP: {

4
scripts/build/build-all-lib.sh
View File

@ -34,4 +34,6 @@ echo "====== Copy schema ====="
cp ../../lib/core/app-config/schema.json ../../lib/dist/core/app.config.schema.json cp ../../lib/core/app-config/schema.json ../../lib/dist/core/app.config.schema.json
npm run bundlesize-check echo "====== Bundle check ====="
npm run bundlesize-check || exit 1