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 barrel files from services collection (part 3) #3780

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
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
Prev Previous commit
Next Next commit
fix test mocks
  • Loading branch information
nicholas-codecov committed Feb 26, 2025
commit 8d0388ca85d4263b34ec203941c9e9e63a054920
2 changes: 1 addition & 1 deletion src/layouts/ToastNotifications/ToastNotifications.test.jsx
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ const notifications = [
},
]

vi.mock('services/toastNotification')
vi.mock('services/toastNotification/context')

describe('ToastNotifications', () => {
const removeNotification = vi.fn()
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ import { useAddNotification } from 'services/toastNotification/context'

import DetailsSection from './DetailsSection'

vi.mock('services/toastNotification')
vi.mock('services/toastNotification/context')

const queryClient = new QueryClient({
defaultOptions: { queries: { retry: false } },
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ import {
useUpdateOktaConfig,
} from './useUpdateOktaConfig'

vi.mock('services/toastNotification')
vi.mock('services/toastNotification/context')
const mockedToastNotification = useAddNotification as Mock

const queryClientV5 = new QueryClientV5({
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ import { useFlags } from 'shared/featureFlags'

import OrgUploadToken from './OrgUploadToken'

vi.mock('services/toastNotification')
vi.mock('services/toastNotification/context')
vi.mock('shared/featureFlags')
vi.mock('./TokenlessSection', () => ({ default: () => 'TokenlessSection' }))

Original file line number Diff line number Diff line change
@@ -16,8 +16,8 @@ const mocks = vi.hoisted(() => ({
useFlags: vi.fn(),
}))

vi.mock('services/toastNotification', async () => {
const actual = await vi.importActual('services/toastNotification')
vi.mock('services/toastNotification/context', async () => {
const actual = await vi.importActual('services/toastNotification/context')
return {
...actual,
useAddNotification: mocks.useAddNotification,
Original file line number Diff line number Diff line change
@@ -13,8 +13,8 @@ const mocks = vi.hoisted(() => ({
useAddNotification: vi.fn(),
}))

vi.mock('services/toastNotification', async () => {
const actual = await vi.importActual('services/toastNotification')
vi.mock('services/toastNotification/context', async () => {
const actual = await vi.importActual('services/toastNotification/context')
return {
...actual,
useAddNotification: mocks.useAddNotification,
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ import { useAddNotification } from 'services/toastNotification/context'

import NameEmailCard from './NameEmailCard'

vi.mock('services/toastNotification')
vi.mock('services/toastNotification/context')

const currentUser = {
name: 'donald duck',
Original file line number Diff line number Diff line change
@@ -36,8 +36,8 @@ vi.mock('services/account/useCancelPlan', async () => {
}
})

vi.mock('services/toastNotification', async () => {
const actual = await vi.importActual('services/toastNotification')
vi.mock('services/toastNotification/context', async () => {
const actual = await vi.importActual('services/toastNotification/context')
return {
...actual,
useAddNotification: mocks.useAddNotification,
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ const mocks = vi.hoisted(() => ({
useParams: vi.fn(),
}))

vi.mock('services/toastNotification')
vi.mock('services/toastNotification/context')

vi.mock('react-router-dom', async () => {
const actual = await vi.requireActual('react-router-dom')
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ import SpecialOffer from './SpecialOffer'
const mockBody = vi.fn()
const mockToast = vi.fn()

vi.mock('services/toastNotification', () => ({
vi.mock('services/toastNotification/context', () => ({
useAddNotification: () => (data) => mockToast(data),
}))

Original file line number Diff line number Diff line change
@@ -17,8 +17,8 @@ const mocks = vi.hoisted(() => ({
}))

vi.mock('@stripe/react-stripe-js')
vi.mock('services/toastNotification', async () => {
const actual = await vi.importActual('services/toastNotification')
vi.mock('services/toastNotification/context', async () => {
const actual = await vi.importActual('services/toastNotification/context')
return {
...actual,
useAddNotification: mocks.useAddNotification,
Original file line number Diff line number Diff line change
@@ -15,8 +15,8 @@ const mocks = vi.hoisted(() => ({
useAddNotification: vi.fn(),
}))

vi.mock('services/toastNotification', async () => {
const actual = await vi.importActual('services/toastNotification')
vi.mock('services/toastNotification/context', async () => {
const actual = await vi.importActual('services/toastNotification/context')
return {
...actual,
useAddNotification: mocks.useAddNotification,
Original file line number Diff line number Diff line change
@@ -16,8 +16,8 @@ const mocks = vi.hoisted(() => ({
useAddNotification: vi.fn(),
}))

vi.mock('services/toastNotification', async () => {
const actual = await vi.importActual('services/toastNotification')
vi.mock('services/toastNotification/context', async () => {
const actual = await vi.importActual('services/toastNotification/context')
return {
...actual,
useAddNotification: mocks.useAddNotification,
Original file line number Diff line number Diff line change
@@ -21,8 +21,8 @@ const mocks = vi.hoisted(() => ({
useAddNotification: vi.fn(),
}))

vi.mock('services/toastNotification', async () => {
const actual = await vi.importActual('services/toastNotification')
vi.mock('services/toastNotification/context', async () => {
const actual = await vi.importActual('services/toastNotification/context')
return {
...actual,
useAddNotification: mocks.useAddNotification,
Original file line number Diff line number Diff line change
@@ -12,8 +12,8 @@ const mocks = vi.hoisted(() => ({
useAddNotification: vi.fn(),
}))

vi.mock('services/toastNotification', async () => {
const actual = await vi.importActual('services/toastNotification')
vi.mock('services/toastNotification/context', async () => {
const actual = await vi.importActual('services/toastNotification/context')
return {
...actual,
useAddNotification: mocks.useAddNotification,
Original file line number Diff line number Diff line change
@@ -11,8 +11,8 @@ const mocks = vi.hoisted(() => ({
useAddNotification: vi.fn(),
}))

vi.mock('services/toastNotification', async () => {
const actual = await vi.importActual('services/toastNotification')
vi.mock('services/toastNotification/context', async () => {
const actual = await vi.importActual('services/toastNotification/context')
return {
...actual,
useAddNotification: mocks.useAddNotification,
Original file line number Diff line number Diff line change
@@ -10,8 +10,8 @@ const mocks = vi.hoisted(() => ({
useAddNotification: vi.fn(),
}))

vi.mock('services/toastNotification', async () => {
const actual = await vi.importActual('services/toastNotification')
vi.mock('services/toastNotification/context', async () => {
const actual = await vi.importActual('services/toastNotification/context')
return {
...actual,
useAddNotification: mocks.useAddNotification,
Original file line number Diff line number Diff line change
@@ -12,8 +12,8 @@ const mocks = vi.hoisted(() => ({
useIntersection: vi.fn(),
}))

vi.mock('services/toastNotification', async () => {
const actual = await vi.importActual('services/toastNotification')
vi.mock('services/toastNotification/context', async () => {
const actual = await vi.importActual('services/toastNotification/context')
return {
...actual,
useAddNotification: mocks.useAddNotification,
Original file line number Diff line number Diff line change
@@ -12,8 +12,8 @@ const mocks = vi.hoisted(() => ({
useAddNotification: vi.fn(),
}))

vi.mock('services/toastNotification', async () => {
const actual = await vi.importActual('services/toastNotification')
vi.mock('services/toastNotification/context', async () => {
const actual = await vi.importActual('services/toastNotification/context')
return {
...actual,
useAddNotification: mocks.useAddNotification,
Original file line number Diff line number Diff line change
@@ -12,8 +12,8 @@ const mocks = vi.hoisted(() => ({
useAddNotification: vi.fn(),
}))

vi.mock('services/toastNotification', async () => {
const actual = await vi.importActual('services/toastNotification')
vi.mock('services/toastNotification/context', async () => {
const actual = await vi.importActual('services/toastNotification/context')
return {
...actual,
useAddNotification: mocks.useAddNotification,
Original file line number Diff line number Diff line change
@@ -11,8 +11,8 @@ const mocks = vi.hoisted(() => ({
useAddNotification: vi.fn(),
}))

vi.mock('services/toastNotification', async () => {
const actual = await vi.importActual('services/toastNotification')
vi.mock('services/toastNotification/context', async () => {
const actual = await vi.importActual('services/toastNotification/context')
return {
...actual,
useAddNotification: mocks.useAddNotification,
4 changes: 2 additions & 2 deletions src/services/account/useSentryToken.test.tsx
Original file line number Diff line number Diff line change
@@ -10,8 +10,8 @@ const mocks = vi.hoisted(() => ({
useAddNotification: vi.fn(),
}))

vi.mock('services/toastNotification', async () => {
const original = await vi.importActual('services/toastNotification')
vi.mock('services/toastNotification/context', async () => {
const original = await vi.importActual('services/toastNotification/context')
return {
...original,
useAddNotification: mocks.useAddNotification,
4 changes: 2 additions & 2 deletions src/services/account/useUpdateSelfHostedSettings.test.tsx
Original file line number Diff line number Diff line change
@@ -14,8 +14,8 @@ const mocks = vi.hoisted(() => ({
useAddNotification: vi.fn(),
}))

vi.mock('services/toastNotification', async () => {
const original = await vi.importActual('services/toastNotification')
vi.mock('services/toastNotification/context', async () => {
const original = await vi.importActual('services/toastNotification/context')
return {
...original,
useAddNotification: mocks.useAddNotification,
Original file line number Diff line number Diff line change
@@ -10,8 +10,10 @@ const mocks = vi.hoisted(() => ({
useAddNotification: vi.fn(),
}))

vi.mock('services/toastNotification', async () => {
const originalModule = await vi.importActual('services/toastNotification')
vi.mock('services/toastNotification/context', async () => {
const originalModule = await vi.importActual(
'services/toastNotification/context'
)
return {
...originalModule,
useAddNotification: mocks.useAddNotification,
6 changes: 4 additions & 2 deletions src/services/deleteFlag/useDeleteFlag.test.jsx
Original file line number Diff line number Diff line change
@@ -10,8 +10,10 @@ const mocks = vi.hoisted(() => ({
useAddNotification: vi.fn(),
}))

vi.mock('services/toastNotification', async () => {
const originalModule = await vi.importActual('services/toastNotification')
vi.mock('services/toastNotification/context', async () => {
const originalModule = await vi.importActual(
'services/toastNotification/context'
)
return {
...originalModule,
useAddNotification: mocks.useAddNotification,
Original file line number Diff line number Diff line change
@@ -10,8 +10,8 @@ const mocks = vi.hoisted(() => ({
useAddNotification: vi.fn(),
}))

vi.mock('services/toastNotification', async () => {
const actual = await vi.importActual('services/toastNotification')
vi.mock('services/toastNotification/context', async () => {
const actual = await vi.importActual('services/toastNotification/context')
return {
...actual,
useAddNotification: mocks.useAddNotification,
Original file line number Diff line number Diff line change
@@ -10,8 +10,8 @@ const mocks = vi.hoisted(() => ({
useAddNotification: vi.fn(),
}))

vi.mock('services/toastNotification', async () => {
const actual = await vi.importActual('services/toastNotification')
vi.mock('services/toastNotification/context', async () => {
const actual = await vi.importActual('services/toastNotification/context')
return {
...actual,
useAddNotification: mocks.useAddNotification,
Loading
Oops, something went wrong.