From c6e1031839531db59aa31341a38c8a74cb082c56 Mon Sep 17 00:00:00 2001 From: Artem Zakharchenko Date: Thu, 26 Oct 2023 15:48:35 +0200 Subject: [PATCH 1/2] Update MSW usage in "example-intro" --- docs/react-testing-library/example-intro.mdx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/react-testing-library/example-intro.mdx b/docs/react-testing-library/example-intro.mdx index 035bfe252..c9fc22c56 100644 --- a/docs/react-testing-library/example-intro.mdx +++ b/docs/react-testing-library/example-intro.mdx @@ -72,15 +72,15 @@ See the following sections for a detailed breakdown of the test ```jsx title="__tests__/fetch.test.jsx" import React from 'react' -import {rest} from 'msw' +import {httpm, HttpResponse} from 'msw' import {setupServer} from 'msw/node' import {render, fireEvent, screen} from '@testing-library/react' import '@testing-library/jest-dom' import Fetch from '../fetch' const server = setupServer( - rest.get('/greeting', (req, res, ctx) => { - return res(ctx.json({greeting: 'hello there'})) + http.get('/greeting', () => { + return HttpResponse.json({greeting: 'hello there'}) }), ) @@ -101,8 +101,8 @@ test('loads and displays greeting', async () => { test('handles server error', async () => { server.use( - rest.get('/greeting', (req, res, ctx) => { - return res(ctx.status(500)) + http.get('/greeting', () => { + return new HttpResponse(null, { status: 500 }) }), ) @@ -132,7 +132,7 @@ test('handles server error', async () => { import React from 'react' // import API mocking utilities from Mock Service Worker -import {rest} from 'msw' +import {http, HttpResponse} from 'msw' import {setupServer} from 'msw/node' // import react-testing methods @@ -161,9 +161,9 @@ component makes. // declare which API requests to mock const server = setupServer( // capture "GET /greeting" requests - rest.get('/greeting', (req, res, ctx) => { + http.get('/greeting', (req, res, ctx) => { // respond using a mocked JSON body - return res(ctx.json({greeting: 'hello there'})) + return HttpResponse.json({greeting: 'hello there'}) }), ) @@ -181,8 +181,8 @@ test('handles server error', async () => { server.use( // override the initial "GET /greeting" request handler // to return a 500 Server Error - rest.get('/greeting', (req, res, ctx) => { - return res(ctx.status(500)) + http.get('/greeting', (req, res, ctx) => { + return new HttpResponse(null, { status: 500 }) }), ) From dbd489c8fa229dd43473daf7fd2d205c66fc3288 Mon Sep 17 00:00:00 2001 From: Artem Zakharchenko Date: Thu, 16 Nov 2023 19:03:17 +0100 Subject: [PATCH 2/2] Update docs/react-testing-library/example-intro.mdx Co-authored-by: Tim Deschryver <28659384+timdeschryver@users.noreply.github.com> --- docs/react-testing-library/example-intro.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/react-testing-library/example-intro.mdx b/docs/react-testing-library/example-intro.mdx index c9fc22c56..b18c2a622 100644 --- a/docs/react-testing-library/example-intro.mdx +++ b/docs/react-testing-library/example-intro.mdx @@ -72,7 +72,7 @@ See the following sections for a detailed breakdown of the test ```jsx title="__tests__/fetch.test.jsx" import React from 'react' -import {httpm, HttpResponse} from 'msw' +import {http, HttpResponse} from 'msw' import {setupServer} from 'msw/node' import {render, fireEvent, screen} from '@testing-library/react' import '@testing-library/jest-dom'