Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"@faker-js/faker": "8.0.2",
"@npmcli/arborist": "7.2.2",
"@playwright/test": "1.40.1",
"@testing-library/jest-dom": "5.17.0",
"@testing-library/jest-dom": "6.1.5",
"@testing-library/react": "14.1.2",
"@testing-library/user-event": "14.5.1",
"@types/babel__generator": "7.6.7",
Expand Down
2 changes: 1 addition & 1 deletion packages/auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"devDependencies": {
"@babel/cli": "7.23.4",
"@babel/core": "^7.22.20",
"@testing-library/jest-dom": "5.17.0",
"@testing-library/jest-dom": "6.1.5",
"@testing-library/react": "14.1.2",
"jest": "29.7.0",
"msw": "1.3.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/auth/src/__tests__/AuthProvider.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
configure,
} from '@testing-library/react'
import { renderHook, act } from '@testing-library/react'
import '@testing-library/jest-dom/extend-expect'
import '@testing-library/jest-dom/jest-globals'
import { graphql } from 'msw'
import { setupServer } from 'msw/node'

Expand Down
2 changes: 1 addition & 1 deletion packages/forms/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@babel/cli": "7.23.4",
"@babel/core": "^7.22.20",
"@testing-library/dom": "9.3.3",
"@testing-library/jest-dom": "5.17.0",
"@testing-library/jest-dom": "6.1.5",
"@testing-library/react": "14.1.2",
"@testing-library/user-event": "14.5.1",
"@types/pascalcase": "1.0.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/router/src/__tests__/location.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { render } from '@testing-library/react'
import '@testing-library/jest-dom/extend-expect'
import '@testing-library/jest-dom/jest-globals'

import { LocationProvider, useLocation } from '../location'

Expand Down
2 changes: 1 addition & 1 deletion packages/router/src/__tests__/nestedSets.test.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react'
import type { ReactNode } from 'react'

import '@testing-library/jest-dom/extend-expect'
import '@testing-library/jest-dom/jest-globals'
import { act, render } from '@testing-library/react'

import { navigate, Route, Router } from '../'
Expand Down
2 changes: 1 addition & 1 deletion packages/router/src/__tests__/route-announcer.test.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'

import { render, waitFor, act } from '@testing-library/react'
import '@testing-library/jest-dom/extend-expect'
import '@testing-library/jest-dom/jest-globals'

import { getAnnouncement } from '../a11yUtils'
import { navigate } from '../history'
Expand Down
2 changes: 1 addition & 1 deletion packages/router/src/__tests__/route-focus.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { render, waitFor } from '@testing-library/react'
import '@testing-library/jest-dom/extend-expect'
import '@testing-library/jest-dom/jest-globals'

import { getFocus } from '../a11yUtils'
import RouteFocus from '../route-focus'
Expand Down
2 changes: 1 addition & 1 deletion packages/router/src/__tests__/routeScrollReset.test.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'

import '@testing-library/jest-dom/extend-expect'
import '@testing-library/jest-dom/jest-globals'
import { act, cleanup, render, screen } from '@testing-library/react'

import { navigate } from '../history'
Expand Down
2 changes: 1 addition & 1 deletion packages/router/src/__tests__/router.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jest.mock('../util', () => {

import React, { useEffect, useState } from 'react'

import '@testing-library/jest-dom/extend-expect'
import '@testing-library/jest-dom/jest-globals'
import {
act,
configure,
Expand Down
2 changes: 1 addition & 1 deletion packages/router/src/__tests__/set.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from 'react'
import type { ReactNode } from 'react'

import { act, render, waitFor } from '@testing-library/react'
import '@testing-library/jest-dom/extend-expect'
import '@testing-library/jest-dom/jest-globals'

import { navigate } from '../history'
import { Route, Router } from '../router'
Expand Down
2 changes: 1 addition & 1 deletion packages/router/src/__tests__/setContextReuse.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { act, render, waitFor } from '@testing-library/react'
import { Route, Router, navigate } from '../'
import { Set } from '../Set'

import '@testing-library/jest-dom/extend-expect'
import '@testing-library/jest-dom/jest-globals'

const HomePage = () => {
return <p>Home Page</p>
Expand Down
2 changes: 1 addition & 1 deletion packages/testing/jest.setup.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import '@testing-library/jest-dom/extend-expect'
import '@testing-library/jest-dom/jest-globals'
import '@testing-library/jest-dom'

import { startMSW } from './src/web/mockRequests'
Expand Down
2 changes: 1 addition & 1 deletion packages/testing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@redwoodjs/project-config": "6.0.7",
"@redwoodjs/router": "6.0.7",
"@redwoodjs/web": "6.0.7",
"@testing-library/jest-dom": "5.17.0",
"@testing-library/jest-dom": "6.1.5",
"@testing-library/react": "14.1.2",
"@testing-library/user-event": "14.5.1",
"@types/aws-lambda": "8.10.126",
Expand Down
2 changes: 1 addition & 1 deletion packages/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"@apollo/experimental-nextjs-app-support": "0.5.1",
"@babel/cli": "7.23.4",
"@babel/core": "^7.22.20",
"@testing-library/jest-dom": "5.17.0",
"@testing-library/jest-dom": "6.1.5",
"@testing-library/react": "14.1.2",
"@types/react": "18.2.37",
"@types/react-dom": "18.2.15",
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/components/FetchConfigProvider.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import React from 'react'
import { render, screen, waitFor } from '@testing-library/react'

import type { AuthContextInterface } from '@redwoodjs/auth'
import '@testing-library/jest-dom/extend-expect'
import '@testing-library/jest-dom/jest-globals'

globalThis.RWJS_API_GRAPHQL_URL = 'https://api.example.com/graphql'

Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/components/GraphQLHooksProvider.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/

import { render, screen, waitFor } from '@testing-library/react'
import '@testing-library/jest-dom/extend-expect'
import '@testing-library/jest-dom/jest-globals'

import {
GraphQLHooksProvider,
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/components/cell/createCell.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/

import { render, screen } from '@testing-library/react'
import '@testing-library/jest-dom/extend-expect'
import '@testing-library/jest-dom/jest-globals'

import { GraphQLHooksProvider } from '../GraphQLHooksProvider'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import type { useReadQuery, useBackgroundQuery } from '@apollo/client'
import { loadErrorMessages, loadDevMessages } from '@apollo/client/dev'
import { render, screen } from '@testing-library/react'
import '@testing-library/jest-dom/extend-expect'
import '@testing-library/jest-dom/jest-globals'

import { GraphQLHooksProvider } from '../GraphQLHooksProvider'

Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/components/portalHead.test.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'

import '@testing-library/jest-dom/extend-expect'
import '@testing-library/jest-dom/jest-globals'
import { render } from '@testing-library/react'

import PortalHead from './PortalHead'
Expand Down
45 changes: 29 additions & 16 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ __metadata:
languageName: node
linkType: hard

"@adobe/css-tools@npm:^4.0.1":
version: 4.3.1
resolution: "@adobe/css-tools@npm:4.3.1"
checksum: 05672719b544cc0c21ae3ed0eb6349bf458e9d09457578eeeb07cf0f696469ac6417e9c9be1b129e5d6a18098a061c1db55b2275591760ef30a79822436fcbfa
"@adobe/css-tools@npm:^4.3.1":
version: 4.3.2
resolution: "@adobe/css-tools@npm:4.3.2"
checksum: 296a03dd29f227c60500d2da8c7f64991fecf1d8b456ce2b4adb8cec7363d9c08b5b03f1463673fc8cbfe54b538745588e7a13c736d2dd14a80c01a20f127f39
languageName: node
linkType: hard

Expand Down Expand Up @@ -8668,7 +8668,7 @@ __metadata:
"@babel/cli": 7.23.4
"@babel/core": ^7.22.20
"@babel/runtime-corejs3": 7.23.5
"@testing-library/jest-dom": 5.17.0
"@testing-library/jest-dom": 6.1.5
"@testing-library/react": 14.1.2
core-js: 3.33.3
jest: 29.7.0
Expand Down Expand Up @@ -9037,7 +9037,7 @@ __metadata:
"@babel/core": ^7.22.20
"@babel/runtime-corejs3": 7.23.5
"@testing-library/dom": 9.3.3
"@testing-library/jest-dom": 5.17.0
"@testing-library/jest-dom": 6.1.5
"@testing-library/react": 14.1.2
"@testing-library/user-event": 14.5.1
"@types/pascalcase": 1.0.3
Expand Down Expand Up @@ -9510,7 +9510,7 @@ __metadata:
"@redwoodjs/project-config": 6.0.7
"@redwoodjs/router": 6.0.7
"@redwoodjs/web": 6.0.7
"@testing-library/jest-dom": 5.17.0
"@testing-library/jest-dom": 6.1.5
"@testing-library/react": 14.1.2
"@testing-library/user-event": 14.5.1
"@types/aws-lambda": 8.10.126
Expand Down Expand Up @@ -9619,7 +9619,7 @@ __metadata:
"@babel/core": ^7.22.20
"@babel/runtime-corejs3": 7.23.5
"@redwoodjs/auth": 6.0.7
"@testing-library/jest-dom": 5.17.0
"@testing-library/jest-dom": 6.1.5
"@testing-library/react": 14.1.2
"@types/react": 18.2.37
"@types/react-dom": 18.2.15
Expand Down Expand Up @@ -11172,20 +11172,33 @@ __metadata:
languageName: node
linkType: hard

"@testing-library/jest-dom@npm:5.17.0":
version: 5.17.0
resolution: "@testing-library/jest-dom@npm:5.17.0"
"@testing-library/jest-dom@npm:6.1.5":
version: 6.1.5
resolution: "@testing-library/jest-dom@npm:6.1.5"
dependencies:
"@adobe/css-tools": ^4.0.1
"@adobe/css-tools": ^4.3.1
"@babel/runtime": ^7.9.2
"@types/testing-library__jest-dom": ^5.9.1
aria-query: ^5.0.0
chalk: ^3.0.0
css.escape: ^1.5.1
dom-accessibility-api: ^0.5.6
lodash: ^4.17.15
redent: ^3.0.0
checksum: 24e09c5779ea44644945ec26f2e4e5f48aecfe57d469decf2317a3253a5db28d865c55ad0ea4818d8d1df7572a6486c45daa06fa09644a833a7dd84563881939
peerDependencies:
"@jest/globals": ">= 28"
"@types/jest": ">= 28"
jest: ">= 28"
vitest: ">= 0.32"
peerDependenciesMeta:
"@jest/globals":
optional: true
"@types/jest":
optional: true
jest:
optional: true
vitest:
optional: true
checksum: f3643a56fcd970b5c7e8fd10faf3c4817d8ab0e74fb1198d726643bdc5ac675ceaac3b0068c5b4fbad254470e8f98ed50028741de875a29ceaa2f854570979c9
languageName: node
linkType: hard

Expand Down Expand Up @@ -12568,7 +12581,7 @@ __metadata:
languageName: node
linkType: hard

"@types/testing-library__jest-dom@npm:5.14.9, @types/testing-library__jest-dom@npm:^5.9.1":
"@types/testing-library__jest-dom@npm:5.14.9":
version: 5.14.9
resolution: "@types/testing-library__jest-dom@npm:5.14.9"
dependencies:
Expand Down Expand Up @@ -31798,7 +31811,7 @@ __metadata:
"@faker-js/faker": 8.0.2
"@npmcli/arborist": 7.2.2
"@playwright/test": 1.40.1
"@testing-library/jest-dom": 5.17.0
"@testing-library/jest-dom": 6.1.5
"@testing-library/react": 14.1.2
"@testing-library/user-event": 14.5.1
"@types/babel__generator": 7.6.7
Expand Down