From 219fa6a1ac3e1a993c22d2a2819729c0a08463c1 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Tue, 18 Jun 2019 11:45:20 +0100 Subject: [PATCH] use date format via config --- e2e/configs.ts | 4 ++++ .../info-drawer/file-folder-properties.test.ts | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/e2e/configs.ts b/e2e/configs.ts index fe21ffde5..9b3997d77 100755 --- a/e2e/configs.ts +++ b/e2e/configs.ts @@ -42,6 +42,10 @@ export const ADMIN_FULL_NAME = 'Administrator'; export const E2E_ROOT_PATH = __dirname; +// Dates +export const DATE_FORMAT = 'MMM DD, YYYY'; +export const DATE_TIME_FORMAT = 'MMM D, YYYY, h:mm'; + // Application Routes export const APP_ROUTES = { FAVORITES: '/favorites', diff --git a/e2e/suites/info-drawer/file-folder-properties.test.ts b/e2e/suites/info-drawer/file-folder-properties.test.ts index 8cfb0c5d7..d26ad95b1 100755 --- a/e2e/suites/info-drawer/file-folder-properties.test.ts +++ b/e2e/suites/info-drawer/file-folder-properties.test.ts @@ -27,7 +27,7 @@ import { LoginPage, BrowsingPage } from '../../pages/pages'; import { RepoClient } from '../../utilities/repo-client/repo-client'; import { InfoDrawer } from './../../components/info-drawer/info-drawer'; import { Utils } from '../../utilities/utils'; -import { FILES } from '../../configs'; +import { FILES, DATE_TIME_FORMAT, DATE_FORMAT } from '../../configs'; import * as moment from 'moment'; describe('File / Folder properties', () => { @@ -124,10 +124,10 @@ describe('File / Folder properties', () => { file1.name, file1.title, apiProps.entry.createdByUser.displayName, - moment(apiProps.entry.createdAt).format('MMM DD, YYYY'), + moment(apiProps.entry.createdAt).format(DATE_FORMAT), `${apiProps.entry.content.sizeInBytes} Bytes`, apiProps.entry.modifiedByUser.displayName, - moment(apiProps.entry.modifiedAt).format('MMM DD, YYYY'), + moment(apiProps.entry.modifiedAt).format(DATE_FORMAT), apiProps.entry.content.mimeTypeName, file1.author, file1.description @@ -160,9 +160,9 @@ describe('File / Folder properties', () => { folder1.name, folder1.title, apiProps.entry.createdByUser.displayName, - moment(apiProps.entry.createdAt).format('MMM DD, YYYY'), + moment(apiProps.entry.createdAt).format(DATE_FORMAT), apiProps.entry.modifiedByUser.displayName, - moment(apiProps.entry.modifiedAt).format('MMM DD, YYYY'), + moment(apiProps.entry.modifiedAt).format(DATE_FORMAT), folder1.author, folder1.description ]; @@ -218,7 +218,7 @@ describe('File / Folder properties', () => { const expectedPropValues = [ apiProps.entry.properties['exif:pixelXDimension'].toString(), apiProps.entry.properties['exif:pixelYDimension'].toString(), - moment(apiProps.entry.properties['exif:dateTimeOriginal']).format('MMM D, YYYY, h:mm'), + moment(apiProps.entry.properties['exif:dateTimeOriginal']).format(DATE_TIME_FORMAT), apiProps.entry.properties['exif:exposureTime'].toString(), apiProps.entry.properties['exif:fNumber'].toString(), apiProps.entry.properties['exif:flash'],