Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor URL handling for the startBrowsers function in test.mjs

Browse Source 
The current logic is more complicated than it needs to be because it's
passing a callback function to `startBrowsers` instead of a string.
This commit simplifies the logic by passing the base URL as a string to
`startBrowsers` and having it do further augmentation internally,
thereby removing all indirection of the function calls to `makeTestUrl`
and the inner function it returned.
This commit is contained in:
Tim van der Meij 2023-11-04 18:30:41 +01:00
parent 7884119975
commit 24fcc042f4
No known key found for this signature in database
GPG Key ID: 8C3FD2925A5F2762
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
test/test.mjs
View File

@ -339,7 +339,7 @@ function startRefTest(masterMode, showRefImages) {
server.hooks.POST.push(refTestPostHandler); server.hooks.POST.push(refTestPostHandler);
onAllSessionsClosed = finalize; onAllSessionsClosed = finalize;
const startUrl = `http://${host}:${server.port}/test/test_slave.html`; const baseUrl = `http://${host}:${server.port}/test/test_slave.html`;
await startBrowsers(function (session) { await startBrowsers(function (session) {
session.masterMode = masterMode; session.masterMode = masterMode;
session.taskResults = {}; session.taskResults = {};
@ -358,7 +358,7 @@ function startRefTest(masterMode, showRefImages) {
session.numEqNoSnapshot = 0; session.numEqNoSnapshot = 0;
session.numEqFailures = 0; session.numEqFailures = 0;
monitorBrowserTimeout(session, handleSessionTimeout); monitorBrowserTimeout(session, handleSessionTimeout);
}, makeTestUrl(startUrl)); }, baseUrl);
} }
function checkRefsTmp() { function checkRefsTmp() {
if (masterMode && fs.existsSync(refsTmpDir)) { if (masterMode && fs.existsSync(refsTmpDir)) {
@ -793,29 +793,16 @@ function onAllSessionsClosedAfterTests(name) {
}; };
} }
function makeTestUrl(startUrl) {
return function (browserName) {
const queryParameters =
`?browser=${encodeURIComponent(browserName)}` +
`&manifestFile=${encodeURIComponent("/test/" + options.manifestFile)}` +
`&testFilter=${JSON.stringify(options.testfilter)}` +
`&xfaOnly=${options.xfaOnly}` +
`&delay=${options.statsDelay}` +
`&masterMode=${options.masterMode}`;
return startUrl + queryParameters;
};
}
async function startUnitTest(testUrl, name) { async function startUnitTest(testUrl, name) {
onAllSessionsClosed = onAllSessionsClosedAfterTests(name); onAllSessionsClosed = onAllSessionsClosedAfterTests(name);
startServer(); startServer();
server.hooks.POST.push(unitTestPostHandler); server.hooks.POST.push(unitTestPostHandler);
const startUrl = `http://${host}:${server.port}${testUrl}`; const baseUrl = `http://${host}:${server.port}${testUrl}`;
await startBrowsers(function (session) { await startBrowsers(function (session) {
session.numRuns = 0; session.numRuns = 0;
session.numErrors = 0; session.numErrors = 0;
}, makeTestUrl(startUrl)); }, baseUrl);
} }
async function startIntegrationTest() { async function startIntegrationTest() {
@ -971,7 +958,7 @@ async function startBrowser(browserName, startUrl = "") {
return browser; return browser;
} }
async function startBrowsers(initSessionCallback, makeStartUrl = null) { async function startBrowsers(initSessionCallback, baseUrl = null) {
// Remove old browser revisions from Puppeteer's cache. Updating Puppeteer can // Remove old browser revisions from Puppeteer's cache. Updating Puppeteer can
// cause new browser revisions to be downloaded, so trimming the cache will // cause new browser revisions to be downloaded, so trimming the cache will
// prevent the disk from filling up over time. // prevent the disk from filling up over time.
@ -995,7 +982,20 @@ async function startBrowsers(initSessionCallback, makeStartUrl = null) {
closed: false, closed: false,
}; };
sessions.push(session); sessions.push(session);
const startUrl = makeStartUrl ? makeStartUrl(browserName) : "";
// Construct the start URL from the base URL by appending query parameters
// for the runner if necessary.
let startUrl = "";
if (baseUrl) {
const queryParameters =
`?browser=${encodeURIComponent(browserName)}` +
`&manifestFile=${encodeURIComponent("/test/" + options.manifestFile)}` +
`&testFilter=${JSON.stringify(options.testfilter)}` +
`&xfaOnly=${options.xfaOnly}` +
`&delay=${options.statsDelay}` +
`&masterMode=${options.masterMode}`;
startUrl = baseUrl + queryParameters;
}
await startBrowser(browserName, startUrl) await startBrowser(browserName, startUrl)
.then(function (browser) { .then(function (browser) {