vikunja
/
vikunja
6
43
Fork 71
Code Issues 150 Pull Requests 15 Packages Releases 32 Activity

fix: unit test for "should recognize dates of the month in the past but next month" (#1131) 

Co-authored-by: Dominik Pschenitschni <mail@celement.de>
Reviewed-on: vikunja/frontend#1131
Reviewed-by: konrad <k@knt.li>
Co-authored-by: Dominik Pschenitschni <dpschen@noreply.kolaente.de>
Co-committed-by: Dominik Pschenitschni <dpschen@noreply.kolaente.de>
This commit is contained in:
Dominik Pschenitschni 2021-12-02 15:39:46 +00:00 committed by konrad
parent e535584412
commit 20f0496fa5
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/helpers/time/parseDate.ts
View File

@ -297,7 +297,8 @@ const getDayFromText = (text: string) => {
}
}
const date = new Date()
const now = new Date()
const date = new Date(now)
const day = parseInt(results[0])
date.setDate(day)
@ -309,7 +310,7 @@ const getDayFromText = (text: string) => {
date.setDate(day)
}
if (date < new Date()) {
if (date < now) {
date.setMonth(date.getMonth() + 1)
}

6
src/modules/parseTaskText.test.js
View File

@ -208,7 +208,11 @@ describe('Parse Task Text', () => {
expect(result.text).toBe('Lorem Ipsum')
expect(result.date.getDate()).toBe(date.getDate())
expect(result.date.getMonth()).toBe(result.date.getDate() === 31 ? date.getMonth() + 2 : date.getMonth() + 1)
const nextMonthWithDate = result.date.getDate() === 31
? (date.getMonth() + 2) % 12
: (date.getMonth() + 1) % 12
expect(result.date.getMonth()).toBe(nextMonthWithDate)
})
it('should recognize dates of the month in the future', () => {
const nextDay = new Date(+new Date() + 60 * 60 * 24 * 1000)