Switch from --sort in tests to preserving glob@8 sorting

mochajs · Nov 13, 2024 · bd50141 · bd50141
1 parent 6b5ff68
commit bd50141
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/lib/cli/lookup-files.js b/lib/cli/lookup-files.js
@@ -87,10 +87,15 @@ module.exports = function lookupFiles(
       debug('looking for files using glob pattern: %s', pattern);
     }
     files.push(
-      ...glob.sync(pattern, {
-        nodir: true,
-        windowsPathsNoEscape: true
-      })
+      ...glob
+        .sync(pattern, {
+          nodir: true,
+          windowsPathsNoEscape: true
+        })
+        // glob@8 and earlier sorted results in en; glob@9 depends on OS sorting.
+        // This preserves the older glob behavior.
+        // https://github.com/mochajs/mocha/pull/5250
+        .sort((a, b) => a.localeCompare(b, 'en'))
     );
     if (!files.length) {
       throw createNoFilesMatchPatternError(

diff --git a/test/integration/options/parallel.spec.js b/test/integration/options/parallel.spec.js
@@ -92,7 +92,6 @@ describe('--parallel', function () {
     it('should have the same result as with --no-parallel', async function () {
       const expected = await runMochaAsync('options/parallel/test-*', [
         '--no-parallel',
-        '--sort'
       ]);
       return expect(
         runMochaAsync('options/parallel/test-*', ['--parallel']),
@@ -303,7 +302,6 @@ describe('--parallel', function () {
               '--reporter',
               reporter,
               '--no-parallel',
-              '--sort'
             ]);
             return expect(
               runMochaAsync('options/parallel/test-*', [