Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Remove unused manual cleanups from tests #3224

Open
wants to merge 4 commits into from
Open
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 codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ comment:
require_changes: false
require_base: false
require_head: true
after_n_builds: 10 # ceil(number of test files / 80). See ci.yml for more details.
after_n_builds: 9 # ceil(number of test files / 80). See ci.yml for more details.

ignore:
- ./src/**/*.stories.js
Expand Down
3 changes: 1 addition & 2 deletions src/layouts/BaseLayout/BaseLayout.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
import { cleanup, render, screen, waitFor } from '@testing-library/react'
import { render, screen, waitFor } from '@testing-library/react'
import { graphql, http, HttpResponse } from 'msw2'
import { setupServer } from 'msw2/node'
import { MemoryRouter, Route, useLocation } from 'react-router-dom'
Expand Down Expand Up @@ -193,7 +193,6 @@ afterEach(() => {
queryClient.clear()
server.resetHandlers()
vi.clearAllMocks()
cleanup()
})

afterAll(() => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
import { cleanup, render, screen, waitFor } from '@testing-library/react'
import { render, screen, waitFor } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import { graphql, HttpResponse } from 'msw2'
import { setupServer } from 'msw2/node'
Expand All @@ -18,7 +18,6 @@ beforeAll(() => {
})

beforeEach(() => {
cleanup()
queryClient.clear()
server.resetHandlers()
})
Expand Down
3 changes: 1 addition & 2 deletions src/layouts/BaseLayout/hooks/useUserAccessGate.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
import { cleanup, renderHook, waitFor } from '@testing-library/react'
import { renderHook, waitFor } from '@testing-library/react'
import { delay, graphql, http, HttpResponse } from 'msw2'
import { setupServer } from 'msw2/node'
import { MemoryRouter, Route } from 'react-router-dom'
Expand Down Expand Up @@ -221,7 +221,6 @@ beforeAll(() => {
})

beforeEach(() => {
cleanup()
queryClient.clear()
server.resetHandlers()
})
Expand Down
3 changes: 1 addition & 2 deletions src/layouts/Header/Header.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
import { cleanup, render, screen } from '@testing-library/react'
import { render, screen } from '@testing-library/react'
import { graphql, HttpResponse } from 'msw2'
import { setupServer } from 'msw2/node'
import { MemoryRouter, Route } from 'react-router-dom'
Expand Down Expand Up @@ -93,7 +93,6 @@ beforeAll(() => {
})

afterEach(() => {
cleanup()
server.resetHandlers()
queryClient.clear()
})
Expand Down
3 changes: 1 addition & 2 deletions src/layouts/Header/components/AdminLink/AdminLink.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
import { cleanup, render, screen } from '@testing-library/react'
import { render, screen } from '@testing-library/react'
import { http, HttpResponse } from 'msw2'
import { setupServer } from 'msw2/node'
import { MemoryRouter, Route } from 'react-router-dom'
Expand Down Expand Up @@ -32,7 +32,6 @@ beforeAll(() => {
})

beforeEach(() => {
cleanup()
server.resetHandlers()
queryClient.clear()
})
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
import { cleanup, render, screen } from '@testing-library/react'
import { render, screen } from '@testing-library/react'
import React from 'react'
import { MemoryRouter, Route } from 'react-router-dom'
import { type Mock } from 'vitest'
Expand Down Expand Up @@ -40,7 +40,6 @@ beforeEach(() => {
})

afterEach(() => {
cleanup()
queryClient.clear()
})

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
import { cleanup, render, screen, waitFor } from '@testing-library/react'
import { render, screen, waitFor } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import { graphql, HttpResponse } from 'msw2'
import { setupServer } from 'msw2/node'
Expand Down Expand Up @@ -59,7 +59,6 @@ beforeAll(() => {
})

afterEach(() => {
cleanup()
queryClient.clear()
server.restoreHandlers()
})
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
import { cleanup, render, screen } from '@testing-library/react'
import { render, screen } from '@testing-library/react'
import { graphql, HttpResponse } from 'msw2'
import { setupServer } from 'msw2/node'
import { MemoryRouter, Route } from 'react-router-dom'
Expand Down Expand Up @@ -43,7 +43,6 @@ beforeAll(() => {
})

afterEach(() => {
cleanup()
server.resetHandlers()
queryClient.clear()
})
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
import * as Sentry from '@sentry/react'
import {
cleanup,
render,
screen,
waitFor,
within,
} from '@testing-library/react'
import { render, screen, waitFor, within } from '@testing-library/react'
import userEvent from '@testing-library/user-event'

import { ThemeContextProvider } from 'shared/ThemeContext'
Expand Down Expand Up @@ -33,7 +27,6 @@ describe('ThemeToggle', () => {
})

afterEach(() => {
cleanup()
vi.clearAllMocks()
})

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
import { cleanup, render, screen, waitFor } from '@testing-library/react'
import { render, screen, waitFor } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import { graphql, http, HttpResponse } from 'msw2'
import { setupServer } from 'msw2/node'
Expand Down Expand Up @@ -92,7 +92,6 @@ beforeAll(() => {
})

afterEach(() => {
cleanup()
queryClient.clear()
server.resetHandlers()
})
Expand Down
3 changes: 1 addition & 2 deletions src/layouts/LoginLayout/LoginLayout.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
import { cleanup, render, screen, waitFor } from '@testing-library/react'
import { render, screen, waitFor } from '@testing-library/react'
import { graphql, HttpResponse } from 'msw2'
import { setupServer } from 'msw2/node'
import { MemoryRouter, Route } from 'react-router-dom'
Expand Down Expand Up @@ -44,7 +44,6 @@ beforeAll(() => {
afterEach(() => {
queryClient.clear()
server.resetHandlers()
cleanup()
vi.clearAllMocks()
})

Expand Down
6 changes: 1 addition & 5 deletions src/ui/TotalsNumber/TotalsNumber.test.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
import { cleanup, render, screen } from '@testing-library/react'
import { render, screen } from '@testing-library/react'

import TotalsNumber from './TotalsNumber'

afterEach(() => {
cleanup()
})

describe('TotalsNumber', () => {
describe('when rendered', () => {
it('renders commit change when there is a valid value', () => {
Expand Down
6 changes: 1 addition & 5 deletions src/ui/TruncatedMessage/TruncatedMessage.test.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
import { cleanup, render, screen } from '@testing-library/react'
import { render, screen } from '@testing-library/react'
import userEvent from '@testing-library/user-event'

import { useTruncation } from './hooks'
import TruncatedMessage from './TruncatedMessage'

vi.mock('./hooks')

afterEach(() => {
cleanup()
})

describe('TruncatedMessage', () => {
function setup({ canTruncate = false }) {
// @ts-expect-error
Expand Down
6 changes: 1 addition & 5 deletions src/ui/TruncatedMessage/hooks/useTruncation.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { cleanup, renderHook } from '@testing-library/react'
import { renderHook } from '@testing-library/react'

import { useTruncation } from './useTruncation'

Expand Down Expand Up @@ -36,10 +36,6 @@ vi.mock('react', async () => {
}
})

afterEach(() => {
cleanup()
})

describe('useTruncation', () => {
function setup({
clientHeight = 0,
Expand Down
Loading