🌐 AI搜索 & 代理 主页
Skip to content

Commit c19df50

Browse files
timmywiltimmywil
committed
fixup! address codeql alerts relevant to this PR
1 parent ba5a847 commit c19df50

File tree

4 files changed

+26
-24
lines changed

4 files changed

+26
-24
lines changed

‎test/data/testinit.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/* eslint no-multi-str: "off" */
22
"use strict";
33

4-
var parentUrl = window.location.href.replace( /\/test\/.*$/, "/" ),
4+
var parentUrl = window.location.origin,
55

66
// baseURL is intentionally set to "data/" instead of "".
77
// This is not just for convenience (since most files are in data/)
88
// but also to ensure that urls without prefix fail.
9-
baseURL = parentUrl + "test/data/",
9+
baseURL = parentUrl + "/test/data/",
1010
supportjQuery = this.jQuery,
1111

1212
// NOTE: keep it in sync with build/tasks/lib/slim-exclude.js
@@ -365,15 +365,15 @@ this.loadTests = function() {
365365

366366
// Directly load tests that need evaluation before DOMContentLoaded.
367367
if ( !jsdom && ( !esmodules || document.readyState === "loading" ) ) {
368-
document.write( "<script src='" + parentUrl + "test/unit/ready.js'><\x2Fscript>" );
368+
document.write( "<script src='" + parentUrl + "/test/unit/ready.js'><\x2Fscript>" );
369369
} else {
370370
QUnit.module( "ready", function() {
371371
QUnit.skip( "jQuery ready tests skipped in async mode", function() {} );
372372
} );
373373
}
374374

375375
// Get testSubproject from testrunner first
376-
require( [ parentUrl + "test/data/testrunner.js" ], function() {
376+
require( [ parentUrl + "/test/data/testrunner.js" ], function() {
377377

378378
// Says whether jQuery positional selector extensions are supported.
379379
// A full selector engine is required to support them as they need to
@@ -423,7 +423,7 @@ this.loadTests = function() {
423423

424424
if ( dep ) {
425425
if ( !QUnit.basicTests || i === 1 ) {
426-
require( [ parentUrl + "test/" + dep ], loadDep );
426+
require( [ parentUrl + "/test/" + dep ], loadDep );
427427

428428
// When running basic tests, replace other modules with dummies to avoid overloading
429429
// impaired clients.

‎test/jquery.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/* global loadTests: false */
44

55
var dynamicImportSource, config, src,
6-
parentUrl = window.location.href.replace( /\/test\/.*$/, "/" ),
6+
parentUrl = window.location.origin,
77
QUnit = window.QUnit;
88

99
function getQUnitConfig() {
@@ -70,7 +70,7 @@
7070

7171
// Otherwise, load synchronously
7272
} else {
73-
document.write( "<script id='jquery-js' nonce='jquery+hardcoded+nonce' src='" + parentUrl + src + "'><\x2Fscript>" );
73+
document.write( "<script id='jquery-js' nonce='jquery+hardcoded+nonce' src='" + parentUrl + "/" + src + "'><\x2Fscript>" );
7474
}
7575

7676
} )();

‎test/runner/browserstack/api.js‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,11 @@ async function fetchAPI( path, options = {}, versioned = true ) {
3737
init
3838
);
3939
if ( !response.ok ) {
40-
console.log( `\n${ init.method } ${ path }`, response.status, response.statusText );
40+
console.log(
41+
`\n${ init.method } ${ path }`,
42+
response.status,
43+
response.statusText
44+
);
4145
throw new Error( `Error fetching ${ path }` );
4246
}
4347
return response.json();
@@ -88,7 +92,10 @@ function sortBrowsers( a, b ) {
8892
if ( a.browser > b.browser ) {
8993
return 1;
9094
}
91-
const browserComparison = compareVersionNumbers( a.browser_version, b.browser_version );
95+
const browserComparison = compareVersionNumbers(
96+
a.browser_version,
97+
b.browser_version
98+
);
9299
if ( browserComparison ) {
93100
return browserComparison;
94101
}
@@ -122,7 +129,10 @@ function matchVersion( browserVersion, version ) {
122129
if ( !version ) {
123130
return false;
124131
}
125-
const regex = new RegExp( `^${ version.replace( /\./g, "\\." ) }\\b`, "i" );
132+
const regex = new RegExp(
133+
`^${ version.replace( /\\/g, "\\\\" ).replace( /\./g, "\\." ) }\\b`,
134+
"i"
135+
);
126136
return regex.test( browserVersion );
127137
}
128138

@@ -140,9 +150,11 @@ export async function filterBrowsers( filter ) {
140150
return browsers.filter( ( browser ) => {
141151
return (
142152
( !filterBrowser || filterBrowser === browser.browser.toLowerCase() ) &&
143-
( !filterVersion || matchVersion( browser.browser_version, filterVersion ) ) &&
153+
( !filterVersion ||
154+
matchVersion( browser.browser_version, filterVersion ) ) &&
144155
( !filterOs || filterOs === browser.os.toLowerCase() ) &&
145-
( !filterOsVersion || filterOsVersion === browser.os_version.toLowerCase() ) &&
156+
( !filterOsVersion ||
157+
filterOsVersion === browser.os_version.toLowerCase() ) &&
146158
( !filterDevice || filterDevice === ( browser.device || "" ).toLowerCase() )
147159
);
148160
} );
@@ -269,12 +281,6 @@ export function getPlan() {
269281
}
270282

271283
export async function getMaxSessions() {
272-
const [ plan, workers ] = await Promise.all( [
273-
getPlan(),
274-
getWorkers()
275-
] );
276-
return (
277-
plan.parallel_sessions_max_allowed -
278-
workers.length
279-
);
284+
const [ plan, workers ] = await Promise.all( [ getPlan(), getWorkers() ] );
285+
return plan.parallel_sessions_max_allowed - workers.length;
280286
}

‎test/runner/run.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,6 @@ export async function run( {
112112
}
113113
break;
114114
}
115-
case "error": {
116-
console.error( `Error in worker for test ${ message.id }`, message.data );
117-
break;
118-
}
119115
default:
120116
console.warn( "Received unknown message type:", message.type );
121117
}

0 commit comments

Comments
 (0)