feat: teste cases

Author: YuriSS

README.md

@@ -135,10 +135,11 @@ import-conductor -p @customA @customB
 import-conductor --separator '' ==> no separator
 ```
 
-- `groupOrder` - The order imports will be organized: (defaults to `[thirdParty, userLibrary, differentModule, sameModule]`)
+- `groupOrder` - The group order to follow: (defaults to `[thirdParty, userLibrary, differentModule, sameModule]`)
 
 ```shell script
 import-conductor --groupOrder 'userLibrary' 'differentModule' 'sameModule' 'thirdParty'
+import-conductor -g 'userLibrary' 'differentModule' 'sameModule' 'thirdParty'
 ```
 
 - `staged` - Run against staged files: (defaults to `false`)

__tests__/optimize-imports-mocks.ts

@@ -1,4 +1,4 @@
-export type TestCase = { input: string; expected: string; noOfRuns?: number };
+export type TestCase = { input: string; expected: string; noOfRuns?: number; groupOrder?: string[] };
 
 export const readmeExample: TestCase = {
   input: `import fs from 'fs';
@@ -116,3 +116,38 @@ export const noImportStatement: TestCase = {
   input: `const x = 2;`,
   expected: `const x = 2;`,
 };
+
+export const importsOnDifferentGroupOrder: TestCase = {
+  groupOrder: ['userLibrary', 'sameModule', 'differentModule', 'thirdParty'],
+  input: `import { Component } from '@angular/core';
+import fs from 'fs';
+import { LoggerService } from '@myorg/logger';
+import { Order } from '../order/order.model';
+import { CustomService } from './customer.service';`,
+  expected: `import { LoggerService } from '@myorg/logger';
+import { CustomService } from './customer.service';
+import { Order } from '../order/order.model';
+import { Component } from '@angular/core';
+import fs from 'fs';`,
+};
+
+export const importsWithGroupOrderIncorrect: TestCase = {
+  groupOrder: ['userLibrary', 'differentModule', 'thirdParty'],
+  input: `import fs from 'fs';
+import { CustomerService } from './customer.service';
+import { Order } from '../order/order.model';
+import { Component, OnInit } from '@angular/core';
+import { LoggerService } from '@myorg/logger';
+import { Observable } from 'rxjs';
+import { spawn } from 'child_process';`,
+  expected: `import { Component, OnInit } from '@angular/core';
+import { spawn } from 'child_process';
+import fs from 'fs';
+import { Observable } from 'rxjs';
+
+import { LoggerService } from '@myorg/logger';
+
+import { Order } from '../order/order.model';
+
+import { CustomerService } from './customer.service';`,
+};

__tests__/optimize-imports.spec.ts

@@ -2,8 +2,18 @@ import { actions, organizeImports, organizeImportsForFile } from '@ic/conductor/
 import * as config from '@ic/config';
 import fs from 'fs';
 import { Config } from '@ic/types';
-import { readmeExample, comments, TestCase, codeBetweenImports, emptyNewLineSeparator, noImportStatement } from './optimize-imports-mocks';
+import {
+  readmeExample,
+  comments,
+  TestCase,
+  codeBetweenImports,
+  emptyNewLineSeparator,
+  noImportStatement,
+  importsOnDifferentGroupOrder,
+  importsWithGroupOrderIncorrect,
+} from './optimize-imports-mocks';
 import { defaultConfig } from '@ic/defaultConfig';
+import { getGroupOrder } from '@ic/conductor/get-group-order';
 
 jest.mock('fs');
 jest.mock('simple-git');
@@ -80,4 +90,14 @@ describe('optimizeImports', () => {
     expect(result).toBe(actions.none);
     expect(fs.writeFileSync).not.toHaveBeenCalled();
   });
+
+  it('should change group order', async () => {
+    spy.and.returnValue({ ...basicConfig, groupOrder: importsOnDifferentGroupOrder.groupOrder, separator: '' });
+    await assertConductor(importsOnDifferentGroupOrder);
+  });
+
+  it('should use default order because incorrect group order input', async () => {
+    spy.and.returnValue({ ...basicConfig, groupOrder: getGroupOrder({ groupOrder: importsWithGroupOrderIncorrect.groupOrder }) });
+    await assertConductor(importsWithGroupOrderIncorrect);
+  });
 });

src/conductor/get-group-order.ts

@@ -4,7 +4,7 @@ import { Config } from '../types';
 export function getGroupOrder(config: Partial<Config>) {
   const groups = new Set(config?.groupOrder || []);
   const uniqueGroups = Array.from(groups);
-  return !isValidGroupArgument(uniqueGroups) ? defaultConfig.groupOrder : uniqueGroups;
+  return isValidGroupArgument(uniqueGroups) ? uniqueGroups : defaultConfig.groupOrder;
 }
 
 function isValidGroupArgument(groups: string[]): boolean {