From e4fdd0b492f6a022a7a2bc63190dc6764a6ec7d6 Mon Sep 17 00:00:00 2001
From: Giovanni Bucci <puskin94@users.noreply.github.com>
Date: Fri, 6 Sep 2024 10:29:26 +0200
Subject: [PATCH] test: refactor `test-esm-type-field-errors`

Co-Authored-By: Jacob Smith <jacob@frende.me>
PR-URL: https://github.com/nodejs/node/pull/54368
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 test/es-module/test-esm-type-field-errors.js | 47 +++++++++++++++-----
 1 file changed, 36 insertions(+), 11 deletions(-)

diff --git a/test/es-module/test-esm-type-field-errors.js b/test/es-module/test-esm-type-field-errors.js
index d9d264cc25a..9ec9aa64e18 100644
--- a/test/es-module/test-esm-type-field-errors.js
+++ b/test/es-module/test-esm-type-field-errors.js
@@ -2,6 +2,7 @@
 const common = require('../common');
 const assert = require('assert');
 const exec = require('child_process').execFile;
+const { describe, it } = require('node:test');
 
 const mjsFile = require.resolve('../fixtures/es-modules/mjs-file.mjs');
 const cjsFile = require.resolve('../fixtures/es-modules/cjs-file.cjs');
@@ -20,18 +21,42 @@ expect('', packageTypeCommonJsMain, 'package-type-commonjs');
 expect('', packageWithoutTypeMain, 'package-without-type');
 
 // Check that --input-type isn't allowed for files
-expect('--input-type=module', packageTypeModuleMain,
-       'ERR_INPUT_TYPE_NOT_ALLOWED', true);
+describe('ESM type field errors', { concurrency: true }, () => {
+  it('.cjs file', () => {
+    expect('', cjsFile, '.cjs file');
+  });
 
-try {
-  require('../fixtures/es-modules/package-type-module/index.js');
-  assert.fail('Expected CJS to fail loading from type: module package.');
-} catch (e) {
-  assert.strictEqual(e.name, 'Error');
-  assert.strictEqual(e.code, 'ERR_REQUIRE_ESM');
-  assert(e.toString().match(/require\(\) of ES Module/g));
-  assert(e.message.match(/require\(\) of ES Module/g));
-}
+  it('.mjs file', () => {
+    expect('', mjsFile, '.mjs file');
+  });
+
+  it('package.json with "type": "module"', () => {
+    expect('', packageTypeModuleMain, 'package-type-module');
+  });
+
+  it('package.json with "type": "commonjs"', () => {
+    expect('', packageTypeCommonJsMain, 'package-type-commonjs');
+  });
+
+  it('package.json with no "type" field', () => {
+    expect('', packageWithoutTypeMain, 'package-without-type');
+  });
+
+  it('--input-type=module disallowed for files', () => {
+    expect(
+      '--input-type=module',
+      packageTypeModuleMain,
+      'ERR_INPUT_TYPE_NOT_ALLOWED',
+      true,
+    );
+  });
+
+  it('--input-type=module disallowed for directories', () => {
+    assert.throws(() => require('../fixtures/es-modules/package-type-module/index.js'), {
+      code: 'ERR_REQUIRE_ESM'
+    });
+  });
+});
 
 function expect(opt = '', inputFile, want, wantsError = false) {
   const argv = [inputFile];