Skip to content

Commit c87b47e

Browse files
enisdenjoenisdenjo
authored
refactor(tests): use vitest (#101)
1 parent ccb28e8 commit c87b47e

File tree

16 files changed

+790
-2487
lines changed

16 files changed

+790
-2487
lines changed

‎babel.config.js‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎jest.config.js‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎package.json‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"check:lint": "eslint 'src'",
9797
"check:spell": "cspell --gitignore **/*.md",
9898
"check:type": "tsc --noEmit",
99-
"test": "NODE_OPTIONS=--experimental-vm-modules NODE_NO_WARNINGS=1 jest",
99+
"test": "vitest",
100100
"build:esm": "tsc -b tsconfig.esm.json && tsx scripts/esm-post-process.ts",
101101
"build:cjs": "tsc -b tsconfig.cjs.json",
102102
"build:umd": "rollup --configPlugin typescript --config rollup.config.ts",
@@ -111,13 +111,6 @@
111111
"graphql": ">=0.11 <=16"
112112
},
113113
"devDependencies": {
114-
"@babel/core": "^7.22.8",
115-
"@babel/plugin-proposal-class-properties": "^7.18.6",
116-
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
117-
"@babel/plugin-proposal-object-rest-spread": "^7.20.7",
118-
"@babel/plugin-proposal-optional-chaining": "^7.21.0",
119-
"@babel/preset-env": "^7.22.7",
120-
"@babel/preset-typescript": "^7.22.5",
121114
"@cspell/cspell-types": "^6.31.1",
122115
"@rollup/plugin-terser": "^0.4.3",
123116
"@rollup/plugin-typescript": "^11.1.2",
@@ -127,14 +120,12 @@
127120
"@types/express": "^4.17.17",
128121
"@types/glob": "^8.1.0",
129122
"@types/html-validator": "^5.0.3",
130-
"@types/jest": "^29.5.2",
131123
"@types/k6": "^0.45.0",
132124
"@types/koa": "^2.13.6",
133125
"@types/koa-mount": "^4.0.2",
134126
"@typescript-eslint/eslint-plugin": "^5.61.0",
135127
"@typescript-eslint/parser": "^5.61.0",
136128
"@whatwg-node/fetch": "^0.9.7",
137-
"babel-jest": "^29.6.1",
138129
"cspell": "^6.31.1",
139130
"eslint": "^8.44.0",
140131
"eslint-config-prettier": "^8.8.0",
@@ -143,8 +134,6 @@
143134
"glob": "^10.3.2",
144135
"graphql": "^16.7.1",
145136
"html-validator": "^6.0.1",
146-
"jest": "^29.6.1",
147-
"jest-jasmine2": "^29.6.1",
148137
"koa": "^2.14.2",
149138
"koa-mount": "^4.0.0",
150139
"node-fetch": "^3.3.1",
@@ -157,6 +146,7 @@
157146
"typedoc": "^0.24.8",
158147
"typedoc-plugin-markdown": "^3.15.3",
159148
"typescript": "^5.1.6",
160-
"uWebSockets.js": "uNetworking/uWebSockets.js#v20.30.0"
149+
"uWebSockets.js": "uNetworking/uWebSockets.js#v20.30.0",
150+
"vitest": "^0.33.0"
161151
}
162152
}

‎src/__tests__/__snapshots__/audits.ts.snap‎ renamed to ‎tests/__snapshots__/audits.test.ts.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Jest Snapshot v1, https://goo.gl/fbAQLP
1+
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
22

33
exports[`should not change globally unique audit ids 1`] = `
44
[

‎src/__tests__/audits.ts‎ renamed to ‎tests/audits.test.ts‎

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
import { describe, it, expect } from 'vitest';
12
import {
23
Audit,
34
serverAudits,
45
AuditResult,
56
renderAuditResultsToHTML,
67
AuditFail,
7-
} from '../audits';
8+
} from '../src/audits';
89
import htmlValidator from 'html-validator';
910

1011
it('should have globally unique audit ids', () => {
@@ -117,9 +118,9 @@ describe('Render audit results to HTML', () => {
117118
118119
<ul>
119120
<li><b>6</b> audits in total</li>
120-
<li><span style="font-family: monospace">✅</span> <b>2</b> pass</li>
121-
<li><span style="font-family: monospace">⚠️</span> <b>2</b> warnings (optional)</li>
122-
<li><span style="font-family: monospace">❌</span> <b>2</b> errors (required)</li>
121+
<li><span style=\\"font-family: monospace\\">✅</span> <b>2</b> pass</li>
122+
<li><span style=\\"font-family: monospace\\">⚠️</span> <b>2</b> warnings (optional)</li>
123+
<li><span style=\\"font-family: monospace\\">❌</span> <b>2</b> errors (required)</li>
123124
</ul>
124125
125126
<h2>Passing</h2>
@@ -134,29 +135,29 @@ describe('Render audit results to HTML', () => {
134135
<li><code>warn1</code> SHOULD warn1
135136
<details>
136137
<summary>bad warn1</summary>
137-
<pre><code class="lang-json">{
138-
"statusText": "",
139-
"status": 400,
140-
"headers": {
141-
"x-id": "warn1",
142-
"content-type": "text/plain;charset=UTF-8"
138+
<pre><code class=\\"lang-json\\">{
139+
\\"statusText\\": \\"\\",
140+
\\"status\\": 400,
141+
\\"headers\\": {
142+
\\"x-id\\": \\"warn1\\",
143+
\\"content-type\\": \\"text/plain;charset=UTF-8\\"
143144
},
144-
"body": "Warning!"
145+
\\"body\\": \\"Warning!\\"
145146
}
146147
</code></pre>
147148
</details>
148149
</li>
149150
<li><code>warn2</code> SHOULD warn2
150151
<details>
151152
<summary>bad warn2</summary>
152-
<pre><code class="lang-json">{
153-
"statusText": "",
154-
"status": 400,
155-
"headers": {
156-
"x-id": "warn2",
157-
"content-type": "text/plain;charset=UTF-8"
153+
<pre><code class=\\"lang-json\\">{
154+
\\"statusText\\": \\"\\",
155+
\\"status\\": 400,
156+
\\"headers\\": {
157+
\\"x-id\\": \\"warn2\\",
158+
\\"content-type\\": \\"text/plain;charset=UTF-8\\"
158159
},
159-
"body": "Warning!"
160+
\\"body\\": \\"Warning!\\"
160161
}
161162
</code></pre>
162163
</details>
@@ -169,29 +170,29 @@ describe('Render audit results to HTML', () => {
169170
<li><code>error1</code> MUST error1
170171
<details>
171172
<summary>bad error1</summary>
172-
<pre><code class="lang-json">{
173-
"statusText": "",
174-
"status": 500,
175-
"headers": {
176-
"x-id": "error1",
177-
"content-type": "text/plain;charset=UTF-8"
173+
<pre><code class=\\"lang-json\\">{
174+
\\"statusText\\": \\"\\",
175+
\\"status\\": 500,
176+
\\"headers\\": {
177+
\\"x-id\\": \\"error1\\",
178+
\\"content-type\\": \\"text/plain;charset=UTF-8\\"
178179
},
179-
"body": "Error!"
180+
\\"body\\": \\"Error!\\"
180181
}
181182
</code></pre>
182183
</details>
183184
</li>
184185
<li><code>error2</code> MUST error2
185186
<details>
186187
<summary>bad error2</summary>
187-
<pre><code class="lang-json">{
188-
"statusText": "",
189-
"status": 500,
190-
"headers": {
191-
"x-id": "error2",
192-
"content-type": "text/plain;charset=UTF-8"
188+
<pre><code class=\\"lang-json\\">{
189+
\\"statusText\\": \\"\\",
190+
\\"status\\": 500,
191+
\\"headers\\": {
192+
\\"x-id\\": \\"error2\\",
193+
\\"content-type\\": \\"text/plain;charset=UTF-8\\"
193194
},
194-
"body": "Error!"
195+
\\"body\\": \\"Error!\\"
195196
}
196197
</code></pre>
197198
</details>

‎src/__tests__/client.ts‎ renamed to ‎tests/client.test.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
import { it, expect } from 'vitest';
12
import fetch from 'node-fetch';
2-
import { RequestHeaders } from '../handler';
3-
import { createClient, NetworkError } from '../client';
3+
import { RequestHeaders } from '../src/handler';
4+
import { createClient, NetworkError } from '../src/client';
45
import { startTServer } from './utils/tserver';
56
import { texecute } from './utils/texecute';
67

‎src/__tests__/fixtures/simple.ts‎ renamed to ‎tests/fixtures/simple.ts‎

File renamed without changes.

‎src/__tests__/handler.ts‎ renamed to ‎tests/handler.test.ts‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { jest } from '@jest/globals';
1+
import { vi, it, expect } from 'vitest';
22
import { GraphQLError } from 'graphql';
33
import fetch from 'node-fetch';
4-
import { Request } from '../handler';
4+
import { Request } from '../src/handler';
55
import { startTServer } from './utils/tserver';
66

77
it.each(['schema', 'context', 'onSubscribe', 'onOperation'])(
@@ -34,7 +34,7 @@ it('should report graphql errors returned from onSubscribe', async () => {
3434
});
3535

3636
it('should respond with result returned from onSubscribe', async () => {
37-
const onOperationFn = jest.fn(() => {
37+
const onOperationFn = vi.fn(() => {
3838
// noop
3939
});
4040
const server = startTServer({
@@ -55,7 +55,9 @@ it('should respond with result returned from onSubscribe', async () => {
5555
it.each(['schema', 'context', 'onSubscribe', 'onOperation'])(
5656
'should provide the request context to %s',
5757
async (option) => {
58-
const optionFn = jest.fn<(req: Request<unknown, unknown>) => void>();
58+
const optionFn = vi.fn((_req: Request<unknown, unknown>) => {
59+
// noop
60+
});
5961

6062
const context = {};
6163
const server = startTServer({
@@ -114,7 +116,7 @@ it('should correctly serialise execution result errors', async () => {
114116
"line": 1,
115117
},
116118
],
117-
"message": "Variable "$num" got invalid value "foo"; Int cannot represent non-integer value: "foo"",
119+
"message": "Variable \\"$num\\" got invalid value \\"foo\\"; Int cannot represent non-integer value: \\"foo\\"",
118120
},
119121
],
120122
}
@@ -146,7 +148,7 @@ it('should append the provided validation rules array', async () => {
146148
"line": 1,
147149
},
148150
],
149-
"message": "Cannot query field "idontexist" on type "Query".",
151+
"message": "Cannot query field \\"idontexist\\" on type \\"Query\\".",
150152
},
151153
],
152154
}
@@ -185,12 +187,12 @@ it('should print plain errors in detail', async () => {
185187
// missing body
186188
});
187189
await expect(result.text()).resolves.toMatchInlineSnapshot(
188-
`"{"errors":[{"message":"Unparsable JSON body"}]}"`,
190+
'"{\\"errors\\":[{\\"message\\":\\"Unparsable JSON body\\"}]}"',
189191
);
190192
});
191193

192194
it('should format errors using the formatter', async () => {
193-
const formatErrorFn = jest.fn((_err) => new Error('Formatted'));
195+
const formatErrorFn = vi.fn((_err) => new Error('Formatted'));
194196
const server = startTServer({
195197
formatError: formatErrorFn,
196198
});
@@ -224,7 +226,7 @@ it('should respect plain errors toJSON implementation', async () => {
224226
};
225227
}
226228
}
227-
const formatErrorFn = jest.fn((_err) => new MyError('Custom toJSON'));
229+
const formatErrorFn = vi.fn((_err) => new MyError('Custom toJSON'));
228230
const server = startTServer({
229231
formatError: formatErrorFn,
230232
});

‎src/__tests__/server.ts‎ renamed to ‎tests/server.test.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
import { it } from 'vitest';
12
import fetch from 'node-fetch';
2-
import { serverAudits } from '../audits/server';
3+
import { serverAudits } from '../src/audits/server';
34

45
import { schema } from './fixtures/simple';
56
import { startTServer } from './utils/tserver';

‎src/__tests__/use.ts‎ renamed to ‎tests/use.test.ts‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { describe, it, expect, beforeAll, afterAll } from 'vitest';
12
import { fetch } from '@whatwg-node/fetch';
23
import http from 'http';
34
import express from 'express';
@@ -7,15 +8,15 @@ import mount from 'koa-mount';
78
import { createServerAdapter } from '@whatwg-node/server';
89
import uWS from 'uWebSockets.js';
910
import { startDisposableServer } from './utils/tserver';
10-
import { serverAudits } from '../audits';
11+
import { serverAudits } from '../src/audits';
1112
import { schema } from './fixtures/simple';
1213

13-
import { createHandler as createHttpHandler } from '../use/http';
14-
import { createHandler as createExpressHandler } from '../use/express';
15-
import { createHandler as createFastifyHandler } from '../use/fastify';
16-
import { createHandler as createFetchHandler } from '../use/fetch';
17-
import { createHandler as createKoaHandler } from '../use/koa';
18-
import { createHandler as createUWSHandler } from '../use/uWebSockets';
14+
import { createHandler as createHttpHandler } from '../src/use/http';
15+
import { createHandler as createExpressHandler } from '../src/use/express';
16+
import { createHandler as createFastifyHandler } from '../src/use/fastify';
17+
import { createHandler as createFetchHandler } from '../src/use/fetch';
18+
import { createHandler as createKoaHandler } from '../src/use/koa';
19+
import { createHandler as createUWSHandler } from '../src/use/uWebSockets';
1920

2021
describe('http', () => {
2122
const [url, , dispose] = startDisposableServer(
@@ -48,7 +49,7 @@ describe('http', () => {
4849
const res = await fetch(url + '?query={hello}');
4950

5051
await expect(res.text()).resolves.toMatchInlineSnapshot(
51-
`"{"data":{"hello":"world"}}"`,
52+
'"{\\"data\\":{\\"hello\\":\\"world\\"}}"',
5253
);
5354
expect(res.headers.get('x-test')).toBe('test-x');
5455

@@ -95,7 +96,7 @@ describe('express', () => {
9596
const res = await fetch(url + '?query={hello}');
9697

9798
await expect(res.text()).resolves.toMatchInlineSnapshot(
98-
`"{"data":{"hello":"world"}}"`,
99+
'"{\\"data\\":{\\"hello\\":\\"world\\"}}"',
99100
);
100101
expect(res.headers.get('x-test')).toBe('test-x');
101102

@@ -154,7 +155,7 @@ describe('fastify', () => {
154155
const res = await fetch(url + '?query={hello}');
155156

156157
await expect(res.text()).resolves.toMatchInlineSnapshot(
157-
`"{"data":{"hello":"world"}}"`,
158+
'"{\\"data\\":{\\"hello\\":\\"world\\"}}"',
158159
);
159160
expect(res.headers.get('x-test')).toBe('test-x');
160161

@@ -214,7 +215,7 @@ describe('koa', () => {
214215
const res = await fetch(url + '?query={hello}');
215216

216217
await expect(res.text()).resolves.toMatchInlineSnapshot(
217-
`"{"data":{"hello":"world"}}"`,
218+
'"{\\"data\\":{\\"hello\\":\\"world\\"}}"',
218219
);
219220
expect(res.headers.get('x-test')).toBe('test-x');
220221

0 commit comments

Comments
 (0)