Skip to content

Commit 8167327

Browse files
authored
Tests: Make support tests accept Safari 13 & newer
The regexes detecting browsers with their versions have been updated for iOS and Safari so that all iOS >=11 & all Safari (desktop) >= 11 are recognized. This is required to make Safari 13 & iOS 13 pass support tests but it'll also make tests forward-compatible with future Safari/iOS versions. Closes gh-4488
1 parent 3654bc8 commit 8167327

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

test/unit/support.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -292,22 +292,22 @@ testIframe(
292292
// Catches Chrome on Android as well (i.e. the default
293293
// Android browser on Android >= 4.4).
294294
expected = expectedMap.chrome;
295-
} else if ( /\b(?:11|12)\.\d(\.\d+)* safari/i.test( userAgent ) ) {
296-
expected = expectedMap.safari;
297-
} else if ( /\b(?:9|10)\.\d(\.\d+)* safari/i.test( userAgent ) ) {
295+
} else if ( /\b(?:9|10)\.\d+(\.\d+)* safari/i.test( userAgent ) ) {
298296
expected = expectedMap.safari_9_10;
297+
} else if ( /\b\d+(\.\d+)+ safari/i.test( userAgent ) ) {
298+
expected = expectedMap.safari;
299299
} else if ( /firefox\/(?:52|60)/i.test( userAgent ) ) {
300300
expected = expectedMap.firefox_60;
301301
} else if ( /firefox/i.test( userAgent ) ) {
302302
expected = expectedMap.firefox;
303-
} else if ( /(?:iphone|ipad);.*(?:iphone)? os (?:11|12)_/i.test( userAgent ) ) {
304-
expected = expectedMap.ios;
305303
} else if ( /iphone os (?:9|10)_/i.test( userAgent ) ) {
306304
expected = expectedMap.ios_9_10;
307305
} else if ( /iphone os 8_/i.test( userAgent ) ) {
308306
expected = expectedMap.ios_8;
309307
} else if ( /iphone os 7_/i.test( userAgent ) ) {
310308
expected = expectedMap.ios_7;
309+
} else if ( /(?:iphone|ipad);.*(?:iphone)? os \d+_/i.test( userAgent ) ) {
310+
expected = expectedMap.ios;
311311
} else if ( /android 4\.[0-3]/i.test( userAgent ) ) {
312312
expected = expectedMap.android;
313313
}

0 commit comments

Comments
 (0)