diff --git a/e2e/protractor/suites/search/search-filters.test.ts b/e2e/protractor/suites/search/search-filters.test.ts index a456e6249..6eb1e792e 100644 --- a/e2e/protractor/suites/search/search-filters.test.ts +++ b/e2e/protractor/suites/search/search-filters.test.ts @@ -34,8 +34,7 @@ import { SizeOperator } from '@alfresco/aca-testing-shared'; import { BrowserActions } from '@alfresco/adf-testing'; - -const moment = require('moment'); +import { addDays, format, subDays } from 'date-fns'; describe('Search filters', () => { const random = Utils.random(); @@ -162,9 +161,9 @@ describe('Search filters', () => { }); describe('Filter by Created date', () => { - const yesterday = moment().subtract(1, 'day').format('DD-MMM-YY'); - const today = moment().format('DD-MMM-YY'); - const future = moment().add(1, 'month').format('DD-MMM-YY'); + const yesterday = format(subDays(new Date(), 1), 'dd-MMM-yy'); + const today = format(new Date(), 'dd-MMM-yy'); + const future = format(addDays(new Date(), 1), 'dd-MMM-yy'); afterEach(async () => { await Utils.pressEscape(); diff --git a/e2e/protractor/suites/search/search-results-files-folders.test.ts b/e2e/protractor/suites/search/search-results-files-folders.test.ts index a30cc3fd0..73ed3ff7c 100644 --- a/e2e/protractor/suites/search/search-results-files-folders.test.ts +++ b/e2e/protractor/suites/search/search-results-files-folders.test.ts @@ -23,7 +23,7 @@ */ import { AdminActions, LoginPage, SearchResultsPage, RepoClient, Utils } from '@alfresco/aca-testing-shared'; -const moment = require('moment'); +import { format } from 'date-fns'; describe('Search results - files and folders', () => { const random = Utils.random(); @@ -92,7 +92,7 @@ describe('Search results - files and folders', () => { await dataTable.waitForBody(); const fileEntry = await apis.user.nodes.getNodeById(fileId); - const modifiedDate = moment(fileEntry.entry.modifiedAt).format('MMM D, YYYY, h:mm:ss A'); + const modifiedDate = format(fileEntry.entry.modifiedAt, 'MMM d, yyyy, h:mm:ss aa'); const modifiedBy = fileEntry.entry.modifiedByUser.displayName; const size = fileEntry.entry.content.sizeInBytes; @@ -114,7 +114,7 @@ describe('Search results - files and folders', () => { await dataTable.waitForBody(); const folderEntry = await apis.user.nodes.getNodeById(folderId); - const modifiedDate = moment(folderEntry.entry.modifiedAt).format('MMM D, YYYY, h:mm:ss A'); + const modifiedDate = format(folderEntry.entry.modifiedAt, 'MMM d, yyyy, h:mm:ss aa'); const modifiedBy = folderEntry.entry.modifiedByUser.displayName; expect(await dataTable.isItemPresent(folder)).toBe(true, `${folder} is not displayed`);