Skip to content

Commit b4ac372

Browse files
AdrianGonz97AdrianGonz97
committed
fix types of other tests
1 parent d9c74d4 commit b4ac372

5 files changed

Lines changed: 29 additions & 1 deletion

‎src/utils/__tests__/assemble-updated-code.spec.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ test('it should remove nodes from the original code', async () => {
2929
importOrderSortSpecifiers: false,
3030
importOrderSideEffects: true,
3131
importOrderSortByLength: null,
32+
importOrderCombineImportSpecifiers: false,
3233
});
3334
const allCommentsFromImports = getAllCommentsFromNodes(sortedNodes);
3435

@@ -57,6 +58,7 @@ test('it should inject the generated code at the correct location', async () =>
5758
importOrderSortSpecifiers: false,
5859
importOrderSideEffects: true,
5960
importOrderSortByLength: null,
61+
importOrderCombineImportSpecifiers: false,
6062
});
6163
const allCommentsFromImports = getAllCommentsFromNodes(sortedNodes);
6264

‎src/utils/__tests__/get-all-comments-from-nodes.spec.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ const getSortedImportNodes = (code: string, options?: ParserOptions) => {
1717
importOrderSortSpecifiers: false,
1818
importOrderSortByLength: null,
1919
importOrderSideEffects: true,
20+
importOrderCombineImportSpecifiers: false,
2021
});
2122
};
2223

‎src/utils/__tests__/get-code-from-ast.spec.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ import a from 'a';
2424
importOrderSortSpecifiers: false,
2525
importOrderSortByLength: null,
2626
importOrderSideEffects: true,
27+
importOrderCombineImportSpecifiers: false,
2728
});
28-
const formatted = getCodeFromAst(sortedNodes, code);
29+
const formatted = getCodeFromAst(importNodes, code, sortedNodes);
2930
expect(await format(formatted, { parser: 'babel' })).toEqual(
3031
`// first comment
3132
// second comment

‎src/utils/__tests__/get-sorted-nodes-by-import-order.spec.ts‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ test('it returns all sorted nodes', () => {
3333
importOrderSortSpecifiers: false,
3434
importOrderSortByLength: null,
3535
importOrderSideEffects: true,
36+
importOrderCombineImportSpecifiers: false,
3637
}) as ImportDeclaration[];
3738

3839
expect(getSortedNodesNames(sorted)).toEqual([
@@ -79,6 +80,7 @@ test('it returns all sorted nodes case-insensitive', () => {
7980
importOrderSortSpecifiers: false,
8081
importOrderSortByLength: null,
8182
importOrderSideEffects: true,
83+
importOrderCombineImportSpecifiers: false,
8284
}) as ImportDeclaration[];
8385

8486
expect(getSortedNodesNames(sorted)).toEqual([
@@ -125,6 +127,7 @@ test('it returns all sorted nodes with sort order', () => {
125127
importOrderSortSpecifiers: false,
126128
importOrderSortByLength: null,
127129
importOrderSideEffects: true,
130+
importOrderCombineImportSpecifiers: false,
128131
}) as ImportDeclaration[];
129132

130133
expect(getSortedNodesNames(sorted)).toEqual([
@@ -171,6 +174,7 @@ test('it returns all sorted nodes with sort order case-insensitive', () => {
171174
importOrderSortSpecifiers: false,
172175
importOrderSortByLength: null,
173176
importOrderSideEffects: true,
177+
importOrderCombineImportSpecifiers: false,
174178
}) as ImportDeclaration[];
175179
expect(getSortedNodesNames(sorted)).toEqual([
176180
'c',
@@ -216,6 +220,7 @@ test('it returns all sorted import nodes with sorted import specifiers', () => {
216220
importOrderSortSpecifiers: true,
217221
importOrderSortByLength: null,
218222
importOrderSideEffects: true,
223+
importOrderCombineImportSpecifiers: false,
219224
}) as ImportDeclaration[];
220225
expect(getSortedNodesNames(sorted)).toEqual([
221226
'XY',
@@ -261,6 +266,7 @@ test('it returns all sorted import nodes with sorted import specifiers with case
261266
importOrderSortSpecifiers: true,
262267
importOrderSortByLength: null,
263268
importOrderSideEffects: true,
269+
importOrderCombineImportSpecifiers: false,
264270
}) as ImportDeclaration[];
265271
expect(getSortedNodesNames(sorted)).toEqual([
266272
'c',
@@ -306,6 +312,7 @@ test('it returns all sorted nodes with custom third party modules', () => {
306312
importOrderSortSpecifiers: false,
307313
importOrderSortByLength: null,
308314
importOrderSideEffects: true,
315+
importOrderCombineImportSpecifiers: false,
309316
}) as ImportDeclaration[];
310317
expect(getSortedNodesNames(sorted)).toEqual([
311318
'a',
@@ -332,6 +339,7 @@ test('it returns all sorted nodes with namespace specifiers at the top', () => {
332339
importOrderSortSpecifiers: false,
333340
importOrderSortByLength: null,
334341
importOrderSideEffects: true,
342+
importOrderCombineImportSpecifiers: false,
335343
}) as ImportDeclaration[];
336344

337345
expect(getSortedNodesNames(sorted)).toEqual([
@@ -367,6 +375,7 @@ test('it returns the default separations if `importOrderSeparation` is false', (
367375
importOrderSortSpecifiers: false,
368376
importOrderSideEffects: true,
369377
importOrderSortByLength: null,
378+
importOrderCombineImportSpecifiers: false,
370379
});
371380
expect(getSeparationData(sorted)).toEqual([
372381
{ type: 'ImportDeclaration', value: 'XY' },
@@ -394,6 +403,7 @@ test('it returns default import module separations', () => {
394403
importOrderSortSpecifiers: false,
395404
importOrderSideEffects: true,
396405
importOrderSortByLength: null,
406+
importOrderCombineImportSpecifiers: false,
397407
});
398408
expect(getSeparationData(sorted)).toEqual([
399409
{ type: 'ImportDeclaration', value: 'XY' },
@@ -426,6 +436,7 @@ test('it returns targeted import module separations', () => {
426436
importOrderSortSpecifiers: false,
427437
importOrderSideEffects: true,
428438
importOrderSortByLength: null,
439+
importOrderCombineImportSpecifiers: false,
429440
});
430441
expect(getSeparationData(sorted)).toEqual([
431442
{ type: 'ImportDeclaration', value: 'XY' },
@@ -459,6 +470,7 @@ test('it never returns a separation at the top of the list (leading separator)',
459470
importOrderSortSpecifiers: false,
460471
importOrderSideEffects: true,
461472
importOrderSortByLength: null,
473+
importOrderCombineImportSpecifiers: false,
462474
});
463475
expect(getSeparationData(sorted)).toEqual([
464476
{ type: 'ImportDeclaration', value: './test' },
@@ -480,6 +492,7 @@ test('it never returns a separation at the top of the list (zero preceding impor
480492
importOrderSortSpecifiers: false,
481493
importOrderSideEffects: true,
482494
importOrderSortByLength: null,
495+
importOrderCombineImportSpecifiers: false,
483496
});
484497
expect(getSeparationData(sorted)).toEqual([
485498
{ type: 'ImportDeclaration', value: './test' },

‎src/utils/__tests__/get-sorted-nodes.spec.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ test('it returns all sorted nodes', () => {
4949
importOrderSortSpecifiers: false,
5050
importOrderSortByLength: null,
5151
importOrderSideEffects: true,
52+
importOrderCombineImportSpecifiers: false,
5253
}) as ImportDeclaration[];
5354

5455
expect(getSortedNodesNames(sorted)).toEqual([
@@ -95,6 +96,7 @@ test('it returns all sorted nodes case-insensitive', () => {
9596
importOrderSortSpecifiers: false,
9697
importOrderSortByLength: null,
9798
importOrderSideEffects: true,
99+
importOrderCombineImportSpecifiers: false,
98100
}) as ImportDeclaration[];
99101

100102
expect(getSortedNodesNames(sorted)).toEqual([
@@ -141,6 +143,7 @@ test('it returns all sorted nodes with sort order', () => {
141143
importOrderSortSpecifiers: false,
142144
importOrderSortByLength: null,
143145
importOrderSideEffects: true,
146+
importOrderCombineImportSpecifiers: false,
144147
}) as ImportDeclaration[];
145148

146149
expect(getSortedNodesNames(sorted)).toEqual([
@@ -187,6 +190,7 @@ test('it returns all sorted nodes with sort order case-insensitive', () => {
187190
importOrderSortSpecifiers: false,
188191
importOrderSortByLength: null,
189192
importOrderSideEffects: true,
193+
importOrderCombineImportSpecifiers: false,
190194
}) as ImportDeclaration[];
191195
expect(getSortedNodesNames(sorted)).toEqual([
192196
'c',
@@ -232,6 +236,7 @@ test('it returns all sorted import nodes with sorted import specifiers', () => {
232236
importOrderSortSpecifiers: true,
233237
importOrderSortByLength: null,
234238
importOrderSideEffects: true,
239+
importOrderCombineImportSpecifiers: false,
235240
}) as ImportDeclaration[];
236241
expect(getSortedNodesNames(sorted)).toEqual([
237242
'XY',
@@ -277,6 +282,7 @@ test('it returns all sorted import nodes with sorted import specifiers with case
277282
importOrderSortSpecifiers: true,
278283
importOrderSortByLength: null,
279284
importOrderSideEffects: true,
285+
importOrderCombineImportSpecifiers: false,
280286
}) as ImportDeclaration[];
281287
expect(getSortedNodesNames(sorted)).toEqual([
282288
'c',
@@ -322,6 +328,7 @@ test('it returns all sorted nodes with custom third party modules', () => {
322328
importOrderSortSpecifiers: false,
323329
importOrderSortByLength: null,
324330
importOrderSideEffects: true,
331+
importOrderCombineImportSpecifiers: false,
325332
}) as ImportDeclaration[];
326333
expect(getSortedNodesNames(sorted)).toEqual([
327334
'a',
@@ -348,6 +355,7 @@ test('it returns all sorted nodes with namespace specifiers at the top', () => {
348355
importOrderSortSpecifiers: false,
349356
importOrderSortByLength: null,
350357
importOrderSideEffects: true,
358+
importOrderCombineImportSpecifiers: false,
351359
}) as ImportDeclaration[];
352360

353361
expect(getSortedNodesNames(sorted)).toEqual([
@@ -375,6 +383,7 @@ test('it returns all sorted nodes, sorted shortest to longest', () => {
375383
importOrderSortSpecifiers: false,
376384
importOrderSideEffects: true,
377385
importOrderSortByLength: 'asc',
386+
importOrderCombineImportSpecifiers: false,
378387
}) as ImportDeclaration[];
379388
expect(getSortedNodesNames(sorted)).toEqual([
380389
'g',
@@ -401,6 +410,7 @@ test('it returns all sorted nodes, sorted longest to shortest', () => {
401410
importOrderSortSpecifiers: false,
402411
importOrderSideEffects: false,
403412
importOrderSortByLength: 'desc',
413+
importOrderCombineImportSpecifiers: false,
404414
}) as ImportDeclaration[];
405415
expect(getSortedNodesNames(sorted)).toEqual([
406416
't',
@@ -429,6 +439,7 @@ test('it returns all sorted nodes with types', () => {
429439
importOrderSortSpecifiers: false,
430440
importOrderSideEffects: true,
431441
importOrderSortByLength: null,
442+
importOrderCombineImportSpecifiers: false,
432443
}) as ImportDeclaration[];
433444

434445
expect(getSortedNodesNames(sorted)).toEqual([

0 commit comments

Comments
 (0)