Skip to content

refactor(astro): migrate 9 tests to typescript #16410

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
ematipico merged 3 commits into from
Apr 21, 2026
Merged

refactor(astro): migrate 9 tests to typescript #16410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
492580c
refactor(astro): migrate 9 tests to typescript
ocavue Apr 20, 2026
047a54d
Update late.astro
ocavue Apr 20, 2026
f0d0cf0
chore: trigger ci
ocavue Apr 21, 2026
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
2 changes: 1 addition & 1 deletion packages/astro/test/fixtures/redirects/src/pages/late.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
import Redirect from '../components/redirect.astro';
const staticMode = import.meta.env.STATIC_MODE;
const staticMode = !!import.meta.env.STATIC_MODE;
---
<html>
<head>
Expand Down
5 changes: 2 additions & 3 deletions packages/astro/test/react-and-solid.test.js → packages/astro/test/react-and-solid.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import assert from 'node:assert/strict';
import { before, describe, it } from 'node:test';
import * as cheerio from 'cheerio';
import { loadFixture } from './test-utils.js';
import { type Fixture, loadFixture } from './test-utils.js';

describe('Solid app with some React components', () => {
/** @type {import('./test-utils').Fixture} */
let fixture;
let fixture: Fixture;

before(async () => {
fixture = await loadFixture({ root: './fixtures/react-and-solid/' });
Expand Down
15 changes: 9 additions & 6 deletions packages/astro/test/react-jsx-export.test.js → packages/astro/test/react-jsx-export.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import assert from 'node:assert/strict';
import { before, describe, it } from 'node:test';
import * as cheerio from 'cheerio';
import { AstroLogger } from '../dist/core/logger/core.js';
import { loadFixture } from './test-utils.js';
import { type AstroLogMessage, AstroLogger } from '../dist/core/logger/core.js';
import { type Fixture, loadFixture } from './test-utils.js';

describe('react-jsx-export', () => {
let fixture;
let logs = [];
let fixture: Fixture;
const logs: AstroLogMessage[] = [];

const ids = [
'anonymous_arrow_default_export',
Expand Down Expand Up @@ -38,7 +38,10 @@ describe('react-jsx-export', () => {
fixture = await loadFixture({
root: './fixtures/react-jsx-export/',
});
await fixture.build({ logger });
await fixture.build({
// @ts-expect-error: `logger` is @internal in AstroInlineConfig so it's stripped from dist types
logger
});
});

it('Can load all JSX components', async () => {
Expand All @@ -52,7 +55,7 @@ describe('react-jsx-export', () => {

it('Cannot output React Invalid Hook warning', async () => {
assert.equal(
logs.every((log) => log.message.indexOf(reactInvalidHookWarning) === -1),
logs.every((log) => !log.message.includes(reactInvalidHookWarning)),
true,
);
});
Expand Down
10 changes: 4 additions & 6 deletions packages/astro/test/redirects.test.js → packages/astro/test/redirects.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
import assert from 'node:assert/strict';
import { after, before, describe, it } from 'node:test';
import { loadFixture } from './test-utils.js';
import { type DevServer, type Fixture, loadFixture } from './test-utils.js';

describe('Astro.redirect output: "static"', () => {
/** @type {import('./test-utils').Fixture} */
let fixture;
let fixture: Fixture;

describe('dev', () => {
/** @type {import('./test-utils.js').DevServer} */
let devServer;
let devServer: DevServer;
before(async () => {
process.env.STATIC_MODE = true;
process.env.STATIC_MODE = 'true';
fixture = await loadFixture({
root: './fixtures/redirects/',
output: 'static',
Expand Down
4 changes: 2 additions & 2 deletions ...astro-containing-client-component.test.js → ...astro-containing-client-component.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import assert from 'node:assert/strict';
import { before, describe, it } from 'node:test';
import * as cheerio from 'cheerio';
import { loadFixture } from './test-utils.js';
import { type Fixture, loadFixture } from './test-utils.js';

describe('Re-exported astro components with client components', () => {
let fixture;
let fixture: Fixture;

before(async () => {
fixture = await loadFixture({ root: './fixtures/reexport-astro-containing-client-component/' });
Expand Down
6 changes: 3 additions & 3 deletions packages/astro/test/remote-css.test.js → packages/astro/test/remote-css.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import assert from 'node:assert/strict';
import { before, describe, it } from 'node:test';
import * as cheerio from 'cheerio';
import { loadFixture } from './test-utils.js';
import { type Fixture, loadFixture } from './test-utils.js';

describe('Remote CSS', () => {
let fixture;
let fixture: Fixture;

before(async () => {
fixture = await loadFixture({
Expand All @@ -19,7 +19,7 @@ describe('Remote CSS', () => {
const html = await fixture.readFile('/index.html');
const $ = cheerio.load(html);

const relPath = $('link').attr('href');
const relPath = $('link').attr('href')!;
const css = await fixture.readFile(relPath);

assert.match(css, /https:\/\/unpkg.com\/open-props/);
Expand Down
24 changes: 17 additions & 7 deletions ...ro/test/reuse-injected-entrypoint.test.js → ...ro/test/reuse-injected-entrypoint.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
import assert from 'node:assert/strict';
import { after, before, describe, it } from 'node:test';
import { load as cheerioLoad } from 'cheerio';
import { loadFixture } from './test-utils.js';

const routes = [
import { type DevServer, type Fixture, loadFixture } from './test-utils.js';

type Route = {
description: string;
url: string;
h1?: string;
p?: string;
scriptContent?: string;
htmlMatch?: string;
fourOhFour?: boolean;
};

const routes: Route[] = [
{
description: 'matches / to index.astro',
url: '/',
Expand Down Expand Up @@ -53,13 +63,13 @@ const routes = [
},
];

function appendForwardSlash(path) {
function appendForwardSlash(path: string) {
return path.endsWith('/') ? path : path + '/';
}

describe('Reuse injected entrypoint', () => {
describe('build', () => {
let fixture;
let fixture: Fixture;

before(async () => {
fixture = await loadFixture({
Expand Down Expand Up @@ -107,8 +117,8 @@ describe('Reuse injected entrypoint', () => {
});

describe('dev', () => {
let fixture;
let devServer;
let fixture: Fixture;
let devServer: DevServer;

before(async () => {
fixture = await loadFixture({
Expand Down
32 changes: 13 additions & 19 deletions packages/astro/test/rewrite.test.js → packages/astro/test/rewrite.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import assert from 'node:assert/strict';
import { after, before, describe, it } from 'node:test';
import { load as cheerioLoad } from 'cheerio';
import { loadFixture } from './test-utils.js';
import { type DevServer, type Fixture, loadFixture } from './test-utils.js';

describe('Dev rewrite, trailing slash -> never', () => {
/** @type {import('./test-utils').Fixture} */
let fixture;
let devServer;
let fixture: Fixture;
let devServer: DevServer;

before(async () => {
fixture = await loadFixture({
Expand All @@ -28,9 +27,8 @@ describe('Dev rewrite, trailing slash -> never', () => {
});

describe('Dev rewrite, trailing slash -> never, with base', () => {
/** @type {import('./test-utils').Fixture} */
let fixture;
let devServer;
let fixture: Fixture;
let devServer: DevServer;

before(async () => {
fixture = await loadFixture({
Expand Down Expand Up @@ -63,9 +61,8 @@ describe('Dev rewrite, trailing slash -> never, with base', () => {
});

describe('Dev rewrite, hybrid/server', () => {
/** @type {import('./test-utils').Fixture} */
let fixture;
let devServer;
let fixture: Fixture;
let devServer: DevServer;

before(async () => {
fixture = await loadFixture({
Expand Down Expand Up @@ -110,9 +107,8 @@ describe('Dev rewrite, hybrid/server', () => {
});

describe('Dev rewrite URL contains base and has no trailing slash', () => {
/** @type {import('./test-utils').Fixture} */
let fixture;
let devServer;
let fixture: Fixture;
let devServer: DevServer;

before(async () => {
fixture = await loadFixture({
Expand Down Expand Up @@ -176,9 +172,8 @@ describe('SSR route', () => {
});

describe('Runtime error, default 500', () => {
/** @type {import('./test-utils').Fixture} */
let fixture;
let devServer;
let fixture: Fixture;
let devServer: DevServer;

before(async () => {
fixture = await loadFixture({
Expand All @@ -200,9 +195,8 @@ describe('Runtime error, default 500', () => {
});

describe('Runtime error in dev, custom 500', () => {
/** @type {import('./test-utils').Fixture} */
let fixture;
let devServer;
let fixture: Fixture;
let devServer: DevServer;

before(async () => {
fixture = await loadFixture({
Expand Down
6 changes: 3 additions & 3 deletions packages/astro/test/root-srcdir-css.test.js → packages/astro/test/root-srcdir-css.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import assert from 'node:assert/strict';
import { before, describe, it } from 'node:test';
import * as cheerio from 'cheerio';
import { loadFixture } from './test-utils.js';
import { type Fixture, loadFixture } from './test-utils.js';

describe('srcDir', () => {
let fixture;
let fixture: Fixture;

before(async () => {
fixture = await loadFixture({
Expand All @@ -19,7 +19,7 @@ describe('srcDir', () => {
const html = await fixture.readFile('/index.html');
const $ = cheerio.load(html);

const relPath = $('link').attr('href');
const relPath = $('link').attr('href')!;
const css = await fixture.readFile(relPath);
assert.match(css, /body\{color:green\}/);
});
Expand Down
8 changes: 3 additions & 5 deletions packages/astro/test/route-guard.test.js → packages/astro/test/route-guard.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
import assert from 'node:assert/strict';
import { after, before, describe, it } from 'node:test';
import { loadFixture } from './test-utils.js';
import { type DevServer, type Fixture, loadFixture } from './test-utils.js';

describe('Route Guard - Dev Server', () => {
/** @type {import('./test-utils').Fixture} */
let fixture;
/** @type {import('./test-utils').DevServer} */
let devServer;
let fixture: Fixture;
let devServer: DevServer;

before(async () => {
fixture = await loadFixture({ root: './fixtures/route-guard/' });
Expand Down
Loading