AkkomaGang/akkoma-fe
5
13
Fork 64
Code Issues 81 Pull requests 19 Projects Releases 1 Wiki Activity

fix unit tests
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details
ci/woodpecker/pr/woodpecker Pipeline was successful
Details

Browse source
This commit is contained in:
FloatingGhost 2022-07-21 21:53:10 +01:00
parent 668a2f5429
commit 31dbaa4403
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/services/date_utils/date_utils.js
View file

@ -7,7 +7,7 @@ export const MONTH = 30 * DAY
export const YEAR = 365.25 * DAY export const YEAR = 365.25 * DAY
const direction = (diff, nowThreshold) => { const direction = (diff, nowThreshold) => {
if (diff < nowThreshold) { if (Math.abs(diff) < nowThreshold) {
return '' return ''
} }
return diff >= 0 ? 'time.in_past' : 'time.in_future' return diff >= 0 ? 'time.in_past' : 'time.in_future'
@ -16,8 +16,9 @@ const direction = (diff, nowThreshold) => {
export const relativeTime = (date, nowThreshold = 1) => { export const relativeTime = (date, nowThreshold = 1) => {
if (typeof date === 'string') date = Date.parse(date) if (typeof date === 'string') date = Date.parse(date)
const round = Date.now() > date ? Math.floor : Math.ceil const round = Date.now() > date ? Math.floor : Math.ceil
const d = Math.abs(Date.now() - date) const rawD = Date.now() - date
let r = { num: round(d / YEAR), key: 'time.unit.years', direction: direction(d, nowThreshold * SECOND) } const d = Math.abs(rawD)
let r = { num: round(d / YEAR), key: 'time.unit.years', direction: direction(rawD, nowThreshold * SECOND) }
if (d < nowThreshold * SECOND) { if (d < nowThreshold * SECOND) {
r.num = 0 r.num = 0
r.key = 'time.now' r.key = 'time.now'

14
test/unit/specs/services/date_utils/date_utils.spec.js
View file

@ -5,36 +5,36 @@ describe('DateUtils', () => {
it('returns now with low enough amount of seconds', () => { it('returns now with low enough amount of seconds', () => {
const futureTime = Date.now() + 20 * DateUtils.SECOND const futureTime = Date.now() + 20 * DateUtils.SECOND
const pastTime = Date.now() - 20 * DateUtils.SECOND const pastTime = Date.now() - 20 * DateUtils.SECOND
expect(DateUtils.relativeTime(futureTime, 30)).to.eql({ num: 0, key: 'time.now' }) expect(DateUtils.relativeTime(futureTime, 30)).to.eql({ num: 0, key: 'time.now', direction: '' })
expect(DateUtils.relativeTime(pastTime, 30)).to.eql({ num: 0, key: 'time.now' }) expect(DateUtils.relativeTime(pastTime, 30)).to.eql({ num: 0, key: 'time.now', direction: '' })
}) })
it('rounds down for past', () => { it('rounds down for past', () => {
const time = Date.now() - 1.8 * DateUtils.HOUR const time = Date.now() - 1.8 * DateUtils.HOUR
expect(DateUtils.relativeTime(time)).to.eql({ num: 1, key: 'time.unit.hours' }) expect(DateUtils.relativeTime(time)).to.eql({ num: 1, key: 'time.unit.hours', direction: 'time.in_past' })
}) })
it('rounds up for future', () => { it('rounds up for future', () => {
const time = Date.now() + 1.8 * DateUtils.HOUR const time = Date.now() + 1.8 * DateUtils.HOUR
expect(DateUtils.relativeTime(time)).to.eql({ num: 2, key: 'time.unit.hours' }) expect(DateUtils.relativeTime(time)).to.eql({ num: 2, key: 'time.unit.hours', direction: 'time.in_future' })
}) })
it('uses plural when necessary', () => { it('uses plural when necessary', () => {
const time = Date.now() - 3.8 * DateUtils.WEEK const time = Date.now() - 3.8 * DateUtils.WEEK
expect(DateUtils.relativeTime(time)).to.eql({ num: 3, key: 'time.unit.weeks' }) expect(DateUtils.relativeTime(time)).to.eql({ num: 3, key: 'time.unit.weeks', direction: 'time.in_past' })
}) })
it('works with date string', () => { it('works with date string', () => {
const time = Date.now() - 4 * DateUtils.MONTH const time = Date.now() - 4 * DateUtils.MONTH
const dateString = new Date(time).toISOString() const dateString = new Date(time).toISOString()
expect(DateUtils.relativeTime(dateString)).to.eql({ num: 4, key: 'time.unit.months' }) expect(DateUtils.relativeTime(dateString)).to.eql({ num: 4, key: 'time.unit.months', direction: 'time.in_past' })
}) })
}) })
describe('relativeTimeShort', () => { describe('relativeTimeShort', () => {
it('returns the short version of the same relative time', () => { it('returns the short version of the same relative time', () => {
const time = Date.now() + 2 * DateUtils.YEAR const time = Date.now() + 2 * DateUtils.YEAR
expect(DateUtils.relativeTimeShort(time)).to.eql({ num: 2, key: 'time.unit.years_short' }) expect(DateUtils.relativeTimeShort(time)).to.eql({ num: 2, key: 'time.unit.years_short', direction: 'time.in_future' })
}) })
}) })
}) })