Skip to content

Commit a75620c

Browse files
mydeamydea
committed
fix remix
1 parent cc029b0 commit a75620c

File tree

2 files changed

+32
-32
lines changed

2 files changed

+32
-32
lines changed

‎packages/remix/test/integration/test/server/action.test.ts

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
5858
const [transaction] = envelopes.filter(envelope => envelope[1]?.type === 'transaction');
5959
const [event] = envelopes.filter(envelope => envelope[1]?.type === 'event');
6060

61-
assertSentryTransaction(transaction[2], {
61+
assertSentryTransaction(transaction![2]!, {
6262
contexts: {
6363
trace: {
6464
status: 'internal_error',
@@ -69,7 +69,7 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
6969
},
7070
});
7171

72-
assertSentryEvent(event[2], {
72+
assertSentryEvent(event![2]!, {
7373
transaction: expect.stringMatching(/routes\/action-json-response(\/|\.)\$id/),
7474
exception: {
7575
values: [
@@ -104,7 +104,7 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
104104
const [transaction] = envelopes.filter(envelope => envelope[1]?.type === 'transaction');
105105
const [event] = envelopes.filter(envelope => envelope[1]?.type === 'event');
106106

107-
assertSentryTransaction(transaction[2], {
107+
assertSentryTransaction(transaction![2]!, {
108108
transaction: `routes/action-json-response${useV2 ? '.' : '/'}$id`,
109109
request: {
110110
method: 'POST',
@@ -117,7 +117,7 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
117117
},
118118
});
119119

120-
assertSentryEvent(event[2], {
120+
assertSentryEvent(event![2]!, {
121121
transaction: expect.stringMatching(/routes\/action-json-response(\/|\.)\$id/),
122122
exception: {
123123
values: [
@@ -153,7 +153,7 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
153153
const [transaction_1, transaction_2] = envelopes.filter(envelope => envelope[1]?.type === 'transaction');
154154
const [event] = envelopes.filter(envelope => envelope[1]?.type === 'event');
155155

156-
assertSentryTransaction(transaction_1[2], {
156+
assertSentryTransaction(transaction_1![2]!, {
157157
contexts: {
158158
trace: {
159159
op: 'http.server',
@@ -167,7 +167,7 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
167167
transaction: `routes/action-json-response${useV2 ? '.' : '/'}$id`,
168168
});
169169

170-
assertSentryTransaction(transaction_2[2], {
170+
assertSentryTransaction(transaction_2![2], {
171171
contexts: {
172172
trace: {
173173
op: 'http.server',
@@ -181,7 +181,7 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
181181
transaction: `routes/action-json-response${useV2 ? '.' : '/'}$id`,
182182
});
183183

184-
assertSentryEvent(event[2], {
184+
assertSentryEvent(event![2]!, {
185185
transaction: expect.stringMatching(/routes\/action-json-response(\/|\.)\$id/),
186186
exception: {
187187
values: [
@@ -216,7 +216,7 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
216216
const [transaction] = envelopes.filter(envelope => envelope[1]?.type === 'transaction');
217217
const [event] = envelopes.filter(envelope => envelope[1]?.type === 'event');
218218

219-
assertSentryTransaction(transaction[2], {
219+
assertSentryTransaction(transaction![2]!, {
220220
contexts: {
221221
trace: {
222222
op: 'http.server',
@@ -230,7 +230,7 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
230230
transaction: `routes/action-json-response${useV2 ? '.' : '/'}$id`,
231231
});
232232

233-
assertSentryEvent(event[2], {
233+
assertSentryEvent(event![2]!, {
234234
transaction: expect.stringMatching(/routes\/action-json-response(\/|\.)\$id/),
235235
exception: {
236236
values: [
@@ -265,7 +265,7 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
265265
const [transaction] = envelopes.filter(envelope => envelope[1]?.type === 'transaction');
266266
const [event] = envelopes.filter(envelope => envelope[1]?.type === 'event');
267267

268-
assertSentryTransaction(transaction[2], {
268+
assertSentryTransaction(transaction![2]!, {
269269
contexts: {
270270
trace: {
271271
op: 'http.server',
@@ -279,7 +279,7 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
279279
transaction: `routes/action-json-response${useV2 ? '.' : '/'}$id`,
280280
});
281281

282-
assertSentryEvent(event[2], {
282+
assertSentryEvent(event![2]!, {
283283
transaction: expect.stringMatching(/routes\/action-json-response(\/|\.)\$id/),
284284
exception: {
285285
values: [
@@ -314,7 +314,7 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
314314
const [transaction] = envelopes.filter(envelope => envelope[1]?.type === 'transaction');
315315
const [event] = envelopes.filter(envelope => envelope[1]?.type === 'event');
316316

317-
assertSentryTransaction(transaction[2], {
317+
assertSentryTransaction(transaction![2]!, {
318318
contexts: {
319319
trace: {
320320
op: 'http.server',
@@ -328,7 +328,7 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
328328
transaction: `routes/action-json-response${useV2 ? '.' : '/'}$id`,
329329
});
330330

331-
assertSentryEvent(event[2], {
331+
assertSentryEvent(event![2]!, {
332332
transaction: expect.stringMatching(/routes\/action-json-response(\/|\.)\$id/),
333333
exception: {
334334
values: [
@@ -363,7 +363,7 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
363363
const [transaction] = envelopes.filter(envelope => envelope[1]?.type === 'transaction');
364364
const [event] = envelopes.filter(envelope => envelope[1]?.type === 'event');
365365

366-
assertSentryTransaction(transaction[2], {
366+
assertSentryTransaction(transaction![2]!, {
367367
contexts: {
368368
trace: {
369369
op: 'http.server',
@@ -377,7 +377,7 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
377377
transaction: `routes/action-json-response${useV2 ? '.' : '/'}$id`,
378378
});
379379

380-
assertSentryEvent(event[2], {
380+
assertSentryEvent(event![2]!, {
381381
transaction: expect.stringMatching(/routes\/action-json-response(\/|\.)\$id/),
382382
exception: {
383383
values: [
@@ -412,7 +412,7 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
412412
const [transaction] = envelopes.filter(envelope => envelope[1]?.type === 'transaction');
413413
const [event] = envelopes.filter(envelope => envelope[1]?.type === 'event');
414414

415-
assertSentryTransaction(transaction[2], {
415+
assertSentryTransaction(transaction![2]!, {
416416
contexts: {
417417
trace: {
418418
op: 'http.server',
@@ -426,7 +426,7 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
426426
transaction: `routes/server-side-unexpected-errors${useV2 ? '.' : '/'}$id`,
427427
});
428428

429-
assertSentryEvent(event[2], {
429+
assertSentryEvent(event![2]!, {
430430
transaction: expect.stringMatching(/routes\/server-side-unexpected-errors(\/|\.)\$id/),
431431
exception: {
432432
values: [
@@ -461,7 +461,7 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
461461
const [transaction] = envelopes.filter(envelope => envelope[1]?.type === 'transaction');
462462
const [event] = envelopes.filter(envelope => envelope[1]?.type === 'event');
463463

464-
assertSentryTransaction(transaction[2], {
464+
assertSentryTransaction(transaction![2]!, {
465465
contexts: {
466466
trace: {
467467
op: 'http.server',
@@ -475,7 +475,7 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
475475
transaction: `routes/server-side-unexpected-errors${useV2 ? '.' : '/'}$id`,
476476
});
477477

478-
assertSentryEvent(event[2], {
478+
assertSentryEvent(event![2]!, {
479479
transaction: expect.stringMatching(/routes\/server-side-unexpected-errors(\/|\.)\$id/),
480480
exception: {
481481
values: [

‎packages/remix/test/integration/test/server/loader.test.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ describe.each(['builtin', 'express'])('Remix API Loaders with adapter = %s', ada
1313

1414
const envelopes = await env.getMultipleEnvelopeRequest({ url, count: 2, envelopeType: ['transaction', 'event'] });
1515

16-
const event = envelopes[0][2]?.type === 'transaction' ? envelopes[1][2] : envelopes[0][2];
17-
const transaction = envelopes[0][2]?.type === 'transaction' ? envelopes[0][2] : envelopes[1][2];
16+
const event = envelopes[0]?.[2]?.type === 'transaction' ? envelopes[1]?.[2] : envelopes[0]?.[2];
17+
const transaction = envelopes[0]?.[2]?.type === 'transaction' ? envelopes[0]?.[2] : envelopes[1]?.[2];
1818

19-
assertSentryTransaction(transaction, {
19+
assertSentryTransaction(transaction!, {
2020
contexts: {
2121
trace: {
2222
status: 'internal_error',
@@ -27,7 +27,7 @@ describe.each(['builtin', 'express'])('Remix API Loaders with adapter = %s', ada
2727
},
2828
});
2929

30-
assertSentryEvent(event, {
30+
assertSentryEvent(event!, {
3131
transaction: expect.stringMatching(/routes\/loader-json-response(\/|\.)\$id/),
3232
exception: {
3333
values: [
@@ -56,10 +56,10 @@ describe.each(['builtin', 'express'])('Remix API Loaders with adapter = %s', ada
5656
// but otherwise this may leak into another test
5757
const envelopes = await env.getMultipleEnvelopeRequest({ url, count: 2, envelopeType: ['event', 'transaction'] });
5858

59-
const event = envelopes[0][2]?.type === 'transaction' ? envelopes[1][2] : envelopes[0][2];
60-
const transaction = envelopes[0][2]?.type === 'transaction' ? envelopes[0][2] : envelopes[1][2];
59+
const event = envelopes[0]?.[2]?.type === 'transaction' ? envelopes[1]?.[2] : envelopes[0]?.[2];
60+
const transaction = envelopes[0]?.[2]?.type === 'transaction' ? envelopes[0]?.[2] : envelopes[1]?.[2];
6161

62-
assertSentryTransaction(transaction, {
62+
assertSentryTransaction(transaction!, {
6363
contexts: {
6464
trace: {
6565
status: 'internal_error',
@@ -70,7 +70,7 @@ describe.each(['builtin', 'express'])('Remix API Loaders with adapter = %s', ada
7070
},
7171
});
7272

73-
assertSentryEvent(event, {
73+
assertSentryEvent(event!, {
7474
transaction: expect.stringMatching(/routes\/loader-throw-response(\/|\.)\$id/),
7575
exception: {
7676
values: [
@@ -132,7 +132,7 @@ describe.each(['builtin', 'express'])('Remix API Loaders with adapter = %s', ada
132132
const [transaction_1, transaction_2] = envelopes.filter(envelope => envelope[1]?.type === 'transaction');
133133
const [event] = envelopes.filter(envelope => envelope[1]?.type === 'event');
134134

135-
assertSentryTransaction(transaction_1[2], {
135+
assertSentryTransaction(transaction_1![2]!, {
136136
contexts: {
137137
trace: {
138138
op: 'http.server',
@@ -146,7 +146,7 @@ describe.each(['builtin', 'express'])('Remix API Loaders with adapter = %s', ada
146146
transaction: `routes/loader-json-response${useV2 ? '.' : '/'}$id`,
147147
});
148148

149-
assertSentryTransaction(transaction_2[2], {
149+
assertSentryTransaction(transaction_2![2]!, {
150150
contexts: {
151151
trace: {
152152
op: 'http.server',
@@ -160,7 +160,7 @@ describe.each(['builtin', 'express'])('Remix API Loaders with adapter = %s', ada
160160
transaction: `routes/loader-json-response${useV2 ? '.' : '/'}$id`,
161161
});
162162

163-
assertSentryEvent(event[2], {
163+
assertSentryEvent(event![2]!, {
164164
transaction: expect.stringMatching(/routes\/loader-json-response(\/|\.)\$id/),
165165
exception: {
166166
values: [
@@ -198,7 +198,7 @@ describe.each(['builtin', 'express'])('Remix API Loaders with adapter = %s', ada
198198
const customTagArr = Object.keys(tags).filter(t => t.startsWith('tag'));
199199
expect(customTagArr).toHaveLength(1);
200200

201-
const key = customTagArr[0];
201+
const key = customTagArr[0]!;
202202
const val = key[key.length - 1];
203203
expect(tags[key]).toEqual(val);
204204
});
@@ -221,7 +221,7 @@ describe.each(['builtin', 'express'])('Remix API Loaders with adapter = %s', ada
221221
trace_id: '12312012123120121231201212312012',
222222
});
223223

224-
assertSentryTransaction(envelope[2], {
224+
assertSentryTransaction(envelope![2]!, {
225225
contexts: {
226226
trace: {
227227
trace_id: '12312012123120121231201212312012',

0 commit comments

Comments
 (0)