Skip to content

Commit d813545

Browse files
authored
Merge pull request #346 from github/copilot/sub-pr-343-another-one
Fix narrow format test expectations for Playwright 1.58.2 / newer Chromium ICU
2 parents a730033 + af55a79 commit d813545

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

src/duration-format-ponyfill.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ export default class DurationFormat {
109109
? twoDigitFormatOptions
110110
: unitStyle === 'numeric'
111111
? {}
112-
: {style: 'unit', unit: nfUnit, unitDisplay: unitStyle}
112+
: {style: 'unit' as const, unit: nfUnit, unitDisplay: unitStyle}
113113

114114
let formattedValue = new Intl.NumberFormat(locale, nfOpts).format(value)
115115

test/relative-time.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1030,7 +1030,7 @@ suite('relative-time', function () {
10301030
datetime: '2022-10-24T14:46:50.000Z',
10311031
format: 'relative',
10321032
formatStyle: 'narrow',
1033-
expected: 'in 50 sec.',
1033+
expected: 'in 50s',
10341034
},
10351035
{
10361036
datetime: '2022-10-24T14:46:50.000Z',
@@ -1109,7 +1109,7 @@ suite('relative-time', function () {
11091109
datetime: '2022-10-24T14:47:30.000Z',
11101110
format: 'relative',
11111111
formatStyle: 'narrow',
1112-
expected: 'in 1 min.',
1112+
expected: 'in 1m',
11131113
},
11141114
{
11151115
datetime: '2022-10-24T14:47:30.000Z',
@@ -1182,7 +1182,7 @@ suite('relative-time', function () {
11821182
datetime: '2022-11-13T15:46:00.000Z',
11831183
format: 'relative',
11841184
formatStyle: 'narrow',
1185-
expected: 'in 3 wk.',
1185+
expected: 'in 3w',
11861186
},
11871187
{
11881188
datetime: '2022-11-13T15:46:00.000Z',
@@ -1559,7 +1559,7 @@ suite('relative-time', function () {
15591559
datetime: '2022-10-24T14:44:30.000Z',
15601560
format: 'relative',
15611561
formatStyle: 'narrow',
1562-
expected: '1 min. ago',
1562+
expected: '1m ago',
15631563
},
15641564
{
15651565
datetime: '2022-10-24T14:44:30.000Z',
@@ -1632,7 +1632,7 @@ suite('relative-time', function () {
16321632
datetime: '2022-10-04T14:46:00.000Z',
16331633
format: 'relative',
16341634
formatStyle: 'narrow',
1635-
expected: '3 wk. ago',
1635+
expected: '3w ago',
16361636
},
16371637
{
16381638
datetime: '2022-10-04T14:46:00.000Z',
@@ -2529,28 +2529,28 @@ suite('relative-time', function () {
25292529
lang: 'en',
25302530
tense: 'future',
25312531
formatStyle: 'narrow',
2532-
expected: 'in 1 hr.',
2532+
expected: 'in 1h',
25332533
},
25342534
{
25352535
datetime: '2022-10-24T16:00:00.000Z',
25362536
lang: 'en',
25372537
tense: 'future',
25382538
formatStyle: 'narrow',
2539-
expected: 'in 1 hr.',
2539+
expected: 'in 1h',
25402540
},
25412541
{
25422542
datetime: '2022-10-24T16:15:00.000Z',
25432543
lang: 'en',
25442544
tense: 'future',
25452545
formatStyle: 'narrow',
2546-
expected: 'in 1 hr.',
2546+
expected: 'in 1h',
25472547
},
25482548
{
25492549
datetime: '2022-10-24T16:31:00.000Z',
25502550
lang: 'en',
25512551
tense: 'future',
25522552
formatStyle: 'narrow',
2553-
expected: 'in 1 hr.',
2553+
expected: 'in 1h',
25542554
},
25552555
{
25562556
datetime: '2022-10-30T14:46:00.000Z',
@@ -2585,14 +2585,14 @@ suite('relative-time', function () {
25852585
lang: 'en',
25862586
tense: 'future',
25872587
formatStyle: 'narrow',
2588-
expected: 'in 2 yr.',
2588+
expected: 'in 2y',
25892589
},
25902590
{
25912591
datetime: '2024-04-01T14:46:00.000Z',
25922592
lang: 'en',
25932593
tense: 'future',
25942594
formatStyle: 'narrow',
2595-
expected: 'in 2 yr.',
2595+
expected: 'in 2y',
25962596
},
25972597

25982598
// Dates in the future
@@ -2681,28 +2681,28 @@ suite('relative-time', function () {
26812681
lang: 'en',
26822682
tense: 'past',
26832683
formatStyle: 'narrow',
2684-
expected: '1 hr. ago',
2684+
expected: '1h ago',
26852685
},
26862686
{
26872687
datetime: '2022-10-24T13:30:00.000Z',
26882688
lang: 'en',
26892689
tense: 'past',
26902690
formatStyle: 'narrow',
2691-
expected: '1 hr. ago',
2691+
expected: '1h ago',
26922692
},
26932693
{
26942694
datetime: '2022-10-24T13:17:00.000Z',
26952695
lang: 'en',
26962696
tense: 'past',
26972697
formatStyle: 'narrow',
2698-
expected: '1 hr. ago',
2698+
expected: '1h ago',
26992699
},
27002700
{
27012701
datetime: '2022-10-24T13:01:00.000Z',
27022702
lang: 'en',
27032703
tense: 'past',
27042704
formatStyle: 'narrow',
2705-
expected: '1 hr. ago',
2705+
expected: '1h ago',
27062706
},
27072707
{
27082708
datetime: '2022-10-18T14:46:00.000Z',

0 commit comments

Comments
 (0)