michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improve undici fetch failed errors in tests (#6960)

Browse source
This commit is contained in:
Bjorn Lu 2023-05-02 22:10:33 +08:00 committed by GitHub
parent a695e44aed
commit 5371efe429
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 139 additions and 255 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
packages/astro/test/astro-get-static-paths.test.js
View file

@ -3,11 +3,11 @@ import { loadFixture } from './test-utils.js';
import * as cheerio from 'cheerio'; import * as cheerio from 'cheerio';
describe('getStaticPaths - build calls', () => { describe('getStaticPaths - build calls', () => {
before(async () => { /** @type {import('./test-utils').Fixture} */
// reset the flag used by [...calledTwiceTest].astro between each test let fixture;
globalThis.isCalledOnce = false;
const fixture = await loadFixture({ before(async () => {
fixture = await loadFixture({
root: './fixtures/astro-get-static-paths/', root: './fixtures/astro-get-static-paths/',
site: 'https://mysite.dev/', site: 'https://mysite.dev/',
base: '/blog', base: '/blog',
@ -15,10 +15,22 @@ describe('getStaticPaths - build calls', () => {
await fixture.build(); await fixture.build();
}); });
afterEach(() => {
// reset the flag used by [...calledTwiceTest].astro between each test
globalThis.isCalledOnce = false;
});
it('is only called once during build', () => { it('is only called once during build', () => {
// useless expect; if build() throws in setup then this test fails // useless expect; if build() throws in setup then this test fails
expect(true).to.equal(true); expect(true).to.equal(true);
}); });
it('Astro.url sets the current pathname', async () => {
const html = await fixture.readFile('/food/tacos/index.html');
const $ = cheerio.load(html);
expect($('#url').text()).to.equal('/blog/food/tacos/');
});
}); });
describe('getStaticPaths - dev calls', () => { describe('getStaticPaths - dev calls', () => {
@ -26,11 +38,16 @@ describe('getStaticPaths - dev calls', () => {
let devServer; let devServer;
before(async () => { before(async () => {
fixture = await loadFixture({
root: './fixtures/astro-get-static-paths/',
site: 'https://mysite.dev/',
});
devServer = await fixture.startDevServer();
});
afterEach(() => {
// reset the flag used by [...calledTwiceTest].astro between each test // reset the flag used by [...calledTwiceTest].astro between each test
globalThis.isCalledOnce = false; globalThis.isCalledOnce = false;
fixture = await loadFixture({ root: './fixtures/astro-get-static-paths/' });
devServer = await fixture.startDevServer();
}); });
after(async () => { after(async () => {
@ -47,24 +64,8 @@ describe('getStaticPaths - dev calls', () => {
res = await fixture.fetch('/c'); res = await fixture.fetch('/c');
expect(res.status).to.equal(200); expect(res.status).to.equal(200);
}); });
});
describe('getStaticPaths - 404 behavior', () => {
let fixture;
let devServer;
before(async () => {
// reset the flag used by [...calledTwiceTest].astro between each test
globalThis.isCalledOnce = false;
fixture = await loadFixture({ root: './fixtures/astro-get-static-paths/' });
devServer = await fixture.startDevServer();
});
after(async () => {
devServer.stop();
});
describe('404 behavior', () => {
it('resolves 200 on matching static path - named params', async () => { it('resolves 200 on matching static path - named params', async () => {
const res = await fixture.fetch('/pizza/provolone-sausage'); const res = await fixture.fetch('/pizza/provolone-sausage');
expect(res.status).to.equal(200); expect(res.status).to.equal(200);
@ -84,23 +85,9 @@ describe('getStaticPaths - 404 behavior', () => {
const res = await fixture.fetch('/pizza/pizza-hut'); const res = await fixture.fetch('/pizza/pizza-hut');
expect(res.status).to.equal(404); expect(res.status).to.equal(404);
}); });
});
describe('getStaticPaths - route params type validation', () => {
let fixture, devServer;
before(async () => {
// reset the flag used by [...calledTwiceTest].astro between each test
globalThis.isCalledOnce = false;
fixture = await loadFixture({ root: './fixtures/astro-get-static-paths/' });
devServer = await fixture.startDevServer();
});
after(async () => {
await devServer.stop();
}); });
describe('route params type validation', () => {
it('resolves 200 on nested array parameters', async () => { it('resolves 200 on nested array parameters', async () => {
const res = await fixture.fetch('/nested-arrays/slug1'); const res = await fixture.fetch('/nested-arrays/slug1');
expect(res.status).to.equal(200); expect(res.status).to.equal(200);
@ -117,25 +104,6 @@ describe('getStaticPaths - route params type validation', () => {
const res = await fixture.fetch('/blog/2022/post-2'); const res = await fixture.fetch('/blog/2022/post-2');
expect(res.status).to.equal(200); expect(res.status).to.equal(200);
}); });
});
describe('getStaticPaths - numeric route params', () => {
let fixture;
let devServer;
before(async () => {
// reset the flag used by [...calledTwiceTest].astro between each test
globalThis.isCalledOnce = false;
fixture = await loadFixture({
root: './fixtures/astro-get-static-paths/',
site: 'https://mysite.dev/',
});
devServer = await fixture.startDevServer();
});
after(async () => {
await devServer.stop();
}); });
it('resolves 200 on matching static paths', async () => { it('resolves 200 on matching static paths', async () => {
@ -155,25 +123,3 @@ describe('getStaticPaths - numeric route params', () => {
} }
}); });
}); });
describe('getStaticPaths - Astro.url', () => {
/** @type {import('./test-utils').Fixture} */
let fixture;
before(async () => {
// reset the flag used by [...calledTwiceTest].astro between each test
globalThis.isCalledOnce = false;
fixture = await loadFixture({
root: './fixtures/astro-get-static-paths/',
site: 'https://mysite.dev/',
});
await fixture.build();
});
it('Sets the current pathname', async () => {
const html = await fixture.readFile('/food/tacos/index.html');
const $ = cheerio.load(html);
expect($('#url').text()).to.equal('/food/tacos/');
});
});

130
packages/astro/test/ssr-prerender-get-static-paths.test.js
View file

@ -3,11 +3,11 @@ import { loadFixture } from './test-utils.js';
import * as cheerio from 'cheerio'; import * as cheerio from 'cheerio';
describe('prerender getStaticPaths - build calls', () => { describe('prerender getStaticPaths - build calls', () => {
before(async () => { /** @type {import('./test-utils').Fixture} */
// reset the flag used by [...calledTwiceTest].astro between each test let fixture;
globalThis.isCalledOnce = false;
const fixture = await loadFixture({ before(async () => {
fixture = await loadFixture({
root: './fixtures/ssr-prerender-get-static-paths/', root: './fixtures/ssr-prerender-get-static-paths/',
site: 'https://mysite.dev/', site: 'https://mysite.dev/',
base: '/blog', base: '/blog',
@ -15,10 +15,23 @@ describe('prerender getStaticPaths - build calls', () => {
await fixture.build(); await fixture.build();
}); });
afterEach(() => {
// reset the flag used by [...calledTwiceTest].astro between each test
globalThis.isCalledOnce = false;
});
it('is only called once during build', () => { it('is only called once during build', () => {
// useless expect; if build() throws in setup then this test fails // useless expect; if build() throws in setup then this test fails
expect(true).to.equal(true); expect(true).to.equal(true);
}); });
it('Astro.url sets the current pathname', async () => {
const html = await fixture.readFile('/food/tacos/index.html');
const $ = cheerio.load(html);
expect($('#props').text()).to.equal('10');
expect($('#url').text()).to.equal('/blog/food/tacos/');
});
}); });
describe('prerender getStaticPaths - dev calls', () => { describe('prerender getStaticPaths - dev calls', () => {
@ -26,11 +39,17 @@ describe('prerender getStaticPaths - dev calls', () => {
let devServer; let devServer;
before(async () => { before(async () => {
globalThis.isCalledOnce = false;
fixture = await loadFixture({
root: './fixtures/ssr-prerender-get-static-paths/',
site: 'https://mysite.dev/',
});
devServer = await fixture.startDevServer();
});
afterEach(() => {
// reset the flag used by [...calledTwiceTest].astro between each test // reset the flag used by [...calledTwiceTest].astro between each test
globalThis.isCalledOnce = false; globalThis.isCalledOnce = false;
fixture = await loadFixture({ root: './fixtures/ssr-prerender-get-static-paths/' });
devServer = await fixture.startDevServer();
}); });
after(async () => { after(async () => {
@ -47,24 +66,8 @@ describe('prerender getStaticPaths - dev calls', () => {
res = await fixture.fetch('/c'); res = await fixture.fetch('/c');
expect(res.status).to.equal(200); expect(res.status).to.equal(200);
}); });
});
describe('prerender getStaticPaths - 404 behavior', () => {
let fixture;
let devServer;
before(async () => {
// reset the flag used by [...calledTwiceTest].astro between each test
globalThis.isCalledOnce = false;
fixture = await loadFixture({ root: './fixtures/ssr-prerender-get-static-paths/' });
devServer = await fixture.startDevServer();
});
after(async () => {
devServer.stop();
});
describe('404 behavior', () => {
it('resolves 200 on matching static path - named params', async () => { it('resolves 200 on matching static path - named params', async () => {
const res = await fixture.fetch('/pizza/provolone-sausage'); const res = await fixture.fetch('/pizza/provolone-sausage');
expect(res.status).to.equal(200); expect(res.status).to.equal(200);
@ -88,23 +91,9 @@ describe('prerender getStaticPaths - 404 behavior', () => {
expect(res.status).to.equal(404); expect(res.status).to.equal(404);
expect(html).to.match(/404/); expect(html).to.match(/404/);
}); });
});
describe('prerender getStaticPaths - route params type validation', () => {
let fixture, devServer;
before(async () => {
// reset the flag used by [...calledTwiceTest].astro between each test
globalThis.isCalledOnce = false;
fixture = await loadFixture({ root: './fixtures/ssr-prerender-get-static-paths/' });
devServer = await fixture.startDevServer();
});
after(async () => {
await devServer.stop();
}); });
describe('route params type validation', () => {
it('resolves 200 on nested array parameters', async () => { it('resolves 200 on nested array parameters', async () => {
const res = await fixture.fetch('/nested-arrays/slug1'); const res = await fixture.fetch('/nested-arrays/slug1');
expect(res.status).to.equal(200); expect(res.status).to.equal(200);
@ -121,25 +110,6 @@ describe('prerender getStaticPaths - route params type validation', () => {
const res = await fixture.fetch('/blog/2022/post-2'); const res = await fixture.fetch('/blog/2022/post-2');
expect(res.status).to.equal(200); expect(res.status).to.equal(200);
}); });
});
describe('prerender getStaticPaths - numeric route params', () => {
let fixture;
let devServer;
before(async () => {
// reset the flag used by [...calledTwiceTest].astro between each test
globalThis.isCalledOnce = false;
fixture = await loadFixture({
root: './fixtures/ssr-prerender-get-static-paths/',
site: 'https://mysite.dev/',
});
devServer = await fixture.startDevServer();
});
after(async () => {
await devServer.stop();
}); });
it('resolves 200 on matching static paths', async () => { it('resolves 200 on matching static paths', async () => {
@ -159,47 +129,3 @@ describe('prerender getStaticPaths - numeric route params', () => {
} }
}); });
}); });
describe('prerender getStaticPaths - Astro.url', () => {
/** @type {import('./test-utils').Fixture} */
let fixture;
before(async () => {
// reset the flag used by [...calledTwiceTest].astro between each test
globalThis.isCalledOnce = false;
fixture = await loadFixture({
root: './fixtures/ssr-prerender-get-static-paths/',
site: 'https://mysite.dev/',
});
await fixture.build();
});
it('Sets the current pathname', async () => {
const html = await fixture.readFile('/food/tacos/index.html');
const $ = cheerio.load(html);
expect($('#url').text()).to.equal('/food/tacos/');
});
});
describe('prerender getStaticPaths - props', () => {
/** @type {import('./test-utils').Fixture} */
let fixture;
before(async () => {
// reset the flag used by [...calledTwiceTest].astro between each test
globalThis.isCalledOnce = false;
fixture = await loadFixture({
root: './fixtures/ssr-prerender-get-static-paths/',
site: 'https://mysite.dev/',
});
await fixture.build();
});
it('Sets the current pathname', async () => {
const html = await fixture.readFile('/food/tacos/index.html');
const $ = cheerio.load(html);
expect($('#props').text()).to.equal('10');
});
});

14
packages/astro/test/test-utils.js
View file

@ -187,7 +187,19 @@ export async function loadFixture(inlineConfig) {
}, },
config, config,
resolveUrl, resolveUrl,
fetch: (url, init) => fetch(resolveUrl(url), init), fetch: async (url, init) => {
const resolvedUrl = resolveUrl(url);
try {
return await fetch(resolvedUrl, init);
} catch (err) {
// undici throws a vague error when it fails, so we log the url here to easily debug it
if (err.message?.includes('fetch failed')) {
console.error(`[astro test] failed to fetch ${resolvedUrl}`);
console.error(err);
}
throw err;
}
},
preview: async (opts = {}) => { preview: async (opts = {}) => {
process.env.NODE_ENV = 'production'; process.env.NODE_ENV = 'production';
const previewServer = await preview(settings, { const previewServer = await preview(settings, {