Skip to content

Commit 4d1f2cb

Browse files
kabaroskabaros
committed
fix: manual updates for react/vite migration
1 parent eb8115b commit 4d1f2cb

11 files changed

+43
-47
lines changed

‎.eslintrc.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,12 @@ module.exports = {
4444
},
4545
overrides: [
4646
{
47-
files: ['*.test.js', '**/__tests__/*.js'],
47+
files: [
48+
'*.test.js',
49+
'**/__tests__/*.js',
50+
'*.test.jsx',
51+
'**/__tests__/*.jsx',
52+
],
4853
rules: {
4954
'i18next/no-literal-string': 'off',
5055
'react/prop-types': 'off',
@@ -62,7 +67,7 @@ module.exports = {
6267
},
6368
},
6469
{
65-
files: ['cypress/**/*.js'],
70+
files: ['cypress/**/*.js', 'cypress/**/*.jsx'],
6671
rules: {
6772
'import/no-unassigned-import': 'off',
6873
'import/no-unused-modules': 'off',

‎src/hooks/job-types/use-job-type-parameters.test.jsx

+7-13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react'
2-
import { renderHook } from '@testing-library/react'
2+
import { renderHook, waitFor } from '@testing-library/react'
33
import { CustomDataProvider } from '@dhis2/app-runtime'
44
import useJobTypeParameters from './use-job-type-parameters'
55

@@ -16,12 +16,9 @@ describe('useJobTypeParameters', () => {
1616
<CustomDataProvider data={data}>{children}</CustomDataProvider>
1717
)
1818

19-
const { result, waitFor } = renderHook(
20-
() => useJobTypeParameters(jobType),
21-
{
22-
wrapper,
23-
}
24-
)
19+
const { result } = renderHook(() => useJobTypeParameters(jobType), {
20+
wrapper,
21+
})
2522

2623
await waitFor(() => {
2724
expect(result.current).toMatchObject({
@@ -43,12 +40,9 @@ describe('useJobTypeParameters', () => {
4340
<CustomDataProvider data={data}>{children}</CustomDataProvider>
4441
)
4542

46-
const { result, waitFor } = renderHook(
47-
() => useJobTypeParameters(jobType),
48-
{
49-
wrapper,
50-
}
51-
)
43+
const { result } = renderHook(() => useJobTypeParameters(jobType), {
44+
wrapper,
45+
})
5246

5347
await waitFor(() => {
5448
expect(result.current).toMatchObject({

‎src/hooks/job-types/use-job-type.test.jsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react'
2-
import { renderHook } from '@testing-library/react'
2+
import { renderHook, waitFor } from '@testing-library/react'
33
import { CustomDataProvider } from '@dhis2/app-runtime'
44
import useJobType from './use-job-type'
55

@@ -16,7 +16,7 @@ describe('useJobType', () => {
1616
<CustomDataProvider data={data}>{children}</CustomDataProvider>
1717
)
1818

19-
const { result, waitFor } = renderHook(() => useJobType(jobType), {
19+
const { result } = renderHook(() => useJobType(jobType), {
2020
wrapper,
2121
})
2222

@@ -40,7 +40,7 @@ describe('useJobType', () => {
4040
<CustomDataProvider data={data}>{children}</CustomDataProvider>
4141
)
4242

43-
const { result, waitFor } = renderHook(() => useJobType(jobType), {
43+
const { result } = renderHook(() => useJobType(jobType), {
4444
wrapper,
4545
})
4646

@@ -66,7 +66,7 @@ describe('useJobType', () => {
6666
<CustomDataProvider data={data}>{children}</CustomDataProvider>
6767
)
6868

69-
const { result, waitFor } = renderHook(() => useJobType(jobType), {
69+
const { result } = renderHook(() => useJobType(jobType), {
7070
wrapper,
7171
})
7272

‎src/hooks/job-types/use-job-types.test.jsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react'
2-
import { renderHook } from '@testing-library/react'
2+
import { renderHook, waitFor } from '@testing-library/react'
33
import { CustomDataProvider } from '@dhis2/app-runtime'
44
import useJobTypes from './use-job-types'
55

@@ -11,7 +11,7 @@ describe('useJobTypes', () => {
1111
<CustomDataProvider data={data}>{children}</CustomDataProvider>
1212
)
1313

14-
const { result, waitFor } = renderHook(() => useJobTypes(), {
14+
const { result } = renderHook(() => useJobTypes(), {
1515
wrapper,
1616
})
1717

@@ -34,7 +34,7 @@ describe('useJobTypes', () => {
3434
<CustomDataProvider data={data}>{children}</CustomDataProvider>
3535
)
3636

37-
const { result, waitFor } = renderHook(() => useJobTypes(), {
37+
const { result } = renderHook(() => useJobTypes(), {
3838
wrapper,
3939
})
4040

‎src/hooks/jobs-and-queues/use-jobs-and-queues.test.jsx

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react'
2-
import { renderHook } from '@testing-library/react'
2+
import { renderHook, waitFor } from '@testing-library/react'
33
import { CustomDataProvider } from '@dhis2/app-runtime'
44
import useJobsAndQueues from './use-jobs-and-queues'
55

@@ -11,7 +11,7 @@ describe('useJobsAndQueues', () => {
1111
<CustomDataProvider data={data}>{children}</CustomDataProvider>
1212
)
1313

14-
const { result, waitFor } = renderHook(() => useJobsAndQueues(), {
14+
const { result } = renderHook(() => useJobsAndQueues(), {
1515
wrapper,
1616
})
1717

@@ -40,7 +40,7 @@ describe('useJobsAndQueues', () => {
4040
<CustomDataProvider data={data}>{children}</CustomDataProvider>
4141
)
4242

43-
const { result, waitFor } = renderHook(() => useJobsAndQueues(), {
43+
const { result } = renderHook(() => useJobsAndQueues(), {
4444
wrapper,
4545
})
4646

@@ -60,7 +60,7 @@ describe('useJobsAndQueues', () => {
6060
<CustomDataProvider data={data}>{children}</CustomDataProvider>
6161
)
6262

63-
const { result, waitFor } = renderHook(() => useJobsAndQueues(), {
63+
const { result } = renderHook(() => useJobsAndQueues(), {
6464
wrapper,
6565
})
6666

@@ -80,7 +80,7 @@ describe('useJobsAndQueues', () => {
8080
<CustomDataProvider data={data}>{children}</CustomDataProvider>
8181
)
8282

83-
const { result, waitFor } = renderHook(() => useJobsAndQueues(), {
83+
const { result } = renderHook(() => useJobsAndQueues(), {
8484
wrapper,
8585
})
8686

@@ -99,7 +99,7 @@ describe('useJobsAndQueues', () => {
9999
<CustomDataProvider data={data}>{children}</CustomDataProvider>
100100
)
101101

102-
const { result, waitFor } = renderHook(() => useJobsAndQueues(), {
102+
const { result } = renderHook(() => useJobsAndQueues(), {
103103
wrapper,
104104
})
105105

‎src/hooks/jobs/use-job-by-id.test.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react'
2-
import { renderHook } from '@testing-library/react'
2+
import { renderHook, waitFor } from '@testing-library/react'
33
import { CustomDataProvider } from '@dhis2/app-runtime'
44
import useJobById from './use-job-by-id'
55

@@ -15,7 +15,7 @@ describe('useJobById', () => {
1515
<CustomDataProvider data={data}>{children}</CustomDataProvider>
1616
)
1717

18-
const { result, waitFor } = renderHook(() => useJobById(id), {
18+
const { result } = renderHook(() => useJobById(id), {
1919
wrapper,
2020
})
2121

‎src/hooks/jobs/use-jobs.test.jsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react'
2-
import { renderHook } from '@testing-library/react'
2+
import { renderHook, waitFor } from '@testing-library/react'
33
import { CustomDataProvider } from '@dhis2/app-runtime'
44
import useJobs from './use-jobs'
55

@@ -16,7 +16,7 @@ describe('useJobs', () => {
1616
<CustomDataProvider data={data}>{children}</CustomDataProvider>
1717
)
1818

19-
const { result, waitFor } = renderHook(() => useJobs(), {
19+
const { result } = renderHook(() => useJobs(), {
2020
wrapper,
2121
})
2222

@@ -39,7 +39,7 @@ describe('useJobs', () => {
3939
<CustomDataProvider data={data}>{children}</CustomDataProvider>
4040
)
4141

42-
const { result, waitFor } = renderHook(() => useJobs(), {
42+
const { result } = renderHook(() => useJobs(), {
4343
wrapper,
4444
})
4545

‎src/hooks/parameter-options/use-parameter-option.test.jsx

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react'
2-
import { renderHook } from '@testing-library/react'
2+
import { renderHook, waitFor } from '@testing-library/react'
33
import { CustomDataProvider } from '@dhis2/app-runtime'
44
import useParameterOption from './use-parameter-option'
55

@@ -24,12 +24,9 @@ describe('useParameterOption', () => {
2424
<CustomDataProvider data={data}>{children}</CustomDataProvider>
2525
)
2626

27-
const { result, waitFor } = renderHook(
28-
() => useParameterOption(parameter),
29-
{
30-
wrapper,
31-
}
32-
)
27+
const { result } = renderHook(() => useParameterOption(parameter), {
28+
wrapper,
29+
})
3330

3431
await waitFor(() => {
3532
expect(result.current).toMatchObject({

‎src/hooks/parameter-options/use-parameter-options.test.jsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react'
2-
import { renderHook } from '@testing-library/react'
2+
import { renderHook, waitFor } from '@testing-library/react'
33
import { CustomDataProvider } from '@dhis2/app-runtime'
44
import useParameterOptions from './use-parameter-options'
55

@@ -22,7 +22,7 @@ describe('useParameterOptions', () => {
2222
<CustomDataProvider data={data}>{children}</CustomDataProvider>
2323
)
2424

25-
const { result, waitFor } = renderHook(() => useParameterOptions(), {
25+
const { result } = renderHook(() => useParameterOptions(), {
2626
wrapper,
2727
})
2828

@@ -61,7 +61,7 @@ describe('useParameterOptions', () => {
6161
<CustomDataProvider data={data}>{children}</CustomDataProvider>
6262
)
6363

64-
const { result, waitFor } = renderHook(() => useParameterOptions(), {
64+
const { result } = renderHook(() => useParameterOptions(), {
6565
wrapper,
6666
})
6767

‎src/hooks/queueables/use-queueables.test.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react'
2-
import { renderHook } from '@testing-library/react'
2+
import { renderHook, waitFor } from '@testing-library/react'
33
import { CustomDataProvider } from '@dhis2/app-runtime'
44
import useQueueables from './use-queueables'
55

@@ -16,7 +16,7 @@ describe('useQueueables', () => {
1616
<CustomDataProvider data={data}>{children}</CustomDataProvider>
1717
)
1818

19-
const { result, waitFor } = renderHook(() => useQueueables(), {
19+
const { result } = renderHook(() => useQueueables(), {
2020
wrapper,
2121
})
2222

‎src/hooks/queues/use-queue-by-name.test.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react'
2-
import { renderHook } from '@testing-library/react'
2+
import { renderHook, waitFor } from '@testing-library/react'
33
import { CustomDataProvider } from '@dhis2/app-runtime'
44
import useQueueByName from './use-queue-by-name'
55

@@ -11,7 +11,7 @@ describe('useQueueByName', () => {
1111
<CustomDataProvider data={data}>{children}</CustomDataProvider>
1212
)
1313

14-
const { result, waitFor } = renderHook(() => useQueueByName('name'), {
14+
const { result } = renderHook(() => useQueueByName('name'), {
1515
wrapper,
1616
})
1717

0 commit comments

Comments
 (0)