fixup! address codeql alerts relevant to this PR

jquery · timmywil · Feb 26, 2024 · Dec 29, 2023 · Jan 27, 2024 · Feb 10, 2024
commit c0297908223d1d305bc820e2b8fd02c06cd8f9cd
diff --git a/test/data/testinit.js b/test/data/testinit.js
@@ -1,12 +1,12 @@
 /* eslint no-multi-str: "off" */
 "use strict";
 
-var parentUrl = window.location.href.replace( /\/test\/.*$/, "/" ),
+var parentUrl = window.location.origin,
 
 	// baseURL is intentionally set to "data/" instead of "".
 	// This is not just for convenience (since most files are in data/)
 	// but also to ensure that urls without prefix fail.
-	baseURL = parentUrl + "test/data/",
+	baseURL = parentUrl + "/test/data/",
 	supportjQuery = this.jQuery,
 
 	// NOTE: keep it in sync with build/tasks/lib/slim-exclude.js
@@ -365,15 +365,15 @@ this.loadTests = function() {
 
 	// Directly load tests that need evaluation before DOMContentLoaded.
 	if ( !jsdom && ( !esmodules || document.readyState === "loading" ) ) {
-		document.write( "<script src='" + parentUrl + "test/unit/ready.js'><\x2Fscript>" );
+		document.write( "<script src='" + parentUrl + "/test/unit/ready.js'><\x2Fscript>" );
 	} else {
 		QUnit.module( "ready", function() {
 			QUnit.skip( "jQuery ready tests skipped in async mode", function() {} );
 		} );
 	}
 
 	// Get testSubproject from testrunner first
-	require( [ parentUrl + "test/data/testrunner.js" ], function() {
+	require( [ parentUrl + "/test/data/testrunner.js" ], function() {
 
 		// Says whether jQuery positional selector extensions are supported.
 		// A full selector engine is required to support them as they need to
@@ -423,7 +423,7 @@ this.loadTests = function() {
 
 			if ( dep ) {
 				if ( !QUnit.basicTests || i === 1 ) {
-					require( [ parentUrl + "test/" + dep ], loadDep );
+					require( [ parentUrl + "/test/" + dep ], loadDep );
 
 				// When running basic tests, replace other modules with dummies to avoid overloading
 				// impaired clients.

diff --git a/test/jquery.js b/test/jquery.js
@@ -3,7 +3,7 @@
 	/* global loadTests: false */
 
 	var dynamicImportSource, config, src,
-		parentUrl = window.location.href.replace( /\/test\/.*$/, "/" ),
+		parentUrl = window.location.origin,
 		QUnit = window.QUnit;
 
 	function getQUnitConfig() {
@@ -53,7 +53,7 @@
 		// IE doesn't support the dynamic import syntax so it would crash
 		// with a SyntaxError here.
 		dynamicImportSource = "" +
-			"import( `${ parentUrl }src/jquery.js` )\n" +
+			"import( `${ parentUrl }/src/jquery.js` )\n" +
 			"	.then( ( { jQuery } ) => {\n" +
 			"		window.jQuery = jQuery;\n" +
 			"		if ( typeof loadTests === \"function\" ) {\n" +
@@ -70,7 +70,7 @@
 
 	// Otherwise, load synchronously
 	} else {
-		document.write( "<script id='jquery-js' nonce='jquery+hardcoded+nonce' src='" + parentUrl + src + "'><\x2Fscript>" );
+		document.write( "<script id='jquery-js' nonce='jquery+hardcoded+nonce' src='" + parentUrl + "/" + src + "'><\x2Fscript>" );
 	}
 
 } )();
diff --git a/test/runner/browserstack/api.js b/test/runner/browserstack/api.js
@@ -37,7 +37,11 @@ async function fetchAPI( path, options = {}, versioned = true ) {
 		init
 	);
 	if ( !response.ok ) {
-		console.log( `\n${ init.method } ${ path }`, response.status, response.statusText );
+		console.log(
+			`\n${ init.method } ${ path }`,
+			response.status,
+			response.statusText
+		);
 		throw new Error( `Error fetching ${ path }` );
 	}
 	return response.json();
@@ -88,7 +92,10 @@ function sortBrowsers( a, b ) {
 	if ( a.browser > b.browser ) {
 		return 1;
 	}
-	const browserComparison = compareVersionNumbers( a.browser_version, b.browser_version );
+	const browserComparison = compareVersionNumbers(
+		a.browser_version,
+		b.browser_version
+	);
 	if ( browserComparison ) {
 		return browserComparison;
 	}
@@ -122,7 +129,10 @@ function matchVersion( browserVersion, version ) {
 	if ( !version ) {
 		return false;
 	}
-	const regex = new RegExp( `^${ version.replace( /\./g, "\\." ) }\\b`, "i" );
+	const regex = new RegExp(
+		`^${ version.replace( /\\/g, "\\\\" ).replace( /\./g, "\\." ) }\\b`,
+		"i"
+	);
 	return regex.test( browserVersion );
 }
 
@@ -140,9 +150,11 @@ export async function filterBrowsers( filter ) {
 	return browsers.filter( ( browser ) => {
 		return (
 			( !filterBrowser || filterBrowser === browser.browser.toLowerCase() ) &&
-			( !filterVersion || matchVersion( browser.browser_version, filterVersion ) ) &&
+			( !filterVersion ||
+				matchVersion( browser.browser_version, filterVersion ) ) &&
 			( !filterOs || filterOs === browser.os.toLowerCase() ) &&
-			( !filterOsVersion || filterOsVersion === browser.os_version.toLowerCase() ) &&
+			( !filterOsVersion ||
+				filterOsVersion === browser.os_version.toLowerCase() ) &&
 			( !filterDevice || filterDevice === ( browser.device || "" ).toLowerCase() )
 		);
 	} );
@@ -269,12 +281,6 @@ export function getPlan() {
 }
 
 export async function getMaxSessions() {
-	const [ plan, workers ] = await Promise.all( [
-		getPlan(),
-		getWorkers()
-	] );
-	return (
-		plan.parallel_sessions_max_allowed -
-		workers.length
-	);
+	const [ plan, workers ] = await Promise.all( [ getPlan(), getWorkers() ] );
+	return plan.parallel_sessions_max_allowed - workers.length;
 }
diff --git a/test/runner/run.js b/test/runner/run.js
@@ -112,10 +112,6 @@ export async function run( {
 				}
 				break;
 			}
-			case "error": {
-				console.error( `Error in worker for test ${ message.id }`, message.data );
-				break;
-			}
 			default:
 				console.warn( "Received unknown message type:", message.type );
 		}