Merge pull request #20549 from mshima/skip_ci-mocking

switch from proxyquire to @node-loaders/mock

.mocharc.cjs

@@ -1,6 +1,6 @@
 const { pathToFileURL } = require('url');
 
-const loaderPath = require.resolve('@node-loaders/esbuild/strict');
+const loaderPath = require.resolve('@node-loaders/auto/strict');
 const loaderUrl = pathToFileURL(loaderPath).href;
 
 module.exports = {

package.json

@@ -124,7 +124,9 @@
     "yeoman-generator": "5.7.0"
   },
   "devDependencies": {
-    "@node-loaders/esbuild": "0.5.1",
+    "@node-loaders/auto": "0.6.0",
+    "@node-loaders/esbuild": "0.6.0",
+    "@node-loaders/mock": "0.7.0",
     "@types/chai": "4.3.4",
     "@types/mocha": "10.0.0",
     "@types/sinon-chai": "3.2.9",
@@ -147,7 +149,6 @@
     "jsdoc": "4.0.0",
     "mocha": "10.1.0",
     "mocha-expect-snapshot": "6.2.0",
-    "proxyquire": "2.1.3",
     "rimraf": "3.0.2",
     "sinon": "15.0.0",
     "sinon-chai": "3.7.0",

test/cli/import-jdl.spec.cjs

@@ -1,5 +1,5 @@
+const { mockRequire } = require('@node-loaders/mock/require');
 const path = require('path');
-const proxyquire = require('proxyquire');
 const fse = require('fs-extra');
 const assert = require('yeoman-assert');
 const expect = require('chai').expect;
@@ -76,7 +76,7 @@ const loadImportJdl = options => {
     },
     ...options,
   };
-  return proxyquire('../../cli/import-jdl.cjs', options);
+  return mockRequire('../../cli/import-jdl.cjs', options);
 };
 
 const defaultAddedOptions = {};

test/cli/jdl.spec.cjs

@@ -4,7 +4,7 @@ const assert = require('yeoman-assert');
 const expect = require('chai').expect;
 const https = require('https');
 const fse = require('fs-extra');
-const proxyquire = require('proxyquire').noCallThru().noPreserveCache();
+const { mockRequire } = require('@node-loaders/mock/require');
 const sinon = require('sinon');
 
 const { testInTempDir, revertTempDir } = require('./utils/utils.cjs');
@@ -95,7 +95,7 @@ describe('jdl command test', () => {
       const env = { env: 'foo' };
       const fork = { fork: 'foo' };
       beforeEach(() => {
-        return proxyquire('../../cli/jdl.cjs', { './import-jdl.cjs': importJdlStub })([['foo.jdl']], options, env, fork).then(jdlFiles => {
+        return mockRequire('../../cli/jdl.cjs', { './import-jdl.cjs': importJdlStub })([['foo.jdl']], options, env, fork).then(jdlFiles => {
           resolved = jdlFiles;
         });
       });
@@ -119,7 +119,7 @@ describe('jdl command test', () => {
       const env = { env: 'foo' };
       const fork = { fork: 'foo' };
       beforeEach(() => {
-        return proxyquire('../../cli/jdl.cjs', { './import-jdl.cjs': importJdlStub })([['foo.jdl', 'bar.jdl']], options, env, fork);
+        return mockRequire('../../cli/jdl.cjs', { './import-jdl.cjs': importJdlStub })([['foo.jdl', 'bar.jdl']], options, env, fork);
       });
       it('should not call https.get', () => {
         expect(https.get.callCount).to.be.equal(0);
@@ -139,7 +139,7 @@ describe('jdl command test', () => {
           https.get.restore();
         });
         it('should return file not found', () => {
-          return proxyquire('../../cli/jdl.cjs', {})(
+          return mockRequire('../../cli/jdl.cjs', {})(
             [['foo.jdl']],
             { bar: 'foo', skipSampleRepository: true },
             { env: 'foo' },
@@ -172,7 +172,7 @@ describe('jdl command test', () => {
           https.get.restore();
         });
         it('should call https.get', () => {
-          return proxyquire('../../cli/jdl.cjs', { './import-jdl.cjs': importJdlStub })(
+          return mockRequire('../../cli/jdl.cjs', { './import-jdl.cjs': importJdlStub })(
             [['https://raw.githubusercontent.com/jhipster/jdl-samples/main/foo.jdl']],
             { bar: 'foo', skipSampleRepository: true },
             { env: 'foo' },
@@ -183,7 +183,7 @@ describe('jdl command test', () => {
           });
         });
         it('should call importJdl', () => {
-          return proxyquire('../../cli/jdl.cjs', { './import-jdl.cjs': importJdlStub })(
+          return mockRequire('../../cli/jdl.cjs', { './import-jdl.cjs': importJdlStub })(
             [['https://raw.githubusercontent.com/jhipster/jdl-samples/main/foo.jdl']],
             { bar: 'foo', skipSampleRepository: true },
             { env: 'foo' },
@@ -226,9 +226,11 @@ describe('jdl command test', () => {
         const env = { env: 'foo' };
         const fork = { fork: 'foo' };
         beforeEach(() => {
-          return proxyquire('../../cli/jdl.cjs', { './import-jdl.cjs': importJdlStub })([['foo.jh']], options, env, fork).then(jdlFiles => {
-            resolved = jdlFiles;
-          });
+          return mockRequire('../../cli/jdl.cjs', { './import-jdl.cjs': importJdlStub })([['foo.jh']], options, env, fork).then(
+            jdlFiles => {
+              resolved = jdlFiles;
+            }
+          );
         });
         it('should pass to https.get with jdl-sample repository', () => {
           expect(https.get.getCall(0).args[0]).to.be.equal(
@@ -254,7 +256,7 @@ describe('jdl command test', () => {
 
       describe('when passing foo', () => {
         beforeEach(() => {
-          return proxyquire('../../cli/jdl.cjs', { './import-jdl.cjs': importJdlStub })([['foo']]);
+          return mockRequire('../../cli/jdl.cjs', { './import-jdl.cjs': importJdlStub })([['foo']]);
         });
         it('should append jdl extension and pass to https.get with jdl-sample repository', () => {
           expect(https.get.getCall(0).args[0]).to.be.equal(
@@ -273,7 +275,7 @@ describe('jdl command test', () => {
       describe('with a complete url', () => {
         const url = 'https://raw.githubusercontent.com/jhipster/jdl-samples/main/bar.jdl';
         beforeEach(() => {
-          return proxyquire('../../cli/jdl.cjs', { './import-jdl.cjs': importJdlStub })([[url]]);
+          return mockRequire('../../cli/jdl.cjs', { './import-jdl.cjs': importJdlStub })([[url]]);
         });
         it('should forward the url to get', () => {
           expect(https.get.getCall(0).args[0]).to.be.equal(url);
@@ -306,14 +308,14 @@ describe('jdl command test', () => {
         });
 
         it('should not create the destination file', done => {
-          proxyquire('../../cli/jdl.cjs', { './import-jdl.cjs': () => {} })([['foo.jh']]).catch(error => {
+          mockRequire('../../cli/jdl.cjs', { './import-jdl.cjs': () => {} })([['foo.jh']]).catch(error => {
             assert.noFile('foo.jh');
             done();
           });
         });
 
         it('should print error message', done => {
-          proxyquire('../../cli/jdl.cjs', { './import-jdl.cjs': () => {} })([['foo.jh']]).catch(error => {
+          mockRequire('../../cli/jdl.cjs', { './import-jdl.cjs': () => {} })([['foo.jh']]).catch(error => {
             assert.equal(
               error.message,
               'Error downloading https://raw.githubusercontent.com/jhipster/jdl-samples/main/foo.jh: 404 - Custom message'