Tests: Fix selector tests in Chrome

For older Safari/iOS we needed to add the `safari` UA check as their reported `WebKit` version was not new enough. However, that check should have also excluded Chrome which was missed in the first iteration. This has been fixed. Also, fix code formatting in `test/unit/css.js`.
jquery · Jan 24, 2023 · 732592c · 732592c
1 parent da7057e
commit 732592c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/test/unit/css.js b/test/unit/css.js
@@ -1773,11 +1773,12 @@ QUnit.test( "Do not throw on frame elements from css method (trac-15098)", funct
 			"</style>"
 		);
 
-	var div = jQuery( "<div>" ).appendTo( "#qunit-fixture" ),
-		$elem = jQuery( "<div>" ).addClass( "test__customProperties" )
-			.appendTo( "#qunit-fixture" ),
-		webkitOrBlink = /\webkit\b/i.test( navigator.userAgent ) && !/edge\//i.test( navigator.userAgent ),
-		expected = 20;
+		var div = jQuery( "<div>" ).appendTo( "#qunit-fixture" ),
+			$elem = jQuery( "<div>" ).addClass( "test__customProperties" )
+				.appendTo( "#qunit-fixture" ),
+			webkitOrBlink = /\webkit\b/i.test( navigator.userAgent ) &&
+				!/edge\//i.test( navigator.userAgent ),
+			expected = 20;
 
 		if ( webkitOrBlink ) {
 			expected -= 2;

diff --git a/test/unit/selector.js b/test/unit/selector.js
@@ -6,9 +6,12 @@ QUnit.module( "selector", {
 		// in the Chromium UA, but it is locked to an older version there.
 		// Modern WebKit (Safari 13+) locks it to `605.1.15`.
 		// Since the `3.x` branch is also tested on older WebKit UAs, we
-		// need the `Safari` check as well.
-		this.safari = /\bapplewebkit\/605\.1\.15\b/i.test( navigator.userAgent ) ||
-			/\bsafari\b/i.test( navigator.userAgent );
+		// need the `Safari` check as well. Chrome also includes the `Safari`
+		// token, though, so we need to explicitly exclude it.
+		this.safari = /\bapplewebkit\/605\.1\.15\b/i.test( navigator.userAgent ) || (
+			/\bsafari\b/i.test( navigator.userAgent ) &&
+				!/\b(?:headless)?chrome\b/i.test( navigator.userAgent )
+		);
 	},
 	afterEach: moduleTeardown
 } );