Merge pull request #24579 from mshima/node-20

[internal] Use the quibble for dependency mock in tests

.github/actions/build-matrix/action.yml

@@ -88,9 +88,9 @@ outputs:
 runs:
   using: 'composite'
   steps:
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v4
       with:
-        node-version: 18
+        node-version: 18.19.0
     - name: 'Check changes'
       id: build-changes
       run: |

.github/actions/setup-default-node-java/action.yml

@@ -24,7 +24,7 @@ runs:
   steps:
     - uses: actions/setup-node@v4
       with:
-        node-version: 18
+        node-version: 18.19.0
     - uses: actions/setup-java@v3
       with:
         distribution: 'temurin'

.github/workflows/generator.yml

@@ -46,7 +46,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 18.18.2
+          node-version: 18.19.0
       - name: 'SETUP: load npm cache'
         uses: actions/cache/restore@v3
         with:

.github/workflows/lock-maintenance.yml

@@ -37,7 +37,7 @@ jobs:
     steps:
       - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
       - run: npm install -g npm@latest
       - uses: actions/checkout@v4
       - uses: jhipster/actions/restore-cache@v0

.mocharc.cjs

@@ -1,3 +1,11 @@
+const Module = require('module');
+const process = require('process');
+
+if (!Module.register) {
+  console.log('JHipster test requires node >=18.19.0 || >= 20.6.0\n');
+  process.exit(1);
+}
+
 module.exports = {
   recursive: true,
   reporter: 'spec',

cli/cli.spec.mts

@@ -3,26 +3,16 @@ import assert from 'assert';
 import { fork } from 'child_process';
 import { join, dirname } from 'path';
 import { fileURLToPath } from 'url';
-import { before, it, describe, expect, mock, resetAllMocks, esmocha } from 'esmocha';
+import { after, before, it, describe, expect, resetAllMocks, esmocha } from 'esmocha';
 import { execaCommandSync } from 'execa';
 import { BaseEnvironment } from '@yeoman/types';
 import { coerce } from 'semver';
-import { defaultHelpers as helpers, createBlueprintFiles } from '../test/support/index.js';
+import quibble from 'quibble';
 
+import { defaultHelpers as helpers, createBlueprintFiles } from '../test/support/index.js';
 import { getCommand as actualGetCommonand } from './utils.mjs';
 import { createProgram } from './program.mjs';
 
-const { logger, getCommand } = await mock<typeof import('./utils.mjs')>('./utils.mjs');
-const { buildJHipster } = await import('./program.mjs');
-
-const __filename = fileURLToPath(import.meta.url);
-const jhipsterCli = join(dirname(__filename), '..', 'bin', 'jhipster.cjs');
-
-const mockCli = async (argv: string[], opts = {}) => {
-  const program = await buildJHipster({ printLogo: () => {}, ...opts, program: createProgram(), loadCommand: key => opts[`./${key}`] });
-  return program.parseAsync(argv);
-};
-
 const cliBlueprintFiles = {
   'cli/commands.js': `export default {
   foo: {
@@ -97,7 +87,26 @@ const cliSharedBlueprintFiles = {
 };
 
 describe('cli', () => {
+  const __filename = fileURLToPath(import.meta.url);
+  const jhipsterCli = join(dirname(__filename), '..', 'bin', 'jhipster.cjs');
+  const logger = { verboseInfo: esmocha.fn(), fatal: esmocha.fn(), debug: esmocha.fn() };
+  const getCommand = esmocha.fn();
+  let mockCli;
   let argv;
+
+  before(async () => {
+    await quibble.esm('./utils.mjs', { logger, getCommand, CLI_NAME: 'jhipster', done: () => {} });
+    const { buildJHipster } = await import('./program.mjs');
+
+    mockCli = async (argv: string[], opts = {}) => {
+      const program = await buildJHipster({ printLogo: () => {}, ...opts, program: createProgram(), loadCommand: key => opts[`./${key}`] });
+      return program.parseAsync(argv);
+    };
+  });
+  after(() => {
+    quibble.reset();
+  });
+
   beforeEach(async () => {
     await helpers.prepareTemporaryDir();
   });

generators/java/support/checks/check-java.spec.ts

@@ -1,7 +1,8 @@
-import { before, it, describe, expect, mock, resetAllMocks } from 'esmocha';
+import { after, before, it, describe, expect, resetAllMocks, esmocha } from 'esmocha';
 import { ExecaSyncReturnValue } from 'execa';
+import quibble from 'quibble';
 
-const execa = await mock<typeof import('execa')>('execa');
+const execa = { execa: esmocha.fn(), execaSync: esmocha.fn(), execaCommandSync: esmocha.fn(), execaCommand: esmocha.fn() };
 
 const baseResult: ExecaSyncReturnValue<string> = {
   command: 'java',
@@ -15,6 +16,13 @@ const baseResult: ExecaSyncReturnValue<string> = {
 };
 
 describe('generator - server - checkJava', () => {
+  before(async () => {
+    await quibble.esm('execa', execa);
+  });
+  after(() => {
+    quibble.reset();
+  });
+
   afterEach(() => {
     resetAllMocks();
   });

package.json

@@ -188,6 +188,7 @@
     "octokit": "3.1.2",
     "open-cli": "7.2.0",
     "prettier2": "npm:[email protected]",
+    "quibble": "0.9.1",
     "rimraf": "5.0.5",
     "sinon": "17.0.1",
     "sinon-chai": "3.7.0",