From 7bdcfb750ae5e8a9e2a0ee68c7ac03b82215d08f Mon Sep 17 00:00:00 2001 From: Ming-jun Lu <40516784+mingjunlu@users.noreply.github.com> Date: Fri, 16 Feb 2024 01:58:17 +0800 Subject: [PATCH] chore: migrate several tests to `node:test` (#10133) * chore: migrate test files whose names start with `a` to `node:test` * update assertion * chore: remove mocha script --------- Co-authored-by: Emanuele Stoppa --- packages/astro/package.json | 2 +- ...-routes.test.js => api-routes.nodetest.js} | 7 +- ....test.js => astro-client-only.nodetest.js} | 29 +++---- ...st.js => astro-component-code.nodetest.js} | 83 ++++++++++--------- ...kies.test.js => astro-cookies.nodetest.js} | 49 +++++------ ...test.js => astro-css-bundling.nodetest.js} | 19 +++-- ....test.js => astro-dev-headers.nodetest.js} | 11 +-- ...s.test.js => astro-directives.nodetest.js} | 63 +++++++------- ...type.test.js => astro-doctype.nodetest.js} | 24 +++--- ...amic.test.js => astro-dynamic.nodetest.js} | 19 +++-- ...ro-envs.test.js => astro-envs.nodetest.js} | 31 +++---- ...ro-expr.test.js => astro-expr.nodetest.js} | 58 +++++++------ ...ack.test.js => astro-fallback.nodetest.js} | 5 +- ....js => astro-get-static-paths.nodetest.js} | 36 ++++---- ...lobal.test.js => astro-global.nodetest.js} | 50 +++++------ ...test.js => astro-object-style.nodetest.js} | 19 +++-- ...-pages.test.js => astro-pages.nodetest.js} | 15 ++-- ...test.js => astro-partial-html.nodetest.js} | 13 +-- ...t.js => astro-preview-headers.nodetest.js} | 11 +-- ...ipts.test.js => astro-scripts.nodetest.js} | 48 ++++++----- ...test.js => astro-slots-nested.nodetest.js} | 29 +++---- ...ro-sync.test.js => astro-sync.nodetest.js} | 37 +++++++-- 22 files changed, 358 insertions(+), 300 deletions(-) rename packages/astro/test/{api-routes.test.js => api-routes.nodetest.js} (73%) rename packages/astro/test/{astro-client-only.test.js => astro-client-only.nodetest.js} (77%) rename packages/astro/test/{astro-component-code.test.js => astro-component-code.nodetest.js} (55%) rename packages/astro/test/{astro-cookies.test.js => astro-cookies.nodetest.js} (75%) rename packages/astro/test/{astro-css-bundling.test.js => astro-css-bundling.nodetest.js} (87%) rename packages/astro/test/{astro-dev-headers.test.js => astro-dev-headers.nodetest.js} (67%) rename packages/astro/test/{astro-directives.test.js => astro-directives.nodetest.js} (50%) rename packages/astro/test/{astro-doctype.test.js => astro-doctype.nodetest.js} (78%) rename packages/astro/test/{astro-dynamic.test.js => astro-dynamic.nodetest.js} (79%) rename packages/astro/test/{astro-envs.test.js => astro-envs.nodetest.js} (76%) rename packages/astro/test/{astro-expr.test.js => astro-expr.nodetest.js} (66%) rename packages/astro/test/{astro-fallback.test.js => astro-fallback.nodetest.js} (74%) rename packages/astro/test/{astro-get-static-paths.test.js => astro-get-static-paths.nodetest.js} (80%) rename packages/astro/test/{astro-global.test.js => astro-global.nodetest.js} (64%) rename packages/astro/test/{astro-object-style.test.js => astro-object-style.nodetest.js} (50%) rename packages/astro/test/{astro-pages.test.js => astro-pages.nodetest.js} (76%) rename packages/astro/test/{astro-partial-html.test.js => astro-partial-html.nodetest.js} (75%) rename packages/astro/test/{astro-preview-headers.test.js => astro-preview-headers.nodetest.js} (70%) rename packages/astro/test/{astro-scripts.test.js => astro-scripts.nodetest.js} (82%) rename packages/astro/test/{astro-slots-nested.test.js => astro-slots-nested.nodetest.js} (57%) rename packages/astro/test/{astro-sync.test.js => astro-sync.nodetest.js} (69%) diff --git a/packages/astro/package.json b/packages/astro/package.json index 6fe67b2e09..2399ed3e14 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -107,7 +107,7 @@ "build:ci": "pnpm run prebuild && astro-scripts build \"src/**/*.{ts,js}\" && pnpm run postbuild", "dev": "astro-scripts dev --copy-wasm --prebuild \"src/runtime/server/astro-island.ts\" --prebuild \"src/runtime/client/{idle,load,media,only,visible}.ts\" \"src/**/*.{ts,js}\"", "postbuild": "astro-scripts copy \"src/**/*.astro\" && astro-scripts copy \"src/**/*.wasm\"", - "test": "pnpm run test:node && mocha ./test/*.test.js --exit --timeout 30000", + "test": "pnpm run test:node", "test:match": "mocha ./test/*.test.js --timeout 30000 -g", "test:e2e": "playwright test", "test:e2e:match": "playwright test -g", diff --git a/packages/astro/test/api-routes.test.js b/packages/astro/test/api-routes.nodetest.js similarity index 73% rename from packages/astro/test/api-routes.test.js rename to packages/astro/test/api-routes.nodetest.js index 278d2454e4..4e2a5c7d00 100644 --- a/packages/astro/test/api-routes.test.js +++ b/packages/astro/test/api-routes.nodetest.js @@ -1,4 +1,5 @@ -import { expect } from 'chai'; +import assert from 'node:assert/strict'; +import { before, describe, it } from 'node:test'; import { loadFixture } from './test-utils.js'; describe('API routes', () => { @@ -13,8 +14,8 @@ describe('API routes', () => { describe('Binary data', () => { it('can be returned from a response', async () => { const dat = await fixture.readFile('/binary.dat', null); - expect(dat.length).to.equal(1); - expect(dat[0]).to.equal(0xff); + assert.equal(dat.length, 1); + assert.equal(dat[0], 0xff); }); }); }); diff --git a/packages/astro/test/astro-client-only.test.js b/packages/astro/test/astro-client-only.nodetest.js similarity index 77% rename from packages/astro/test/astro-client-only.test.js rename to packages/astro/test/astro-client-only.nodetest.js index 92b1beda44..88b762e73a 100644 --- a/packages/astro/test/astro-client-only.test.js +++ b/packages/astro/test/astro-client-only.nodetest.js @@ -1,5 +1,6 @@ -import { expect } from 'chai'; import { load as cheerioLoad } from 'cheerio'; +import assert from 'node:assert/strict'; +import { before, describe, it } from 'node:test'; import { loadFixture } from './test-utils.js'; describe('Client only components', () => { @@ -20,10 +21,10 @@ describe('Client only components', () => { const $ = cheerioLoad(html); // test 1: is empty - expect($('astro-island').html()).to.equal(''); + assert.equal($('astro-island').html(), ''); // test 2: svelte renderer is on the page - expect($('astro-island').attr('renderer-url')).to.be.ok; + assert.ok($('astro-island').attr('renderer-url')); }); it('Adds the CSS to the page', async () => { @@ -38,32 +39,32 @@ describe('Client only components', () => { const css = stylesheets.join(''); // yellowgreen minified - expect(css).to.contain('#9acd32', 'Svelte styles are added'); - expect(css).to.include('Courier New', 'Global styles are added'); + assert.match(css, /#9acd32/, 'Svelte styles are added'); + assert.match(css, /Courier New/, 'Global styles are added'); }); it('Adds the CSS to the page - standalone svelte component', async () => { const html = await fixture.readFile('/persistent-counter-standalone/index.html'); const $ = cheerioLoad(html); - expect($('head link[rel=stylesheet]')).to.have.a.lengthOf(1); + assert.equal($('head link[rel=stylesheet]').length, 1); const href = $('link[rel=stylesheet]').attr('href'); const css = await fixture.readFile(href); - expect(css).to.match(/tomato/, 'Svelte styles are added'); + assert.match(css, /tomato/, 'Svelte styles are added'); }); it('Includes CSS from components that use CSS modules', async () => { const html = await fixture.readFile('/css-modules/index.html'); const $ = cheerioLoad(html); - expect($('link[rel=stylesheet]')).to.have.a.lengthOf(1); + assert.equal($('link[rel=stylesheet]').length, 1); }); it('Includes CSS from package components', async () => { const html = await fixture.readFile('/pkg/index.html'); const $ = cheerioLoad(html); - expect($('link[rel=stylesheet]')).to.have.a.lengthOf(1); + assert.equal($('link[rel=stylesheet]').length, 1); }); }); @@ -86,10 +87,10 @@ describe('Client only components subpath', () => { const $ = cheerioLoad(html); // test 1: is empty - expect($('astro-island').html()).to.equal(''); + assert.equal($('astro-island').html(), ''); // test 2: svelte renderer is on the page - expect($('astro-island').attr('renderer-url')).to.be.ok; + assert.ok($('astro-island').attr('renderer-url')); }); it('Adds the CSS to the page', async () => { @@ -104,8 +105,8 @@ describe('Client only components subpath', () => { const css = stylesheets.join(''); // yellowgreen minified - expect(css).to.contain('#9acd32', 'Svelte styles are added'); - expect(css).to.include('Courier New', 'Global styles are added'); + assert.match(css, /#9acd32/, 'Svelte styles are added'); + assert.match(css, /Courier New/, 'Global styles are added'); }); it('Adds the CSS to the page for TSX components', async () => { @@ -115,6 +116,6 @@ describe('Client only components subpath', () => { const href = $('link[rel=stylesheet]').attr('href'); const css = await fixture.readFile(href.replace(/\/blog/, '')); - expect(css).to.match(/purple/, 'Global styles from tsx component are added'); + assert.match(css, /purple/, 'Global styles from tsx component are added'); }); }); diff --git a/packages/astro/test/astro-component-code.test.js b/packages/astro/test/astro-component-code.nodetest.js similarity index 55% rename from packages/astro/test/astro-component-code.test.js rename to packages/astro/test/astro-component-code.nodetest.js index dbca3f56da..1a3a23ea7f 100644 --- a/packages/astro/test/astro-component-code.test.js +++ b/packages/astro/test/astro-component-code.nodetest.js @@ -1,5 +1,6 @@ -import { expect } from 'chai'; import * as cheerio from 'cheerio'; +import assert from 'node:assert/strict'; +import { before, describe, it } from 'node:test'; import { loadFixture } from './test-utils.js'; describe('', () => { @@ -13,33 +14,35 @@ describe('', () => { it(' without lang or theme', async () => { let html = await fixture.readFile('/no-lang/index.html'); const $ = cheerio.load(html); - expect($('pre')).to.have.lengthOf(1); - expect($('pre').attr('style')).to.equal( + assert.equal($('pre').length, 1); + assert.equal( + $('pre').attr('style'), 'background-color:#24292e;color:#e1e4e8; overflow-x: auto;', 'applies default and overflow' ); - expect($('pre > code')).to.have.lengthOf(1); + assert.equal($('pre > code').length, 1); // test: contains some generated spans - expect($('pre > code span').length).to.be.greaterThan(1); + assert.equal($('pre > code span').length > 1, true); }); it('', async () => { let html = await fixture.readFile('/basic/index.html'); const $ = cheerio.load(html); - expect($('pre')).to.have.lengthOf(1); - expect($('pre').attr('class'), 'astro-code nord'); - expect($('pre > code')).to.have.lengthOf(1); + assert.equal($('pre').length, 1); + assert.equal($('pre').attr('class'), 'astro-code github-dark'); + assert.equal($('pre > code').length, 1); // test: contains many generated spans - expect($('pre > code span').length).to.be.greaterThanOrEqual(6); + assert.equal($('pre > code span').length >= 6, true); }); it('', async () => { let html = await fixture.readFile('/custom-theme/index.html'); const $ = cheerio.load(html); - expect($('pre')).to.have.lengthOf(1); - expect($('pre').attr('class')).to.equal('astro-code nord'); - expect($('pre').attr('style')).to.equal( + assert.equal($('pre').length, 1); + assert.equal($('pre').attr('class'), 'astro-code nord'); + assert.equal( + $('pre').attr('style'), 'background-color:#2e3440ff;color:#d8dee9ff; overflow-x: auto;', 'applies custom theme' ); @@ -49,58 +52,64 @@ describe('', () => { { let html = await fixture.readFile('/wrap-true/index.html'); const $ = cheerio.load(html); - expect($('pre')).to.have.lengthOf(1); + assert.equal($('pre').length, 1); // test: applies wrap overflow - expect($('pre').attr('style')).to.equal( + assert.equal( + $('pre').attr('style'), 'background-color:#24292e;color:#e1e4e8; overflow-x: auto; white-space: pre-wrap; word-wrap: break-word;' ); } { let html = await fixture.readFile('/wrap-false/index.html'); const $ = cheerio.load(html); - expect($('pre')).to.have.lengthOf(1); + assert.equal($('pre').length, 1); // test: applies wrap overflow - expect($('pre').attr('style')).to.equal( + assert.equal( + $('pre').attr('style'), 'background-color:#24292e;color:#e1e4e8; overflow-x: auto;' ); } { let html = await fixture.readFile('/wrap-null/index.html'); const $ = cheerio.load(html); - expect($('pre')).to.have.lengthOf(1); + assert.equal($('pre').length, 1); // test: applies wrap overflow - expect($('pre').attr('style')).to.equal('background-color:#24292e;color:#e1e4e8'); + assert.equal($('pre').attr('style'), 'background-color:#24292e;color:#e1e4e8'); } }); it('', async () => { let html = await fixture.readFile('/css-theme/index.html'); const $ = cheerio.load(html); - expect($('pre')).to.have.lengthOf(1); - expect($('pre').attr('class')).to.equal('astro-code css-variables'); - expect( + assert.equal($('pre').length, 1); + assert.equal($('pre').attr('class'), 'astro-code css-variables'); + assert.deepEqual( $('pre, pre span') .map((i, f) => (f.attribs ? f.attribs.style : 'no style found')) - .toArray() - ).to.deep.equal([ - 'background-color:var(--astro-code-color-background);color:var(--astro-code-color-text); overflow-x: auto;', - 'color:var(--astro-code-token-constant)', - 'color:var(--astro-code-token-function)', - 'color:var(--astro-code-color-text)', - 'color:var(--astro-code-token-string-expression)', - 'color:var(--astro-code-color-text)', - ]); + .toArray(), + [ + 'background-color:var(--astro-code-color-background);color:var(--astro-code-color-text); overflow-x: auto;', + 'color:var(--astro-code-token-constant)', + 'color:var(--astro-code-token-function)', + 'color:var(--astro-code-color-text)', + 'color:var(--astro-code-token-string-expression)', + 'color:var(--astro-code-color-text)', + ] + ); }); it(' with custom theme and lang', async () => { let html = await fixture.readFile('/imported/index.html'); const $ = cheerio.load(html); - expect($('#theme > pre')).to.have.lengthOf(1); - expect($('#theme > pre').attr('style'), 'background-color: #FDFDFE; overflow-x: auto;'); + assert.equal($('#theme > pre').length, 1); + assert.equal( + $('#theme > pre').attr('style'), + 'background-color:#FDFDFE;color:#4E5377; overflow-x: auto;' + ); - expect($('#lang > pre')).to.have.lengthOf(1); - expect($('#lang > pre > code span').length).to.equal(3); + assert.equal($('#lang > pre').length, 1); + assert.equal($('#lang > pre > code span').length, 3); }); it(' has no pre tag', async () => { @@ -108,8 +117,8 @@ describe('', () => { const $ = cheerio.load(html); const codeEl = $('.astro-code'); - expect(codeEl.prop('tagName')).to.eq('CODE'); - expect(codeEl.attr('style')).to.include('background-color:'); - expect($('pre')).to.have.lengthOf(0); + assert.equal(codeEl.prop('tagName'), 'CODE'); + assert.match(codeEl.attr('style'), /background-color:/); + assert.equal($('pre').length, 0); }); }); diff --git a/packages/astro/test/astro-cookies.test.js b/packages/astro/test/astro-cookies.nodetest.js similarity index 75% rename from packages/astro/test/astro-cookies.test.js rename to packages/astro/test/astro-cookies.nodetest.js index e201ebd876..34f548109a 100644 --- a/packages/astro/test/astro-cookies.test.js +++ b/packages/astro/test/astro-cookies.nodetest.js @@ -1,5 +1,6 @@ -import { expect } from 'chai'; import * as cheerio from 'cheerio'; +import assert from 'node:assert/strict'; +import { after, before, describe, it } from 'node:test'; import { loadFixture } from './test-utils.js'; import testAdapter from './test-adapter.js'; @@ -33,22 +34,22 @@ describe('Astro.cookies', () => { cookie: `prefs=${encodeURIComponent(JSON.stringify({ mode: 'light' }))}`, }, }); - expect(response.status).to.equal(200); + assert.equal(response.status, 200); const html = await response.text(); const $ = cheerio.load(html); - expect($('dd').text()).to.equal('light'); + assert.equal($('dd').text(), 'light'); }); it('can set the cookie value', async () => { const response = await fixture.fetch('/set-value', { method: 'POST', }); - expect(response.status).to.equal(200); + assert.equal(response.status, 200); // Bug in 18.14.1 where `set-cookie` will not be defined // Should be fixed in 18.14.2 if (process.versions.node !== '18.14.1') { - expect(response.headers.has('set-cookie')).to.equal(true); + assert.equal(response.headers.has('set-cookie'), true); } }); }); @@ -72,21 +73,21 @@ describe('Astro.cookies', () => { cookie: `prefs=${encodeURIComponent(JSON.stringify({ mode: 'light' }))}`, }, }); - expect(response.status).to.equal(200); + assert.equal(response.status, 200); const html = await response.text(); const $ = cheerio.load(html); - expect($('dd').text()).to.equal('light'); + assert.equal($('dd').text(), 'light'); }); it('can set the cookie value', async () => { const response = await fetchResponse('/set-value', { method: 'POST', }); - expect(response.status).to.equal(200); + assert.equal(response.status, 200); let headers = Array.from(app.setCookieHeaders(response)); - expect(headers).to.have.a.lengthOf(1); - expect(headers[0]).to.match(/Expires/); + assert.equal(headers.length, 1); + assert.match(headers[0], /Expires/); }); it('app.render can include the cookie in the Set-Cookie header', async () => { @@ -94,10 +95,10 @@ describe('Astro.cookies', () => { method: 'POST', }); const response = await app.render(request, { addCookieHeader: true }); - expect(response.status).to.equal(200); - expect(response.headers.get('Set-Cookie')) - .to.be.a('string') - .and.satisfy((value) => value.startsWith('admin=true; Expires=')); + assert.equal(response.status, 200); + const value = response.headers.get('Set-Cookie'); + assert.equal(typeof value, 'string'); + assert.equal(value.startsWith('admin=true; Expires='), true); }); it('app.render can exclude the cookie from the Set-Cookie header', async () => { @@ -105,8 +106,8 @@ describe('Astro.cookies', () => { method: 'POST', }); const response = await app.render(request, { addCookieHeader: false }); - expect(response.status).to.equal(200); - expect(response.headers.get('Set-Cookie')).to.equal(null); + assert.equal(response.status, 200); + assert.equal(response.headers.get('Set-Cookie'), null); }); it('Early returning a Response still includes set headers', async () => { @@ -115,13 +116,13 @@ describe('Astro.cookies', () => { cookie: `prefs=${encodeURIComponent(JSON.stringify({ mode: 'light' }))}`, }, }); - expect(response.status).to.equal(302); + assert.equal(response.status, 302); let headers = Array.from(app.setCookieHeaders(response)); - expect(headers).to.have.a.lengthOf(1); + assert.equal(headers.length, 1); let raw = headers[0].slice(6); let data = JSON.parse(decodeURIComponent(raw)); - expect(data).to.be.an('object'); - expect(data.mode).to.equal('dark'); + assert.equal(typeof data, 'object'); + assert.equal(data.mode, 'dark'); }); it('API route can get and set cookies', async () => { @@ -131,13 +132,13 @@ describe('Astro.cookies', () => { cookie: `prefs=${encodeURIComponent(JSON.stringify({ mode: 'light' }))}`, }, }); - expect(response.status).to.equal(302); + assert.equal(response.status, 302); let headers = Array.from(app.setCookieHeaders(response)); - expect(headers).to.have.a.lengthOf(1); + assert.equal(headers.length, 1); let raw = headers[0].slice(6); let data = JSON.parse(decodeURIComponent(raw)); - expect(data).to.be.an('object'); - expect(data.mode).to.equal('dark'); + assert.equal(typeof data, 'object'); + assert.equal(data.mode, 'dark'); }); }); }); diff --git a/packages/astro/test/astro-css-bundling.test.js b/packages/astro/test/astro-css-bundling.nodetest.js similarity index 87% rename from packages/astro/test/astro-css-bundling.test.js rename to packages/astro/test/astro-css-bundling.nodetest.js index 9143a782b5..150f9a3819 100644 --- a/packages/astro/test/astro-css-bundling.test.js +++ b/packages/astro/test/astro-css-bundling.nodetest.js @@ -1,5 +1,6 @@ -import { expect } from 'chai'; import * as cheerio from 'cheerio'; +import assert from 'node:assert/strict'; +import { before, describe, it } from 'node:test'; import { loadFixture } from './test-utils.js'; // note: the hashes should be deterministic, but updating the file contents will change hashes @@ -43,7 +44,7 @@ describe('CSS Bundling', function () { // test 1: assert new bundled CSS is present for (const href of css) { const link = $(`link[rel="stylesheet"][href^="${href}"]`); - expect(link.length).to.be.greaterThanOrEqual(1); + assert.equal(link.length >= 1, true); const outHref = link.attr('href'); builtCSS.add(outHref.startsWith('../') ? outHref.slice(2) : outHref); } @@ -51,25 +52,25 @@ describe('CSS Bundling', function () { // test 2: assert old CSS was removed for (const href of UNEXPECTED_CSS) { const link = $(`link[rel="stylesheet"][href="${href}"]`); - expect(link).to.have.lengthOf(0); + assert.equal(link.length, 0); } // test 3: assert all bundled CSS was built and contains CSS for (const url of builtCSS.keys()) { const bundledCss = await fixture.readFile(url); - expect(bundledCss).to.be.ok; + assert.ok(bundledCss); } } }); it('there are 4 css files', async () => { const dir = await fixture.readdir('/_astro'); - expect(dir).to.have.a.lengthOf(4); + assert.equal(dir.length, 4); }); it('CSS includes hashes', async () => { const [firstFound] = await fixture.readdir('/_astro'); - expect(firstFound).to.match(/[a-z]+\.[\w-]{8}\.css/); + assert.match(firstFound, /[a-z]+\.[\w-]{8}\.css/); }); }); @@ -97,18 +98,18 @@ describe('CSS Bundling', function () { it('there are 4 css files', async () => { const dir = await fixture.readdir('/assets'); - expect(dir).to.have.a.lengthOf(4); + assert.equal(dir.length, 4); }); it('CSS does not include hashes', async () => { const [firstFound] = await fixture.readdir('/assets'); - expect(firstFound).to.not.match(/[a-z]+\.[\da-z]{8}\.css/); + assert.doesNotMatch(firstFound, /[a-z]+\.[\da-z]{8}\.css/); }); it('there are 2 index named CSS files', async () => { const dir = await fixture.readdir('/assets'); const indexNamedFiles = dir.filter((name) => name.startsWith('index')); - expect(indexNamedFiles).to.have.a.lengthOf(2); + assert.equal(indexNamedFiles.length, 2); }); }); }); diff --git a/packages/astro/test/astro-dev-headers.test.js b/packages/astro/test/astro-dev-headers.nodetest.js similarity index 67% rename from packages/astro/test/astro-dev-headers.test.js rename to packages/astro/test/astro-dev-headers.nodetest.js index 7cc2266c65..e119e365a9 100644 --- a/packages/astro/test/astro-dev-headers.test.js +++ b/packages/astro/test/astro-dev-headers.nodetest.js @@ -1,4 +1,5 @@ -import { expect } from 'chai'; +import assert from 'node:assert/strict'; +import { after, before, describe, it } from 'node:test'; import { loadFixture } from './test-utils.js'; describe('Astro dev headers', () => { @@ -26,14 +27,14 @@ describe('Astro dev headers', () => { describe('dev', () => { it('returns custom headers for valid URLs', async () => { const result = await fixture.fetch('/'); - expect(result.status).to.equal(200); - expect(Object.fromEntries(result.headers)).to.include(headers); + assert.equal(result.status, 200); + assert.equal(Object.fromEntries(result.headers)['x-astro'], headers['x-astro']); }); it('does not return custom headers for invalid URLs', async () => { const result = await fixture.fetch('/bad-url'); - expect(result.status).to.equal(404); - expect(Object.fromEntries(result.headers)).not.to.include(headers); + assert.equal(result.status, 404); + assert.equal(Object.fromEntries(result.headers).hasOwnProperty('x-astro'), false); }); }); }); diff --git a/packages/astro/test/astro-directives.test.js b/packages/astro/test/astro-directives.nodetest.js similarity index 50% rename from packages/astro/test/astro-directives.test.js rename to packages/astro/test/astro-directives.nodetest.js index 4ce5ee916d..5b9e0b6724 100644 --- a/packages/astro/test/astro-directives.test.js +++ b/packages/astro/test/astro-directives.nodetest.js @@ -1,5 +1,6 @@ -import { expect } from 'chai'; import * as cheerio from 'cheerio'; +import assert from 'node:assert/strict'; +import { before, describe, it } from 'node:test'; import { loadFixture } from './test-utils.js'; describe('Directives', async () => { @@ -18,25 +19,25 @@ describe('Directives', async () => { const html = await fixture.readFile('/define-vars/index.html'); const $ = cheerio.load(html); - expect($('script')).to.have.lengthOf(5); + assert.equal($('script').length, 5); let i = 0; for (const script of $('script').toArray()) { // Wrap script in scope ({}) to avoid redeclaration errors - expect($(script).text().startsWith('(function(){')).to.equal(true); - expect($(script).text().endsWith('})();')).to.equal(true); + assert.equal($(script).text().startsWith('(function(){'), true); + assert.equal($(script).text().endsWith('})();'), true); if (i < 2) { // Inline defined variables - expect($(script).toString()).to.include('const foo = "bar"'); + assert.equal($(script).toString().includes('const foo = "bar"'), true); } else if (i < 3) { // Convert invalid keys to valid identifiers - expect($(script).toString()).to.include('const dashCase = "bar"'); + assert.equal($(script).toString().includes('const dashCase = "bar"'), true); } else if (i < 4) { // Closing script tags in strings are escaped - expect($(script).toString()).to.include('const bar = "