Add pikaday parsing methods
Adds methods from `app/assets/javascripts/lib/utils/datefix.js` and deletes the files
This commit is contained in:
parent
b686b3d524
commit
135ef0465d
4 changed files with 55 additions and 55 deletions
|
@ -1,28 +0,0 @@
|
|||
export const pad = (val, len = 2) => `0${val}`.slice(-len);
|
||||
|
||||
/**
|
||||
* Formats dates in Pickaday
|
||||
* @param {String} dateString Date in yyyy-mm-dd format
|
||||
* @return {Date} UTC format
|
||||
*/
|
||||
export const parsePikadayDate = dateString => {
|
||||
const parts = dateString.split('-');
|
||||
const year = parseInt(parts[0], 10);
|
||||
const month = parseInt(parts[1] - 1, 10);
|
||||
const day = parseInt(parts[2], 10);
|
||||
|
||||
return new Date(year, month, day);
|
||||
};
|
||||
|
||||
/**
|
||||
* Used `onSelect` method in pickaday
|
||||
* @param {Date} date UTC format
|
||||
* @return {String} Date formated in yyyy-mm-dd
|
||||
*/
|
||||
export const pikadayToString = date => {
|
||||
const day = pad(date.getDate());
|
||||
const month = pad(date.getMonth() + 1);
|
||||
const year = date.getFullYear();
|
||||
|
||||
return `${year}-${month}-${day}`;
|
||||
};
|
|
@ -46,6 +46,8 @@ const getMonthNames = abbreviated => {
|
|||
];
|
||||
};
|
||||
|
||||
export const pad = (val, len = 2) => `0${val}`.slice(-len);
|
||||
|
||||
/**
|
||||
* Given a date object returns the day of the week in English
|
||||
* @param {date} date
|
||||
|
@ -388,3 +390,30 @@ export const formatTime = milliseconds => {
|
|||
formattedTime += remainingSeconds;
|
||||
return formattedTime;
|
||||
};
|
||||
|
||||
/**
|
||||
* Formats dates in Pickaday
|
||||
* @param {String} dateString Date in yyyy-mm-dd format
|
||||
* @return {Date} UTC format
|
||||
*/
|
||||
export const parsePikadayDate = dateString => {
|
||||
const parts = dateString.split('-');
|
||||
const year = parseInt(parts[0], 10);
|
||||
const month = parseInt(parts[1] - 1, 10);
|
||||
const day = parseInt(parts[2], 10);
|
||||
|
||||
return new Date(year, month, day);
|
||||
};
|
||||
|
||||
/**
|
||||
* Used `onSelect` method in pickaday
|
||||
* @param {Date} date UTC format
|
||||
* @return {String} Date formated in yyyy-mm-dd
|
||||
*/
|
||||
export const pikadayToString = date => {
|
||||
const day = pad(date.getDate());
|
||||
const month = pad(date.getMonth() + 1);
|
||||
const year = date.getFullYear();
|
||||
|
||||
return `${year}-${month}-${day}`;
|
||||
};
|
||||
|
|
|
@ -192,3 +192,29 @@ describe('formatTime', () => {
|
|||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('datefix', () => {
|
||||
describe('pad', () => {
|
||||
it('should add a 0 when length is smaller than 2', () => {
|
||||
expect(datetimeUtility.pad(2)).toEqual('02');
|
||||
});
|
||||
|
||||
it('should not add a zero when lenght matches the default', () => {
|
||||
expect(datetimeUtility.pad(12)).toEqual('12');
|
||||
});
|
||||
|
||||
it('should add a 0 when lenght is smaller than the provided', () => {
|
||||
expect(datetimeUtility.pad(12, 3)).toEqual('012');
|
||||
});
|
||||
});
|
||||
|
||||
describe('parsePikadayDate', () => {
|
||||
// removed because of https://gitlab.com/gitlab-org/gitlab-ce/issues/39834
|
||||
});
|
||||
|
||||
describe('pikadayToString', () => {
|
||||
it('should format a UTC date into yyyy-mm-dd format', () => {
|
||||
expect(datetimeUtility.pikadayToString(new Date('2020-01-29:00:00'))).toEqual('2020-01-29');
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
@ -1,27 +0,0 @@
|
|||
import { pad, pikadayToString } from '~/lib/utils/datefix';
|
||||
|
||||
describe('datefix', () => {
|
||||
describe('pad', () => {
|
||||
it('should add a 0 when length is smaller than 2', () => {
|
||||
expect(pad(2)).toEqual('02');
|
||||
});
|
||||
|
||||
it('should not add a zero when lenght matches the default', () => {
|
||||
expect(pad(12)).toEqual('12');
|
||||
});
|
||||
|
||||
it('should add a 0 when lenght is smaller than the provided', () => {
|
||||
expect(pad(12, 3)).toEqual('012');
|
||||
});
|
||||
});
|
||||
|
||||
describe('parsePikadayDate', () => {
|
||||
// removed because of https://gitlab.com/gitlab-org/gitlab-ce/issues/39834
|
||||
});
|
||||
|
||||
describe('pikadayToString', () => {
|
||||
it('should format a UTC date into yyyy-mm-dd format', () => {
|
||||
expect(pikadayToString(new Date('2020-01-29:00:00'))).toEqual('2020-01-29');
|
||||
});
|
||||
});
|
||||
});
|
Loading…
Reference in a new issue