use date format via config

This commit is contained in:
Denys Vuika
2019-06-18 11:45:20 +01:00
parent c71afa2e34
commit 219fa6a1ac
2 changed files with 10 additions and 6 deletions

View File

@@ -42,6 +42,10 @@ export const ADMIN_FULL_NAME = 'Administrator';
export const E2E_ROOT_PATH = __dirname; 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 // Application Routes
export const APP_ROUTES = { export const APP_ROUTES = {
FAVORITES: '/favorites', FAVORITES: '/favorites',

View File

@@ -27,7 +27,7 @@ import { LoginPage, BrowsingPage } from '../../pages/pages';
import { RepoClient } from '../../utilities/repo-client/repo-client'; import { RepoClient } from '../../utilities/repo-client/repo-client';
import { InfoDrawer } from './../../components/info-drawer/info-drawer'; import { InfoDrawer } from './../../components/info-drawer/info-drawer';
import { Utils } from '../../utilities/utils'; import { Utils } from '../../utilities/utils';
import { FILES } from '../../configs'; import { FILES, DATE_TIME_FORMAT, DATE_FORMAT } from '../../configs';
import * as moment from 'moment'; import * as moment from 'moment';
describe('File / Folder properties', () => { describe('File / Folder properties', () => {
@@ -124,10 +124,10 @@ describe('File / Folder properties', () => {
file1.name, file1.name,
file1.title, file1.title,
apiProps.entry.createdByUser.displayName, 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.content.sizeInBytes} Bytes`,
apiProps.entry.modifiedByUser.displayName, apiProps.entry.modifiedByUser.displayName,
moment(apiProps.entry.modifiedAt).format('MMM DD, YYYY'), moment(apiProps.entry.modifiedAt).format(DATE_FORMAT),
apiProps.entry.content.mimeTypeName, apiProps.entry.content.mimeTypeName,
file1.author, file1.author,
file1.description file1.description
@@ -160,9 +160,9 @@ describe('File / Folder properties', () => {
folder1.name, folder1.name,
folder1.title, folder1.title,
apiProps.entry.createdByUser.displayName, apiProps.entry.createdByUser.displayName,
moment(apiProps.entry.createdAt).format('MMM DD, YYYY'), moment(apiProps.entry.createdAt).format(DATE_FORMAT),
apiProps.entry.modifiedByUser.displayName, apiProps.entry.modifiedByUser.displayName,
moment(apiProps.entry.modifiedAt).format('MMM DD, YYYY'), moment(apiProps.entry.modifiedAt).format(DATE_FORMAT),
folder1.author, folder1.author,
folder1.description folder1.description
]; ];
@@ -218,7 +218,7 @@ describe('File / Folder properties', () => {
const expectedPropValues = [ const expectedPropValues = [
apiProps.entry.properties['exif:pixelXDimension'].toString(), apiProps.entry.properties['exif:pixelXDimension'].toString(),
apiProps.entry.properties['exif:pixelYDimension'].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:exposureTime'].toString(),
apiProps.entry.properties['exif:fNumber'].toString(), apiProps.entry.properties['exif:fNumber'].toString(),
apiProps.entry.properties['exif:flash'], apiProps.entry.properties['exif:flash'],