Skip to content

Commit 1a4d87a

Browse files
mgolmgol
authored
Tests: Indicate Chrome 112 & Safari 16.4 pass the cssHas support test (3.x version)
Chrome 112 & Safari 16.4 introduce two changes: * `:has()` is non-forgiving * `CSS.supports( "selector(...)" )` parses everything in a non-forgiving way We no longer care about the latter but the former means the `cssHas` support test now passes. Closes gh-5226
1 parent 7bb48a0 commit 1a4d87a

File tree

2 files changed

+78
-28
lines changed

2 files changed

+78
-28
lines changed

‎src/selector.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -558,8 +558,8 @@ function setDocument( node ) {
558558
return document.querySelectorAll( ":scope" );
559559
} );
560560

561-
// Support: Chrome 105 - 110+, Safari 15.4 - 16.3+
562-
// Make sure the the `:has()` argument is parsed unforgivingly.
561+
// Support: Chrome 105 - 111 only, Safari 15.4 - 16.3 only
562+
// Make sure the `:has()` argument is parsed unforgivingly.
563563
// We include `*` in the test to detect buggy implementations that are
564564
// _selectively_ forgiving (specifically when the list includes at least
565565
// one valid selector).

‎test/unit/support.js

+76-26
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ testIframe(
130130
sortDetached: true,
131131
sortStable: true
132132
},
133-
chrome: {
133+
chrome_111: {
134134
ajax: true,
135135
boxSizingReliable: true,
136136
checkClone: true,
@@ -154,7 +154,31 @@ testIframe(
154154
sortDetached: true,
155155
sortStable: true
156156
},
157-
safari: {
157+
chrome: {
158+
ajax: true,
159+
boxSizingReliable: true,
160+
checkClone: true,
161+
checkOn: true,
162+
clearCloneStyle: true,
163+
cssHas: true,
164+
cors: true,
165+
createHTMLDocument: true,
166+
disconnectedMatch: true,
167+
getById: true,
168+
noCloneChecked: true,
169+
option: true,
170+
optSelected: true,
171+
pixelBoxStyles: true,
172+
pixelPosition: true,
173+
radioValue: true,
174+
reliableMarginLeft: true,
175+
reliableTrDimensions: true,
176+
scope: true,
177+
scrollboxSize: true,
178+
sortDetached: true,
179+
sortStable: true
180+
},
181+
safari_16_3: {
158182
ajax: true,
159183
boxSizingReliable: true,
160184
checkClone: true,
@@ -178,7 +202,7 @@ testIframe(
178202
sortDetached: true,
179203
sortStable: true
180204
},
181-
webkit: {
205+
safari: {
182206
ajax: true,
183207
boxSizingReliable: true,
184208
checkClone: true,
@@ -202,7 +226,7 @@ testIframe(
202226
sortDetached: true,
203227
sortStable: true
204228
},
205-
firefox_60: {
229+
webkit: {
206230
ajax: true,
207231
boxSizingReliable: true,
208232
checkClone: true,
@@ -219,14 +243,14 @@ testIframe(
219243
pixelBoxStyles: true,
220244
pixelPosition: true,
221245
radioValue: true,
222-
reliableMarginLeft: false,
246+
reliableMarginLeft: true,
223247
reliableTrDimensions: true,
224248
scope: true,
225249
scrollboxSize: true,
226250
sortDetached: true,
227251
sortStable: true
228252
},
229-
firefox_102: {
253+
firefox_60: {
230254
ajax: true,
231255
boxSizingReliable: true,
232256
checkClone: true,
@@ -243,8 +267,8 @@ testIframe(
243267
pixelBoxStyles: true,
244268
pixelPosition: true,
245269
radioValue: true,
246-
reliableMarginLeft: true,
247-
reliableTrDimensions: false,
270+
reliableMarginLeft: false,
271+
reliableTrDimensions: true,
248272
scope: true,
249273
scrollboxSize: true,
250274
sortDetached: true,
@@ -370,7 +394,7 @@ testIframe(
370394
sortDetached: true,
371395
sortStable: true
372396
},
373-
ios: {
397+
ios_15_4_16_3: {
374398
ajax: true,
375399
boxSizingReliable: true,
376400
checkClone: true,
@@ -394,6 +418,30 @@ testIframe(
394418
sortDetached: true,
395419
sortStable: true
396420
},
421+
ios: {
422+
ajax: true,
423+
boxSizingReliable: true,
424+
checkClone: true,
425+
checkOn: true,
426+
clearCloneStyle: true,
427+
cssHas: true,
428+
cors: true,
429+
createHTMLDocument: true,
430+
disconnectedMatch: true,
431+
getById: true,
432+
noCloneChecked: true,
433+
option: true,
434+
optSelected: true,
435+
pixelBoxStyles: true,
436+
pixelPosition: true,
437+
radioValue: true,
438+
reliableMarginLeft: true,
439+
reliableTrDimensions: true,
440+
scope: true,
441+
scrollboxSize: true,
442+
sortDetached: true,
443+
sortStable: true
444+
},
397445
android: {
398446
ajax: true,
399447
boxSizingReliable: true,
@@ -440,36 +488,36 @@ testIframe(
440488
}
441489
}
442490

443-
if ( /edge\//i.test( userAgent ) ) {
491+
if ( /\bedge\//i.test( userAgent ) ) {
444492
expected = expectedMap.edge;
445-
} else if ( /msie 9\.0/i.test( userAgent ) ) {
493+
} else if ( /\bmsie 9\.0/i.test( userAgent ) ) {
446494
expected = expectedMap.ie_9;
447-
} else if ( /(msie 10\.0|trident\/7\.0)/i.test( userAgent ) ) {
495+
} else if ( /\b(?:msie 10\.0|trident\/7\.0)/i.test( userAgent ) ) {
448496
expected = expectedMap.ie_10_11;
449-
} else if ( /chrome/i.test( userAgent ) ) {
497+
} else if ( /\b(?:headless)?chrome\/(?:10\d|11[01])\b/i.test( userAgent ) ) {
498+
expected = expectedMap.chrome_111;
499+
} else if ( /\b(?:headless)?chrome\//i.test( userAgent ) ) {
450500

451501
// Catches Chrome on Android as well (i.e. the default
452502
// Android browser on Android >= 4.4).
453503
expected = expectedMap.chrome;
454-
} else if ( /\b(?:9|10)\.\d+(\.\d+)* safari/i.test( userAgent ) ) {
455-
expected = expectedMap.safari_9_10;
456-
} else if ( /firefox\/[456]\d\b/i.test( userAgent ) ) {
504+
} else if ( /\bfirefox\/[456]\d\b/i.test( userAgent ) ) {
457505
expected = expectedMap.firefox_60;
458-
} else if ( /firefox\/(?:[789]\d|102)\b/i.test( userAgent ) ) {
459-
expected = expectedMap.firefox_102;
460-
} else if ( /firefox/i.test( userAgent ) ) {
506+
} else if ( /\bfirefox\//i.test( userAgent ) ) {
461507
expected = expectedMap.firefox;
462-
} else if ( /android 4\.[0-3]/i.test( userAgent ) ) {
508+
} else if ( /\bandroid 4\.[0-3]/i.test( userAgent ) ) {
463509
expected = expectedMap.android;
464-
} else if ( /iphone os 7_/i.test( userAgent ) ) {
510+
} else if ( /\biphone os 7_/i.test( userAgent ) ) {
465511
expected = expectedMap.ios_7;
466-
} else if ( /iphone os 8_/i.test( userAgent ) ) {
512+
} else if ( /\biphone os 8_/i.test( userAgent ) ) {
467513
expected = expectedMap.ios_8;
468-
} else if ( /iphone os (?:9|10)_/i.test( userAgent ) ) {
514+
} else if ( /\biphone os (?:9|10)_/i.test( userAgent ) ) {
469515
expected = expectedMap.ios_9_10;
470-
} else if ( /iphone os (?:1[1234]_|15_[0123])/i.test( userAgent ) ) {
516+
} else if ( /\biphone os (?:1[1234]_|15_[0123])/i.test( userAgent ) ) {
471517
expected = expectedMap.ios_11_15_3;
472-
} else if ( /(?:iphone|ipad);.*(?:iphone)? os \d+_/i.test( userAgent ) ) {
518+
} else if ( /\biphone os (?:15_|16_[0123])/i.test( userAgent ) ) {
519+
expected = expectedMap.ios_15_4_16_3;
520+
} else if ( /\b(?:iphone|ipad);.*(?:iphone)? os \d+_/i.test( userAgent ) ) {
473521
expected = expectedMap.ios;
474522
} else if ( typeof URLSearchParams !== "undefined" &&
475523

@@ -483,7 +531,9 @@ testIframe(
483531
) === "Playwright"
484532
) {
485533
expected = expectedMap.webkit;
486-
} else if ( /\b\d+(\.\d+)+ safari/i.test( userAgent ) ) {
534+
} else if ( /\bversion\/(?:15|16\.[0123])(?:\.\d+)* safari/i.test( userAgent ) ) {
535+
expected = expectedMap.safari_16_3;
536+
} else if ( /\bversion\/\d+(?:\.\d+)+ safari/i.test( userAgent ) ) {
487537
expected = expectedMap.safari;
488538
}
489539

0 commit comments

Comments
 (0)