Skip to content

Commit 84f69c4

Browse files
authored
fix: Make error message nullable (#3894)
1 parent 0ea47f5 commit 84f69c4

File tree

3 files changed

+20
-58
lines changed

3 files changed

+20
-58
lines changed

src/pages/OwnerPage/Tabs/TrialReminder/TrialReminder.test.tsx

Lines changed: 18 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,6 @@ describe('TrialReminder', () => {
123123
}
124124

125125
describe('user has not started a trial', () => {
126-
beforeEach(() => {
127-
vi.useFakeTimers().setSystemTime(new Date('2023-01-01'))
128-
})
129-
130-
afterEach(() => {
131-
vi.useRealTimers()
132-
})
133-
134126
describe('user is on a free plan', () => {
135127
describe('user is part of org', () => {
136128
it('displays trial upgrade link', async () => {
@@ -165,10 +157,8 @@ describe('TrialReminder', () => {
165157

166158
const { container } = render(<TrialReminder />, { wrapper })
167159

168-
await waitFor(() =>
169-
expect(queryClient.isFetching()).toBeGreaterThan(0)
170-
)
171-
await waitFor(() => expect(queryClient.isFetching()).toBe(0))
160+
await waitFor(() => queryClient.isFetching)
161+
await waitFor(() => !queryClient.isFetching)
172162

173163
expect(container).toBeEmptyDOMElement()
174164
})
@@ -186,8 +176,8 @@ describe('TrialReminder', () => {
186176

187177
const { container } = render(<TrialReminder />, { wrapper })
188178

189-
await waitFor(() => expect(queryClient.isFetching()).toBeGreaterThan(0))
190-
await waitFor(() => expect(queryClient.isFetching()).toBe(0))
179+
await waitFor(() => queryClient.isFetching)
180+
await waitFor(() => !queryClient.isFetching)
191181

192182
expect(container).toBeEmptyDOMElement()
193183
})
@@ -235,10 +225,8 @@ describe('TrialReminder', () => {
235225

236226
const { container } = render(<TrialReminder />, { wrapper })
237227

238-
await waitFor(() =>
239-
expect(queryClient.isFetching()).toBeGreaterThan(0)
240-
)
241-
await waitFor(() => expect(queryClient.isFetching()).toBe(0))
228+
await waitFor(() => queryClient.isFetching)
229+
await waitFor(() => !queryClient.isFetching)
242230

243231
expect(container).toBeEmptyDOMElement()
244232
})
@@ -264,8 +252,8 @@ describe('TrialReminder', () => {
264252

265253
const { container } = render(<TrialReminder />, { wrapper })
266254

267-
await waitFor(() => expect(queryClient.isFetching()).toBeGreaterThan(0))
268-
await waitFor(() => expect(queryClient.isFetching()).toBe(0))
255+
await waitFor(() => queryClient.isFetching)
256+
await waitFor(() => !queryClient.isFetching)
269257

270258
expect(container).toBeEmptyDOMElement()
271259
})
@@ -314,10 +302,8 @@ describe('TrialReminder', () => {
314302

315303
const { container } = render(<TrialReminder />, { wrapper })
316304

317-
await waitFor(() =>
318-
expect(queryClient.isFetching()).toBeGreaterThan(0)
319-
)
320-
await waitFor(() => expect(queryClient.isFetching()).toBe(0))
305+
await waitFor(() => queryClient.isFetching)
306+
await waitFor(() => !queryClient.isFetching)
321307

322308
expect(container).toBeEmptyDOMElement()
323309
})
@@ -335,23 +321,15 @@ describe('TrialReminder', () => {
335321

336322
const { container } = render(<TrialReminder />, { wrapper })
337323

338-
await waitFor(() => expect(queryClient.isFetching()).toBeGreaterThan(0))
339-
await waitFor(() => expect(queryClient.isFetching()).toBe(0))
324+
await waitFor(() => queryClient.isFetching)
325+
await waitFor(() => !queryClient.isFetching)
340326

341327
expect(container).toBeEmptyDOMElement()
342328
})
343329
})
344330
})
345331

346332
describe('user cannot trial', () => {
347-
beforeEach(() => {
348-
vi.useFakeTimers().setSystemTime(new Date('2023-01-01'))
349-
})
350-
351-
afterEach(() => {
352-
vi.useRealTimers()
353-
})
354-
355333
it('does not display upgrade link', async () => {
356334
setup({
357335
planValue: Plans.USERS_PR_INAPPY,
@@ -362,8 +340,8 @@ describe('TrialReminder', () => {
362340

363341
const { container } = render(<TrialReminder />, { wrapper })
364342

365-
await waitFor(() => expect(queryClient.isFetching()).toBeGreaterThan(0))
366-
await waitFor(() => expect(queryClient.isFetching()).toBe(0))
343+
await waitFor(() => queryClient.isFetching)
344+
await waitFor(() => !queryClient.isFetching)
367345

368346
expect(container).toBeEmptyDOMElement()
369347
})
@@ -381,22 +359,14 @@ describe('TrialReminder', () => {
381359

382360
const { container } = render(<TrialReminder />, { wrapper })
383361

384-
await waitFor(() => expect(queryClient.isFetching()).toBeGreaterThan(0))
385-
await waitFor(() => expect(queryClient.isFetching()).toBe(0))
362+
await waitFor(() => queryClient.isFetching)
363+
await waitFor(() => !queryClient.isFetching)
386364

387365
expect(container).toBeEmptyDOMElement()
388366
})
389367
})
390368

391369
describe('API returns no information', () => {
392-
beforeEach(() => {
393-
vi.useFakeTimers().setSystemTime(new Date('2023-01-01'))
394-
})
395-
396-
afterEach(() => {
397-
vi.useRealTimers()
398-
})
399-
400370
it('returns nothing', async () => {
401371
setup({
402372
planValue: Plans.USERS_DEVELOPER,
@@ -406,22 +376,14 @@ describe('TrialReminder', () => {
406376

407377
const { container } = render(<TrialReminder />, { wrapper })
408378

409-
await waitFor(() => expect(queryClient.isFetching()).toBeGreaterThan(0))
410-
await waitFor(() => expect(queryClient.isFetching()).toBe(0))
379+
await waitFor(() => queryClient.isFetching)
380+
await waitFor(() => !queryClient.isFetching)
411381

412382
expect(container).toBeEmptyDOMElement()
413383
})
414384
})
415385

416386
describe('app is running in self hosted', () => {
417-
beforeEach(() => {
418-
vi.useFakeTimers().setSystemTime(new Date('2023-01-01'))
419-
})
420-
421-
afterEach(() => {
422-
vi.useRealTimers()
423-
})
424-
425387
it('renders nothing', async () => {
426388
setup({
427389
planValue: Plans.USERS_DEVELOPER,

src/pages/RepoPage/FailedTestsTab/FailedTestsPage/FailedTestsErrorBanner/FailedTestsErrorBanner.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ const ProcessingTimeoutBanner = () => (
5454
const UnsupportedFormatBanner = ({
5555
errorMessage,
5656
}: {
57-
errorMessage: string
57+
errorMessage: string | null
5858
}) => (
5959
<Banner variant="warning">
6060
<BannerHeading>

src/pages/RepoPage/FailedTestsTab/FailedTestsPage/hooks/useTestResultsTestSuites/useTestResultsTestSuites.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const TestResultsTestSuitesSchema = z.object({
2020
latestUploadError: z
2121
.object({
2222
errorCode: z.nativeEnum(ErrorCodeEnum),
23-
errorMessage: z.string(),
23+
errorMessage: z.string().nullable(),
2424
})
2525
.nullable(),
2626
})

0 commit comments

Comments
 (0)