Skip to content

Commit 7b7e7e3

Browse files
Merge branch 'main' into cy/invoice_codecov_logo
2 parents 65cc71f + 46d9b02 commit 7b7e7e3

File tree

15 files changed

+77
-448
lines changed

15 files changed

+77
-448
lines changed

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@
8383
"react-router-dom-v5-compat": "^6.15.0",
8484
"react-use": "^17.2.4",
8585
"recharts": "^2.12.7",
86-
"semver": "7.5.2",
8786
"tailwind-merge": "^2.3.0",
8887
"zod": "^3.21.4"
8988
},

src/pages/AccountSettings/tabs/Access/SessionsTable.test.tsx

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
2+
import {
3+
QueryClientProvider as QueryClientProviderV5,
4+
QueryClient as QueryClientV5,
5+
} from '@tanstack/react-queryV5'
26
import { render, screen, waitFor } from '@testing-library/react'
37
import { userEvent } from '@testing-library/user-event'
48
import { graphql, HttpResponse } from 'msw'
@@ -28,29 +32,37 @@ const mockSessions: Session[] = [
2832
},
2933
]
3034

31-
const server = setupServer()
3235
const queryClient = new QueryClient({
33-
defaultOptions: {
34-
queries: {
35-
suspense: true,
36-
retry: false,
37-
},
38-
},
36+
defaultOptions: { queries: { suspense: true, retry: false } },
37+
})
38+
const queryClientV5 = new QueryClientV5({
39+
defaultOptions: { queries: { retry: false } },
3940
})
41+
4042
const wrapper: React.FC<React.PropsWithChildren> = ({ children }) => (
41-
<QueryClientProvider client={queryClient}>
42-
<MemoryRouter initialEntries={['/bb/critical-role/bells-hells']}>
43-
<Route path="/:provider/:owner/:repo">{children}</Route>
44-
</MemoryRouter>
45-
</QueryClientProvider>
43+
<QueryClientProviderV5 client={queryClientV5}>
44+
<QueryClientProvider client={queryClient}>
45+
<MemoryRouter initialEntries={['/bb/critical-role/bells-hells']}>
46+
<Route path="/:provider/:owner/:repo">{children}</Route>
47+
</MemoryRouter>
48+
</QueryClientProvider>
49+
</QueryClientProviderV5>
4650
)
4751

48-
beforeAll(() => server.listen())
52+
const server = setupServer()
53+
beforeAll(() => {
54+
server.listen()
55+
})
56+
4957
afterEach(() => {
5058
queryClient.clear()
59+
queryClientV5.clear()
5160
server.resetHandlers()
5261
})
53-
afterAll(() => server.close())
62+
63+
afterAll(() => {
64+
server.close()
65+
})
5466

5567
describe('SessionsTable', () => {
5668
function setup() {

src/pages/AccountSettings/tabs/Access/SessionsTable.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import isNull from 'lodash/isNull'
88
import { useCallback, useMemo } from 'react'
99
import { useParams } from 'react-router-dom'
1010

11-
import { useDeleteSession } from 'services/access'
1211
import { Session } from 'services/access/SessionsQueryOpts'
12+
import { useDeleteSession } from 'services/access/useDeleteSession'
1313
import { cn } from 'shared/utils/cn'
1414
import { formatTimeToNow } from 'shared/utils/dates'
1515
import Button from 'ui/Button'

src/pages/RepoPage/ConfigTab/tabs/GeneralTab/Tokens/ImpactAnalysisToken/ImpactAnalysisToken.jsx

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

src/pages/RepoPage/ConfigTab/tabs/GeneralTab/Tokens/ImpactAnalysisToken/ImpactAnalysisToken.test.jsx

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

0 commit comments

Comments
 (0)