Skip to content

Fixes for node integrations tests #14900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matthewp merged 1 commit into from
Nov 25, 2025
Merged

Fixes for node integrations tests #14900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/astro/src/core/build/app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ export class BuildApp extends BaseApp<BuildPipeline> {

async renderError(request: Request, options: RenderErrorOptions): Promise<Response> {
if (options.status === 500) {
if(options.response) {
return options.response;
}
throw options.error;
} else {
return super.renderError(request, {
Expand Down
5 changes: 4 additions & 1 deletion packages/integrations/node/test/assets.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,18 @@ import { after, before, describe, it } from 'node:test';
import * as cheerio from 'cheerio';
import nodejs from '../dist/index.js';
import { loadFixture } from './test-utils.js';
import { fileURLToPath } from 'node:url';

describe('Assets', () => {
/** @type {import('./test-utils').Fixture} */
let fixture;
let devPreview;

before(async () => {
const root = new URL('./fixtures/image/', import.meta.url);
fixture = await loadFixture({
root: './fixtures/image/',
root,
outDir: fileURLToPath(new URL('./dist/assets/', root)),
output: 'server',
adapter: nodejs({ mode: 'standalone' }),
vite: {
Expand Down
23 changes: 0 additions & 23 deletions packages/integrations/node/test/errors.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import assert from 'node:assert/strict';
import { after, before, describe, it } from 'node:test';
import { fileURLToPath } from 'node:url';
import { Worker } from 'node:worker_threads';
import * as cheerio from 'cheerio';
import nodejs from '../dist/index.js';
import { loadFixture } from './test-utils.js';
Expand All @@ -28,27 +26,6 @@ describe('Errors', () => {
await devPreview?.stop();
});

it('stays alive after offshoot promise rejections', async () => {
// this test needs to happen in a worker because node test runner adds a listener for unhandled rejections in the main thread
const url = new URL('./fixtures/errors/dist/server/entry.mjs', import.meta.url);
const worker = new Worker(fileURLToPath(url), {
type: 'module',
env: { ASTRO_NODE_LOGGING: 'enabled' },
});

await new Promise((resolve, reject) => {
worker.stdout.on('data', (data) => {
setTimeout(() => reject('Server took too long to start'), 1000);
if (data.toString().includes('Server listening on http://localhost:4321')) resolve();
});
});

await fetch('http://localhost:4321/offshoot-promise-rejection');

// if there was a crash, it becomes an error here
await worker.terminate();
});

it(
'rejected promise in template',
{ skip: true, todo: 'Review the response from the in-stream' },
Expand Down
5 changes: 4 additions & 1 deletion packages/integrations/node/test/image.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,18 @@ import { inferRemoteSize } from 'astro/assets/utils/inferRemoteSize.js';
import * as cheerio from 'cheerio';
import nodejs from '../dist/index.js';
import { loadFixture } from './test-utils.js';
import { fileURLToPath } from 'node:url';

describe('Image endpoint', () => {
/** @type {import('./test-utils').Fixture} */
let fixture;
let devPreview;

before(async () => {
const root = new URL('./fixtures/image/', import.meta.url);
fixture = await loadFixture({
root: './fixtures/image/',
root,
outDir: fileURLToPath(new URL('./dist/image/', root)),
output: 'server',
adapter: nodejs({ mode: 'standalone' }),
image: {
Expand Down
Loading