Skip to content

Commit 7b98671

Browse files
committed
Merge branch 'msw' into feature/test-on-error
2 parents 00965e9 + e7f919d commit 7b98671

7 files changed

Lines changed: 276 additions & 4 deletions

File tree

apps/solidjs-boilerplate/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
"husky": "^8.0.3",
6262
"jsdom": "^24.0.0",
6363
"lint-staged": "^15.2.0",
64+
"msw": "^2.3.1",
6465
"postcss": "^8.4.33",
6566
"postcss-calc": "^9.0.1",
6667
"postcss-combine-duplicated-selectors": "^10.0.3",
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// eslint-disable-next-line import/no-extraneous-dependencies
2+
import { http, HttpResponse } from 'msw';
3+
4+
export const handlers = [
5+
// Intercept "GET https://example.com/user" requests...
6+
http.get('https://example.com/user', () => {
7+
// ...and respond to them using this JSON response.
8+
return HttpResponse.json({
9+
id: 'c7b3d8e0-5e0b-4b0f-8b3a-3b9f4b3d3b3d',
10+
firstName: 'John',
11+
lastName: 'Maverick',
12+
});
13+
}),
14+
];
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// eslint-disable-next-line import/no-extraneous-dependencies
2+
import { setupServer } from 'msw/node';
3+
4+
import { handlers } from './handlers';
5+
6+
export const server = setupServer(...handlers);

apps/solidjs-boilerplate/vite.config.ts

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,25 @@ export default defineConfig({
3535
all: false,
3636
provider: 'v8',
3737
reporter: ['text', 'json', 'html', 'lcov'],
38+
exclude: [
39+
'coverage/**',
40+
'dist/**',
41+
'**/[.]**',
42+
'packages/*/test?(s)/**',
43+
'**/*.d.ts',
44+
'**/virtual:*',
45+
'**/__x00__*',
46+
'**/\x00*',
47+
'cypress/**',
48+
'test?(s)/**',
49+
'test?(-*).?(c|m)[jt]s?(x)',
50+
'**/*{.,-}{test,spec}?(-d).?(c|m)[jt]s?(x)',
51+
'**/__tests__/**',
52+
'**/{karma,rollup,webpack,vite,vitest,jest,ava,babel,nyc,cypress,tsup,build}.config.*',
53+
'**/vitest.{workspace,projects}.[jt]s?(on)',
54+
'**/.{eslint,mocha,prettier}rc.{?(c|m)js,yml}',
55+
'**/mocks/**',
56+
],
3857
},
3958
// solid needs to be inline to work around
4059
// a resolution issue in vitest:
@@ -52,6 +71,7 @@ export default defineConfig({
5271
'**/.{idea,git,cache,output,temp}/**',
5372
'**/{karma,rollup,webpack,vite,vitest,jest,ava,babel,nyc,cypress}.config.*',
5473
'**/e2e/**', // Additional e2e directory for Playwright.
74+
'**/mocks/**',
5575
],
5676
deps: {}, // @ https://qiita.com/Stead08/items/762093fe86999fec4e80
5777
},
Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,10 @@
1-
// eslint-disable-next-line import/no-extraneous-dependencies
2-
import '@testing-library/jest-dom';
1+
/* eslint-disable import/no-extraneous-dependencies */
2+
import '@testing-library/jest-dom/vitest';
3+
import { beforeAll, afterEach, afterAll } from 'vitest';
4+
5+
import { server } from './src/mocks/server';
6+
7+
// So this is basically saying any network requests that come through route them to mock service worker instead of the actual network.
8+
beforeAll(() => server.listen());
9+
afterEach(() => server.resetHandlers());
10+
afterAll(() => server.close());
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
// eslint-disable-next-line import/no-extraneous-dependencies
2-
import '@testing-library/jest-dom';
2+
import '@testing-library/jest-dom/vitest';

0 commit comments

Comments
 (0)