diff --git a/e2e/pages/adf/process-services/processDetailsPage.ts b/e2e/pages/adf/process-services/processDetailsPage.ts index 38daef1759..44328eb13a 100644 --- a/e2e/pages/adf/process-services/processDetailsPage.ts +++ b/e2e/pages/adf/process-services/processDetailsPage.ts @@ -45,6 +45,7 @@ export class ProcessDetailsPage { cancelProcessButton = element(by.css('div[data-automation-id="header-status"] > button')); // Tasks activeTask = element(by.css('div[data-automation-id="active-tasks"]')); + startForm = element(by.css('div[data-automation-id="start-form"]')); completedTask = element(by.css('div[data-automation-id="completed-tasks"]')); taskTitle = element(by.css('h2[class="adf-activiti-task-details__header"]')); @@ -141,6 +142,10 @@ export class ProcessDetailsPage { return BrowserActions.click(this.activeTask); } + clickOnStartForm() { + return BrowserActions.click(this.startForm); + } + clickOnCompletedTask() { return BrowserActions.click(this.completedTask); } diff --git a/e2e/pages/adf/process-services/startProcessPage.ts b/e2e/pages/adf/process-services/startProcessPage.ts index 3350d9e9fc..cbbfc06915 100644 --- a/e2e/pages/adf/process-services/startProcessPage.ts +++ b/e2e/pages/adf/process-services/startProcessPage.ts @@ -16,7 +16,7 @@ */ import { by, element, Key, protractor, browser } from 'protractor'; -import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing'; +import { BrowserVisibility, BrowserActions, FormFields } from '@alfresco/adf-testing'; export class StartProcessPage { @@ -120,6 +120,10 @@ export class StartProcessPage { } + checkStartFormProcessButtonIsEnabled() { + expect(this.formStartProcessButton.isEnabled()).toBe(true); + } + checkStartProcessButtonIsEnabled() { expect(this.startProcessButton.isEnabled()).toBe(true); } @@ -160,4 +164,8 @@ export class StartProcessPage { } }); } + + formFields() { + return new FormFields(); + } } diff --git a/e2e/process-services/start-process-component.e2e.ts b/e2e/process-services/start-process-component.e2e.ts index f5747de133..e87756126d 100644 --- a/e2e/process-services/start-process-component.e2e.ts +++ b/e2e/process-services/start-process-component.e2e.ts @@ -18,7 +18,7 @@ import { Util } from '../util/util'; import resources = require('../util/resources'); import CONSTANTS = require('../util/constants'); -import { LoginPage } from '@alfresco/adf-testing'; +import { LoginPage, StartProcessDialog, Widget } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; import { StartProcessPage } from '../pages/adf/process-services/startProcessPage'; @@ -49,10 +49,13 @@ describe('Start Process Component', () => { const processServiceTabBarPage = new ProcessServiceTabBarPage(); const processDetailsPage = new ProcessDetailsPage(); const attachmentListPage = new AttachmentListPage(); + const startProcessDialog = new StartProcessDialog(); const apps = new AppsActions(); + const widget = new Widget(); const app = resources.Files.APP_WITH_PROCESSES; const simpleApp = resources.Files.WIDGETS_SMOKE_TEST; - let appId, procUserModel, secondProcUserModel, tenantId, simpleAppCreated; + const dateFormApp = resources.Files.APP_WITH_DATE_FIELD_FORM; + let appId, procUserModel, secondProcUserModel, tenantId, simpleAppCreated, dateFormAppCreated; const processModelWithSe = 'process_with_se', processModelWithoutSe = 'process_without_se'; const processName255Characters = StringUtil.generateRandomString(255); const processNameBiggerThen255Characters = StringUtil.generateRandomString(256); @@ -93,6 +96,8 @@ describe('Start Process Component', () => { simpleAppCreated = await apps.importPublishDeployApp(this.alfrescoJsApiUserTwo, simpleApp.file_location); + dateFormAppCreated = await apps.importPublishDeployApp(this.alfrescoJsApiUserTwo, dateFormApp.file_location); + appId = appCreated.id; done(); @@ -104,6 +109,8 @@ describe('Start Process Component', () => { await this.alfrescoJsApiUserTwo.activiti.modelsApi.deleteModel(simpleAppCreated.id); + await this.alfrescoJsApiUserTwo.activiti.modelsApi.deleteModel(dateFormAppCreated.id); + await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(tenantId); done(); @@ -445,5 +452,26 @@ describe('Start Process Component', () => { startProcessPage.checkValidationErrorIsDisplayed(lengthValidationError); startProcessPage.checkStartProcessButtonIsDisabled(); }); + + it('[C261039] Advanced date time widget', () => { + processServicesPage.goToApp(dateFormApp.title); + processServiceTabBarPage.clickProcessButton(); + processFiltersPage.clickCreateProcessButton(); + processFiltersPage.clickNewProcessDropdown(); + startProcessPage.enterProcessName('DateFormProcess'); + startProcessPage.formFields().checkWidgetIsVisible('testdate'); + widget.dateWidget().setDateInput('testdate', '15-7-2019'); + startProcessPage.checkStartFormProcessButtonIsEnabled(); + startProcessPage.clickFormStartProcessButton(); + + processFiltersPage.clickRunningFilterButton(); + processFiltersPage.selectFromProcessList('DateFormProcess'); + processDetailsPage.clickOnStartForm(); + startProcessDialog.checkStartProcessDialogIsDisplayed(); + expect(startProcessDialog.getTitle()).toBe('Start Form'); + expect(widget.dateWidget().getDateInput('testdate')).toBe('15-7-2019'); + startProcessDialog.clickCloseButton(); + startProcessDialog.checkStartProcessDialogIsNotDisplayed(); + }); }); }); diff --git a/lib/process-services/process-list/components/process-instance-tasks.component.html b/lib/process-services/process-list/components/process-instance-tasks.component.html index 1413c18654..d77cbba430 100644 --- a/lib/process-services/process-list/components/process-instance-tasks.component.html +++ b/lib/process-services/process-list/components/process-instance-tasks.component.html @@ -33,7 +33,7 @@ {{ 'ADF_PROCESS_LIST.DETAILS.LABELS.START_FORM'|translate }} -