Skip to content

Commit c2c7395

Browse files
committed
fix: test
1 parent 21d6006 commit c2c7395

File tree

2 files changed

+33
-17
lines changed

2 files changed

+33
-17
lines changed
Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { locale } from '$lib/stores/preferences.store';
12
import { parseUtcDate } from '$lib/utils/date-time';
23
import { formatGroupTitle } from '$lib/utils/timeline-util';
34
import { DateTime } from 'luxon';
@@ -16,48 +17,63 @@ describe('formatGroupTitle', () => {
1617

1718
it('formats today', () => {
1819
const date = parseUtcDate('2024-07-27T01:00:00Z');
19-
expect(formatGroupTitle(date.setLocale('en'))).toBe('today');
20-
expect(formatGroupTitle(date.setLocale('es'))).toBe('hoy');
20+
locale.set('en');
21+
expect(formatGroupTitle(date)).toBe('today');
22+
locale.set('es');
23+
expect(formatGroupTitle(date)).toBe('hoy');
2124
});
2225

2326
it('formats yesterday', () => {
2427
const date = parseUtcDate('2024-07-26T23:59:59Z');
25-
expect(formatGroupTitle(date.setLocale('en'))).toBe('yesterday');
26-
expect(formatGroupTitle(date.setLocale('fr'))).toBe('hier');
28+
locale.set('en');
29+
expect(formatGroupTitle(date)).toBe('yesterday');
30+
locale.set('fr');
31+
expect(formatGroupTitle(date)).toBe('hier');
2732
});
2833

2934
it('formats last week', () => {
3035
const date = parseUtcDate('2024-07-21T00:00:00Z');
31-
expect(formatGroupTitle(date.setLocale('en'))).toBe('Sunday');
32-
expect(formatGroupTitle(date.setLocale('ar-SA'))).toBe('الأحد');
36+
locale.set('en');
37+
expect(formatGroupTitle(date)).toBe('Sunday');
38+
locale.set('ar-SA')
39+
expect(formatGroupTitle(date)).toBe('الأحد');
3340
});
3441

3542
it('formats date 7 days ago', () => {
3643
const date = parseUtcDate('2024-07-20T00:00:00Z');
37-
expect(formatGroupTitle(date.setLocale('en'))).toBe('Sat, Jul 20');
38-
expect(formatGroupTitle(date.setLocale('de'))).toBe('Sa., 20. Juli');
44+
locale.set('en');
45+
expect(formatGroupTitle(date)).toBe('Sat, Jul 20');
46+
locale.set('de')
47+
expect(formatGroupTitle(date)).toBe('Sa., 20. Juli');
3948
});
4049

4150
it('formats date this year', () => {
4251
const date = parseUtcDate('2020-01-01T00:00:00Z');
43-
expect(formatGroupTitle(date.setLocale('en'))).toBe('Wed, Jan 1, 2020');
44-
expect(formatGroupTitle(date.setLocale('ja'))).toBe('2020年1月1日(水)');
52+
locale.set('en');
53+
expect(formatGroupTitle(date)).toBe('Wed, Jan 1, 2020');
54+
locale.set('ja')
55+
expect(formatGroupTitle(date)).toBe('2020年1月1日(水)');
4556
});
4657

4758
it('formats future date', () => {
4859
const tomorrow = parseUtcDate('2024-07-28T00:00:00Z');
49-
expect(formatGroupTitle(tomorrow.setLocale('en'))).toBe('Sun, Jul 28');
60+
locale.set('en')
61+
expect(formatGroupTitle(tomorrow)).toBe('Sun, Jul 28');
5062

5163
const nextMonth = parseUtcDate('2024-08-28T00:00:00Z');
52-
expect(formatGroupTitle(nextMonth.setLocale('en'))).toBe('Wed, Aug 28');
64+
locale.set('en');
65+
expect(formatGroupTitle(nextMonth)).toBe('Wed, Aug 28');
5366

5467
const nextYear = parseUtcDate('2025-01-10T12:00:00Z');
55-
expect(formatGroupTitle(nextYear.setLocale('en'))).toBe('Fri, Jan 10, 2025');
68+
locale.set('en');
69+
expect(formatGroupTitle(nextYear)).toBe('Fri, Jan 10, 2025');
5670
});
5771

5872
it('returns "Invalid DateTime" when date is invalid', () => {
5973
const date = DateTime.invalid('test');
60-
expect(formatGroupTitle(date.setLocale('en'))).toBe('Invalid DateTime');
61-
expect(formatGroupTitle(date.setLocale('es'))).toBe('Invalid DateTime');
74+
locale.set('en');
75+
expect(formatGroupTitle(date)).toBe('Invalid DateTime');
76+
locale.set('es');
77+
expect(formatGroupTitle(date)).toBe('Invalid DateTime');
6278
});
6379
});

web/src/lib/utils/timeline-util.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ export function formatGroupTitle(_date: DateTime): string {
6262

6363
// Today
6464
if (today.hasSame(date, 'day')) {
65-
return date.toRelativeCalendar();
65+
return date.toRelativeCalendar({ locale: get(locale) });
6666
}
6767

6868
// Yesterday
6969
if (today.minus({ days: 1 }).hasSame(date, 'day')) {
70-
return date.toRelativeCalendar();
70+
return date.toRelativeCalendar({ locale: get(locale) });
7171
}
7272

7373
// Last week

0 commit comments

Comments
 (0)