Skip to content

Commit 4f966fd

Browse files
committed
trying to fix type errors
1 parent 64ab430 commit 4f966fd

File tree

4 files changed

+26
-3
lines changed

4 files changed

+26
-3
lines changed

packages/core/src/router.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ export class Router {
205205
const deferred = currentPage.get().props.deferred
206206

207207
if (deferred) {
208-
Object.entries(deferred).forEach(([key, group]) => {
208+
Object.entries(deferred).forEach(([_, group]) => {
209209
this.reload({ only: group })
210210
})
211211
}

packages/core/tests/response.test.ts

+18-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { ActiveVisit, Page, PreserveStateOption } from '../src'
33
import * as events from '../src/events'
44
import { History } from '../src/history'
55
import modal from '../src/modal'
6-
import { page as currentPage } from '../src/page'
6+
import { page as currentPage, page } from '../src/page'
77
import { RequestParams } from '../src/requestParams'
88
import { Response } from '../src/response'
99
import { SessionStorage } from '../src/sessionStorage'
@@ -24,7 +24,7 @@ const requestParams = (overrides: Partial<ActiveVisit> = {}) => {
2424
}
2525

2626
test('create a response from the helper method', () => {
27-
const response = Response.create(requestParams(), axiosResponse())
27+
const response = Response.create(requestParams(), axiosResponse(), page.get())
2828

2929
expect(response).toBeInstanceOf(Response)
3030
})
@@ -58,6 +58,7 @@ test('props are merged for partial request responses', async () => {
5858
},
5959
}),
6060
}),
61+
page.get(),
6162
)
6263

6364
await response.handle()
@@ -110,6 +111,7 @@ test.each([
110111
value: 'errors' as PreserveStateOption,
111112
expected: true,
112113
label: 'errors but present',
114+
// @ts-ignore
113115
responseProps: {
114116
props: {
115117
// TODO: Why is this type wrong...?
@@ -134,6 +136,7 @@ test.each([
134136
},
135137
data: pageComponent({ ...responseProps }),
136138
}),
139+
page.get(),
137140
)
138141

139142
await response.handle()
@@ -187,6 +190,7 @@ test.each([
187190
expected: true,
188191
label: 'errors but present',
189192
historyStateCount: 1,
193+
// @ts-ignore
190194
responseProps: {
191195
props: {
192196
// TODO: Why is this type wrong...?
@@ -215,6 +219,7 @@ test.each([
215219
},
216220
data: pageComponent({ ...responseProps }),
217221
}),
222+
page.get(),
218223
)
219224

220225
await response.handle()
@@ -256,6 +261,7 @@ test('remembered state is set after response', async () => {
256261
},
257262
data: pageComponent(),
258263
}),
264+
page.get(),
259265
)
260266

261267
await response.handle()
@@ -299,6 +305,7 @@ test('remembered state is not set if preserve state is false', async () => {
299305
},
300306
data: pageComponent(),
301307
}),
308+
page.get(),
302309
)
303310

304311
await response.handle()
@@ -340,6 +347,7 @@ test('remembered state is not set if the response component is different', async
340347
component: 'DifferentComponent',
341348
}),
342349
}),
350+
page.get(),
343351
)
344352

345353
await response.handle()
@@ -379,6 +387,7 @@ test('preserve url hash if response url is the same', async () => {
379387
},
380388
data: pageComponent(),
381389
}),
390+
page.get(),
382391
)
383392

384393
await response.handle()
@@ -421,11 +430,13 @@ test('if there are errors, fire error events', async () => {
421430
props: {
422431
errors: {
423432
// TODO: Why is this type wrong...?
433+
// @ts-ignore
424434
foo: 'bar',
425435
},
426436
},
427437
}),
428438
}),
439+
page.get(),
429440
)
430441

431442
await response.handle()
@@ -468,6 +479,7 @@ test('if there are no errors, fire success events', async () => {
468479
},
469480
data: pageComponent(),
470481
}),
482+
page.get(),
471483
)
472484

473485
await response.handle()
@@ -504,6 +516,7 @@ test('handles location responses', async () => {
504516
},
505517
data: pageComponent(),
506518
}),
519+
page.get(),
507520
)
508521

509522
await response.handle()
@@ -547,6 +560,7 @@ test.each([
547560
},
548561
data: pageComponent(),
549562
}),
563+
page.get(),
550564
)
551565

552566
await response.handle()
@@ -584,11 +598,13 @@ test.each([
584598
headers: {},
585599
data: 'This is not an Inertia response',
586600
}),
601+
page.get(),
587602
)
588603

589604
await response.handle()
590605

591606
expect(modalSpies.show).toHaveBeenCalledTimes(modalShowCount)
607+
expect(fireInvalidEvent).toHaveBeenCalledOnce()
592608
})
593609

594610
test('will continue to error if there is no response in the error object', { todo: true }, async () => {})

packages/core/tests/router.test.ts

+6
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,7 @@ suite('visit', () => {
286286
file: new File([''], 'file.txt'),
287287
},
288288
},
289+
// @ts-ignore
289290
expectation: () => expect.dataToBeFormData(),
290291
},
291292
{
@@ -297,6 +298,7 @@ suite('visit', () => {
297298
},
298299
forceFormData: true,
299300
},
301+
// @ts-ignore
300302
expectation: () => expect.dataToBeFormData(),
301303
},
302304
{
@@ -307,6 +309,7 @@ suite('visit', () => {
307309
whatever: 'ok',
308310
},
309311
},
312+
// @ts-ignore
310313
expectation: () => expect.dataToBeFormDataConvertible(),
311314
},
312315
])('it can transform incoming data from $from to $to', { todo: true }, async ({ params, expectation }) => {
@@ -407,6 +410,9 @@ suite('visit', () => {
407410

408411
expect(scrollSpy).toHaveBeenCalledOnce()
409412
expect(scrollSpy).toHaveBeenCalledWith(homePage)
413+
expect(pageSpies.set).toHaveBeenCalledOnce()
414+
expect(requestSpies.create).toHaveBeenCalledOnce()
415+
expect(requestSpies.send).toHaveBeenCalledOnce()
410416
})
411417

412418
test('start event callbacks are fired', async () => {

packages/core/tests/support.ts

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ export const getRequestParams = (overrides: Partial<ActiveVisit> = {}): ActiveVi
2525
preserveScroll: false,
2626
preserveState: false,
2727
errorBag: '',
28+
async: false,
2829
...overrides,
2930
})
3031

0 commit comments

Comments
 (0)