feat(scripts): sort subscripts of the test suites

Author: travi

src/package/scripts/script-comparator.js

@@ -17,8 +17,8 @@ function getBaseScriptOf(script) {
 function getCategoryOrder(base) {
   if ('test' === base) return 0;
   if (base.startsWith('lint:')) return 1;
-  if ('test:unit' === base) return 2;
-  if ('test:integration' === base) return 3;
+  if (base.startsWith('test:unit')) return 2;
+  if (base.startsWith('test:integration')) return 3;
   if (base.startsWith('test:')) return 2;
 
   return 4;
@@ -36,5 +36,8 @@ export default function compareScriptNames(a, b) {
   const categoryDiff = getCategoryOrder(aBase) - getCategoryOrder(bBase);
   if (0 !== categoryDiff) return 0 > categoryDiff ? -1 : 1;
 
+  const baseCompare = aBase.localeCompare(bBase);
+  if (0 !== baseCompare) return 0 > baseCompare ? -1 : 1;
+
   return a.localeCompare(b);
 }

src/package/scripts/script-comparator.test.js

@@ -80,6 +80,24 @@ describe('script name comparator', () => {
     expect(compareScriptNames('test:integration', 'test:unit')).toEqual(A_AFTER_B);
   });
 
+  it('should sort `test:unit` sub-scripts after `test:unit`', async () => {
+    expect(compareScriptNames('test:unit', 'test:unit:base')).toEqual(A_BEFORE_B);
+    expect(compareScriptNames('test:unit:base', 'test:unit')).toEqual(A_AFTER_B);
+  });
+
+  it('should sort `test:integration` sub-scripts after `test:integration`', async () => {
+    expect(compareScriptNames('test:integration', 'test:integration:base')).toEqual(A_BEFORE_B);
+    expect(compareScriptNames('test:integration:base', 'test:integration')).toEqual(A_AFTER_B);
+
+    expect(compareScriptNames('test:integration', 'pretest:integration:base')).toEqual(A_BEFORE_B);
+    expect(compareScriptNames('pretest:integration:base', 'test:integration')).toEqual(A_AFTER_B);
+  });
+
+  it('should sort `test:unit` sub-scripts ahead of `test:integration`', async () => {
+    expect(compareScriptNames('test:unit:base', 'test:integration')).toEqual(A_BEFORE_B);
+    expect(compareScriptNames('test:integration', 'test:unit:base')).toEqual(A_AFTER_B);
+  });
+
   it('should sort uncategorized scripts below `test:` scripts', async () => {
     expect(compareScriptNames(any.word(), `test:${any.word()}`)).toEqual(A_AFTER_B);
     expect(compareScriptNames(`test:${any.word()}`, any.word())).toEqual(A_BEFORE_B);

test/integration/features/step_definitions/scripts-steps.js

@@ -9,6 +9,14 @@ Before(function () {
     test: any.string(),
     'lint:md': any.string(),
     prepare: any.string(),
+    'pretest:integration:base': any.string(),
+    'test:unit:base': any.string(),
+    'test:integration:base': any.string(),
+    'test:integration:debug': any.string(),
+    'test:integration:focus': any.string(),
+    'test:integration:focus:debug': any.string(),
+    'test:integration:wip': any.string(),
+    'test:integration:wip:debug': any.string(),
     'test:unit': any.string(),
     pretest: any.string(),
     'prelint:publish': 'run-s build',
@@ -80,6 +88,14 @@ Then('the scripts are ordered correctly', async function () {
     test,
     'test:unit': testUnit,
     'test:integration': testIntegration,
+    'pretest:integration:base': pretestIntegrationBase,
+    'test:integration:base': testIntegrationBase,
+    'test:integration:debug': testIntegrationDebug,
+    'test:integration:focus': testIntegrationFocus,
+    'test:unit:base': testUnitBase,
+    'test:integration:focus:debug': testIntegrationFocusDebug,
+    'test:integration:wip': testIntegrationWip,
+    'test:integration:wip:debug': testIntegrationWipDebug,
     'prelint:publish': prelintPublish,
     'lint:md': lintMd,
     ...otherExistingScripts
@@ -95,7 +111,15 @@ Then('the scripts are ordered correctly', async function () {
       'prelint:publish',
       'lint:publish',
       'test:unit',
+      'test:unit:base',
       'test:integration',
+      'pretest:integration:base',
+      'test:integration:base',
+      'test:integration:debug',
+      'test:integration:focus',
+      'test:integration:focus:debug',
+      'test:integration:wip',
+      'test:integration:wip:debug',
       ...Object.keys(otherExistingScripts).sort((a, b) => a.localeCompare(b))
     ]
   );