From 4786a263204b163324a5730665b93526cfc7751c Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Wed, 27 Sep 2023 13:14:24 +0100 Subject: [PATCH] Revert "[APPS-2157] [APPS-2158] [APPS-2161] [APPS-2162] [APPS-2165] migration of e2e test cases from moment to date-fns (#8864)" (#8938) This reverts commit 3638ed06efba4de2d5b39ed0dc7e679552e29c97. --- .../document-list/document-list-component.e2e.ts | 4 ++-- .../process/process-header-cloud.e2e.ts | 8 ++++---- .../task-list/task-header-cloud.e2e.ts | 16 ++++++++-------- .../process/process-instance-details.e2e.ts | 6 +++--- e2e/process-services/tasks/info-drawer.e2e.ts | 10 +++++----- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/e2e/content-services/document-list/document-list-component.e2e.ts b/e2e/content-services/document-list/document-list-component.e2e.ts index 17e27cba46..b51c977945 100644 --- a/e2e/content-services/document-list/document-list-component.e2e.ts +++ b/e2e/content-services/document-list/document-list-component.e2e.ts @@ -19,9 +19,9 @@ import { ContentServicesPage } from '../../core/pages/content-services.page'; import { browser } from 'protractor'; import { createApiService, LoginPage, StringUtil, UploadActions, UsersActions, ViewerPage } from '@alfresco/adf-testing'; import { FileModel } from '../../models/ACS/file.model'; +import * as moment from 'moment'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { NodeEntry } from '@alfresco/js-api'; -import { format } from 'date-fns'; describe('Document List Component', () => { let uploadedFolder: NodeEntry; @@ -146,7 +146,7 @@ describe('Document List Component', () => { it('[C279929] Should be able to display the date with date type', async () => { await apiService.login(acsUser.username, acsUser.password); mediumDateUploadedNode = await uploadActions.uploadFile(mediumFileModel.location, mediumFileModel.name, '-my-'); - const createdDate = format(new Date(mediumDateUploadedNode.createdAt), 'PP'); + const createdDate = moment(mediumDateUploadedNode.createdAt).format('ll'); await contentServicesPage.goToDocumentList(); await contentServicesPage.enableMediumTimeFormat(); const dateValue = await contentServicesPage.getColumnValueForRow(mediumFileModel.name, 'Created'); diff --git a/e2e/process-services-cloud/process/process-header-cloud.e2e.ts b/e2e/process-services-cloud/process/process-header-cloud.e2e.ts index c0f4fb49a9..3e1924d883 100644 --- a/e2e/process-services-cloud/process/process-header-cloud.e2e.ts +++ b/e2e/process-services-cloud/process/process-header-cloud.e2e.ts @@ -21,15 +21,15 @@ import { ProcessCloudDemoPage } from './../pages/process-cloud-demo.page'; import { TasksCloudDemoPage } from './../pages/tasks-cloud-demo.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import CONSTANTS = require('../../util/constants'); +import * as moment from 'moment'; import { EditProcessFilterConfiguration } from './../config/edit-process-filter.config'; -import { format } from 'date-fns'; describe('Process Header cloud component', () => { describe('Process Header cloud component', () => { const simpleApp = browser.params.resources.ACTIVITI_CLOUD_APPS.SIMPLE_APP.name; const subProcessApp = browser.params.resources.ACTIVITI_CLOUD_APPS.SUB_PROCESS_APP.name; - const formatDate = 'MMM d, yyyy'; + const formatDate = 'MMM D, YYYY'; const processHeaderCloudPage = new ProcessHeaderCloudPage(); @@ -76,7 +76,7 @@ describe('Process Header cloud component', () => { runningProcess = await processInstancesService.createProcessInstance(simpleProcess.entry.key, simpleApp, { name: StringUtil.generateRandomString(), businessKey: 'test' }); - runningCreatedDate = format(new Date(runningProcess.entry.startDate), formatDate); + runningCreatedDate = moment(runningProcess.entry.startDate).format(formatDate); parentCompleteProcess = await processInstancesService.createProcessInstance(processparent.entry.key, subProcessApp); @@ -86,7 +86,7 @@ describe('Process Header cloud component', () => { childCompleteProcess = parentProcessInstance.list.entries[0]; - completedCreatedDate = format(new Date(childCompleteProcess.entry.startDate), formatDate); + completedCreatedDate = moment(childCompleteProcess.entry.startDate).format(formatDate); await loginSSOPage.login(testUser.username, testUser.password); await LocalStorageUtil.setConfigField('adf-edit-process-filter', JSON.stringify(editProcessFilterConfigFile)); diff --git a/e2e/process-services-cloud/task-list/task-header-cloud.e2e.ts b/e2e/process-services-cloud/task-list/task-header-cloud.e2e.ts index 33924940c8..547aeecc1b 100644 --- a/e2e/process-services-cloud/task-list/task-header-cloud.e2e.ts +++ b/e2e/process-services-cloud/task-list/task-header-cloud.e2e.ts @@ -29,7 +29,7 @@ import { createApiService, import { browser } from 'protractor'; import { TasksCloudDemoPage } from './../pages/tasks-cloud-demo.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; -import { format } from 'date-fns'; +import * as moment from 'moment'; const isValueInvalid = (value: any): boolean => value === null || value === undefined; @@ -70,8 +70,8 @@ describe('Task Header cloud component', () => { let unclaimedTask: any; const priority = 0; const description = 'descriptionTask'; - const formatDate = 'MMM d, yyyy'; - const dateTimeFormat = 'MMM d, y, H:mm'; + const formatDate = 'MMM D, YYYY'; + const dateTimeFormat = 'MMM D, Y, H:mm'; const createCompletedTask = async function() { const completedTaskId = await tasksService.createStandaloneTask(completedTaskName, @@ -91,7 +91,7 @@ describe('Task Header cloud component', () => { const createdTaskId = await tasksService.createStandaloneTask(basicCreatedTaskName, simpleApp); await tasksService.claimTask(createdTaskId.entry.id, simpleApp); basicCreatedTask = await tasksService.getTask(createdTaskId.entry.id, simpleApp); - basicCreatedDate = format(new Date(basicCreatedTask.entry.createdDate), formatDate); + basicCreatedDate = moment(basicCreatedTask.entry.createdDate).format(formatDate); return createdTaskId; }; @@ -109,12 +109,12 @@ describe('Task Header cloud component', () => { completedTask = await createCompletedTask(); - completedCreatedDate = format(new Date(completedTask.entry.createdDate), formatDate); - dueDate = format(new Date(completedTask.entry.dueDate), dateTimeFormat); - completedEndDate = format(new Date(completedTask.entry.endDate), formatDate); + completedCreatedDate = moment(completedTask.entry.createdDate).format(formatDate); + dueDate = moment(completedTask.entry.dueDate).format(dateTimeFormat); + completedEndDate = moment(completedTask.entry.endDate).format(formatDate); subTask = await createSubTask(createdTaskId); - subTaskCreatedDate = format(new Date(subTask.entry.createdDate), formatDate); + subTaskCreatedDate = moment(subTask.entry.createdDate).format(formatDate); await browser.sleep(3000); await loginSSOPage.login(testUser.username, testUser.password); diff --git a/e2e/process-services/process/process-instance-details.e2e.ts b/e2e/process-services/process/process-instance-details.e2e.ts index 88f2c871a7..51d1525385 100644 --- a/e2e/process-services/process/process-instance-details.e2e.ts +++ b/e2e/process-services/process/process-instance-details.e2e.ts @@ -22,8 +22,8 @@ import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { ProcessServiceTabBarPage } from '../pages/process-service-tab-bar.page'; import { ProcessListPage } from '../pages/process-list.page'; import { ProcessDetailsPage } from '../pages/process-details.page'; +import * as moment from 'moment'; import { AppDefinitionRepresentation, ProcessInstanceRepresentation, ProcessInstancesApi } from '@alfresco/js-api'; -import { format } from 'date-fns'; describe('Process Instance Details', () => { const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; @@ -45,7 +45,7 @@ describe('Process Instance Details', () => { let process: ProcessInstanceRepresentation; let user: UserModel; - const PROCESS_DATE_FORMAT = 'PP'; + const PROCESS_DATE_FORMAT = 'll'; beforeAll(async () => { await apiService.loginWithProfile('admin'); @@ -76,6 +76,6 @@ describe('Process Instance Details', () => { it('[C307031] Should display the created date in the default format', async () => { await processDetailsPage.checkProcessHeaderDetailsAreVisible(); - await expect(await processDetailsPage.getCreated()).toEqual(format(process.started, PROCESS_DATE_FORMAT)); + await expect(await processDetailsPage.getCreated()).toEqual(moment(process.started).format(PROCESS_DATE_FORMAT)); }); }); diff --git a/e2e/process-services/tasks/info-drawer.e2e.ts b/e2e/process-services/tasks/info-drawer.e2e.ts index 5f228009de..79f8cefa4b 100644 --- a/e2e/process-services/tasks/info-drawer.e2e.ts +++ b/e2e/process-services/tasks/info-drawer.e2e.ts @@ -33,7 +33,7 @@ import { ProcessServiceTabBarPage } from './../pages/process-service-tab-bar.pag import { ProcessFiltersPage } from './../pages/process-filters.page'; import { infoDrawerConfiguration } from './../config/task.config'; import CONSTANTS = require('../../util/constants'); -import { format } from 'date-fns'; +import * as moment from 'moment'; describe('Info Drawer', () => { @@ -64,7 +64,7 @@ describe('Info Drawer', () => { priority: '0', category: 'No category', parentName: 'No parent', - dateFormat: 'PP' + dateFormat: 'll' }; let processUserModelFullName: string; @@ -161,7 +161,7 @@ describe('Info Drawer', () => { }); await taskPage.taskDetails().updateDueDate(); - await expect(await taskPage.taskDetails().getDueDate()).toEqual(format(new Date('Aug 1, 2017'), taskDetails.dateFormat)); + await expect(await taskPage.taskDetails().getDueDate()).toEqual(moment('Aug 1, 2017').format(taskDetails.dateFormat)); await taskPage.taskDetails().clickCompleteFormTask(); @@ -342,10 +342,10 @@ describe('Info Drawer', () => { await expect(await taskPage.taskDetails().getDescription()).toEqual(description); await expect(await taskPage.taskDetails().getStatus()).toEqual(status); await expect(await taskPage.taskDetails().getPriority()).toEqual(priority); - await expect(await taskPage.taskDetails().getDueDate()).toEqual(dueDate !== 'No date' ? format(new Date(dueDate), dateFormat) : 'No date'); + await expect(await taskPage.taskDetails().getDueDate()).toEqual(dueDate !== 'No date' ? moment(dueDate).format(dateFormat) : 'No date'); await expect(await taskPage.taskDetails().getCategory()).toEqual(category); await expect(await taskPage.taskDetails().getParentName()).toEqual(parentName); - await expect(await taskPage.taskDetails().getCreated()).toEqual(format(new Date().getTime(), dateFormat)); + await expect(await taskPage.taskDetails().getCreated()).toEqual(moment(Date.now()).format(dateFormat)); await taskPage.taskDetails().waitFormNameEqual(formName); } });