test: move ESM fixtures to fixtures dir

Also consistently import the `common` module where possible.

PR-URL: https://github.com/nodejs/node/pull/19409
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Guy Bedford <guybedford@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Khaidi Chu <i@2333.moe>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>

24 files changed, 30 insertions, 40 deletions

diff --git a/test/es-module/esm-snapshot.js b/test/es-module/esm-snapshot.js
deleted file mode 100644
index f52c6f3adf..0000000000
--- a/test/es-module/esm-snapshot.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/* eslint-disable node-core/required-modules */
-'use strict';
-module.exports = 1;
diff --git a/test/es-module/test-esm-basic-imports.mjs b/test/es-module/test-esm-basic-imports.mjs
index 23989bddd5..78a4106f94 100644
--- a/test/es-module/test-esm-basic-imports.mjs
+++ b/test/es-module/test-esm-basic-imports.mjs
@@ -1,7 +1,7 @@
 // Flags: --experimental-modules
 import '../common';
 import assert from 'assert';
-import ok from './test-esm-ok.mjs';
+import ok from '../fixtures/es-modules/test-esm-ok.mjs';
 import okShebang from './test-esm-shebang.mjs';
 
 assert(ok);
diff --git a/test/es-module/test-esm-double-encoding.mjs b/test/es-module/test-esm-double-encoding.mjs
index 4af0c33ad8..c81d0530d3 100644
--- a/test/es-module/test-esm-double-encoding.mjs
+++ b/test/es-module/test-esm-double-encoding.mjs
@@ -3,4 +3,4 @@ import '../common';
 
 // Assert we can import files with `%` in their pathname.
 
-import './test-esm-double-encoding-native%2520.js';
+import '../fixtures/es-modules/test-esm-double-encoding-native%2520.js';
diff --git a/test/es-module/test-esm-dynamic-import.js b/test/es-module/test-esm-dynamic-import.js
index 9c4d48aaf0..c6daa95f9a 100644
--- a/test/es-module/test-esm-dynamic-import.js
+++ b/test/es-module/test-esm-dynamic-import.js
@@ -7,8 +7,8 @@ const vm = require('vm');
 
 common.crashOnUnhandledRejection();
 
-const relativePath = './test-esm-ok.mjs';
-const absolutePath = require.resolve('./test-esm-ok.mjs');
+const relativePath = '../fixtures/es-modules/test-esm-ok.mjs';
+const absolutePath = require.resolve('../fixtures/es-modules/test-esm-ok.mjs');
 const targetURL = new URL('file:///');
 targetURL.pathname = absolutePath;
 
diff --git a/test/es-module/test-esm-encoded-path.mjs b/test/es-module/test-esm-encoded-path.mjs
index 2c6e145927..365a425afa 100644
--- a/test/es-module/test-esm-encoded-path.mjs
+++ b/test/es-module/test-esm-encoded-path.mjs
@@ -2,6 +2,6 @@
 import '../common';
 import assert from 'assert';
 // ./test-esm-ok.mjs
-import ok from './test-%65%73%6d-ok.mjs';
+import ok from '../fixtures/es-modules/test-%65%73%6d-ok.mjs';
 
 assert(ok);
diff --git a/test/es-module/test-esm-example-loader.js b/test/es-module/test-esm-example-loader.js
index f7f0fd059a..0b0001acea 100644
--- a/test/es-module/test-esm-example-loader.js
+++ b/test/es-module/test-esm-example-loader.js
@@ -1,6 +1,6 @@
 // Flags: --experimental-modules --loader ./test/fixtures/es-module-loaders/example-loader.mjs
 /* eslint-disable node-core/required-modules */
 import assert from 'assert';
-import ok from './test-esm-ok.mjs';
+import ok from '../fixtures/es-modules/test-esm-ok.mjs';
 
 assert(ok);
diff --git a/test/es-module/test-esm-forbidden-globals.mjs b/test/es-module/test-esm-forbidden-globals.mjs
index d92df1611f..840a7ea541 100644
--- a/test/es-module/test-esm-forbidden-globals.mjs
+++ b/test/es-module/test-esm-forbidden-globals.mjs
@@ -1,5 +1,5 @@
 // Flags: --experimental-modules
-/* eslint-disable node-core/required-modules */
+import '../common';
 
 if (typeof arguments !== 'undefined') {
   throw new Error('not an ESM');
diff --git a/test/es-module/test-esm-json.mjs b/test/es-module/test-esm-json.mjs
index 5b432e0395..a7146d19a9 100644
--- a/test/es-module/test-esm-json.mjs
+++ b/test/es-module/test-esm-json.mjs
@@ -1,9 +1,8 @@
 // Flags: --experimental-modules
-/* eslint-disable node-core/required-modules */
-import '../common/index';
+import '../common';
 import assert from 'assert';
-import ok from './test-esm-ok.mjs';
-import json from './json.json';
+import ok from '../fixtures/es-modules/test-esm-ok.mjs';
+import json from '../fixtures/es-modules/json.json';
 
 assert(ok);
 assert.strictEqual(json.val, 42);
diff --git a/test/es-module/test-esm-loader-dependency.mjs b/test/es-module/test-esm-loader-dependency.mjs
index 260bf613a7..1ed8685a6f 100644
--- a/test/es-module/test-esm-loader-dependency.mjs
+++ b/test/es-module/test-esm-loader-dependency.mjs
@@ -1,5 +1,5 @@
 // Flags: --experimental-modules --loader ./test/fixtures/es-module-loaders/loader-with-dep.mjs
 /* eslint-disable node-core/required-modules */
-import './test-esm-ok.mjs';
+import '../fixtures/es-modules/test-esm-ok.mjs';
 
 // We just test that this module doesn't fail loading
diff --git a/test/es-module/test-esm-main-lookup.mjs b/test/es-module/test-esm-main-lookup.mjs
index 12f12c845c..ca313a1d26 100644
--- a/test/es-module/test-esm-main-lookup.mjs
+++ b/test/es-module/test-esm-main-lookup.mjs
@@ -1,5 +1,5 @@
 // Flags: --experimental-modules
-/* eslint-disable node-core/required-modules */
+import '../common';
 import assert from 'assert';
 import main from '../fixtures/es-modules/pjson-main';
 
diff --git a/test/es-module/test-esm-named-exports.mjs b/test/es-module/test-esm-named-exports.mjs
index 9698ae3d9c..3aae9230de 100644
--- a/test/es-module/test-esm-named-exports.mjs
+++ b/test/es-module/test-esm-named-exports.mjs
@@ -1,9 +1,8 @@
 // Flags: --experimental-modules --loader ./test/fixtures/es-module-loaders/builtin-named-exports-loader.mjs
-/* eslint-disable node-core/required-modules */
-import '../common/index';
+import '../common';
 import { readFile } from 'fs';
 import assert from 'assert';
-import ok from './test-esm-ok.mjs';
+import ok from '../fixtures/es-modules/test-esm-ok.mjs';
 
 assert(ok);
 assert(readFile);
diff --git a/test/es-module/test-esm-namespace.mjs b/test/es-module/test-esm-namespace.mjs
index 6a5ee28a54..04845e2b3e 100644
--- a/test/es-module/test-esm-namespace.mjs
+++ b/test/es-module/test-esm-namespace.mjs
@@ -1,7 +1,5 @@
 // Flags: --experimental-modules
-/* eslint-disable node-core/required-modules */
-
-import '../common/index';
+import '../common';
 import * as fs from 'fs';
 import assert from 'assert';
 
diff --git a/test/es-module/test-esm-ok.mjs b/test/es-module/test-esm-ok.mjs
deleted file mode 100644
index 49de5c47ec..0000000000
--- a/test/es-module/test-esm-ok.mjs
+++ /dev/null
@@ -1,5 +0,0 @@
-// Flags: --experimental-modules
-/* eslint-disable node-core/required-modules */
-
-const isJs = true;
-export default isJs;
diff --git a/test/es-module/test-esm-preserve-symlinks.js b/test/es-module/test-esm-preserve-symlinks.js
index e8473c3647..28cba3e702 100644
--- a/test/es-module/test-esm-preserve-symlinks.js
+++ b/test/es-module/test-esm-preserve-symlinks.js
@@ -1,4 +1,3 @@
-// Flags: --experimental-modules
 'use strict';
 
 const common = require('../common');
diff --git a/test/es-module/test-esm-resolve-hook.mjs b/test/es-module/test-esm-resolve-hook.mjs
index e2d20a42d4..e326d20b6d 100644
--- a/test/es-module/test-esm-resolve-hook.mjs
+++ b/test/es-module/test-esm-resolve-hook.mjs
@@ -2,7 +2,7 @@
 /* eslint-disable node-core/required-modules */
 import { namedExport } from '../fixtures/es-module-loaders/js-as-esm.js';
 import assert from 'assert';
-import ok from './test-esm-ok.mjs';
+import ok from '../fixtures/es-modules/test-esm-ok.mjs';
 
 assert(ok);
 assert(namedExport);
diff --git a/test/es-module/test-esm-shared-loader-dep.mjs b/test/es-module/test-esm-shared-loader-dep.mjs
index 03668cbc99..5c274d835c 100644
--- a/test/es-module/test-esm-shared-loader-dep.mjs
+++ b/test/es-module/test-esm-shared-loader-dep.mjs
@@ -1,7 +1,7 @@
 // Flags: --experimental-modules --loader ./test/fixtures/es-module-loaders/loader-shared-dep.mjs
-/* eslint-disable node-core/required-modules */
+import '../common';
 import assert from 'assert';
-import './test-esm-ok.mjs';
+import '../fixtures/es-modules/test-esm-ok.mjs';
 import dep from '../fixtures/es-module-loaders/loader-dep.js';
 
 assert.strictEqual(dep.format, 'esm');
diff --git a/test/es-module/test-esm-shebang.mjs b/test/es-module/test-esm-shebang.mjs
index 96cec8ea98..d5faace479 100644
--- a/test/es-module/test-esm-shebang.mjs
+++ b/test/es-module/test-esm-shebang.mjs
@@ -1,6 +1,6 @@
 #! }]) // isn't js
 // Flags: --experimental-modules
-/* eslint-disable node-core/required-modules */
+import '../common';
 
 const isJs = true;
 export default isJs;
diff --git a/test/es-module/test-esm-snapshot.mjs b/test/es-module/test-esm-snapshot.mjs
index 4d3cf245a3..3d4b44bbdd 100644
--- a/test/es-module/test-esm-snapshot.mjs
+++ b/test/es-module/test-esm-snapshot.mjs
@@ -1,8 +1,7 @@
 // Flags: --experimental-modules
-/* eslint-disable node-core/required-modules */
-import '../common/index';
-import './esm-snapshot-mutator';
-import one from './esm-snapshot';
+import '../common';
+import '../fixtures/es-modules/esm-snapshot-mutator';
+import one from '../fixtures/es-modules/esm-snapshot';
 import assert from 'assert';
 
 assert.strictEqual(one, 1);
diff --git a/test/es-module/esm-snapshot-mutator.js b/test/fixtures/es-modules/esm-snapshot-mutator.js
index 6c9a707306..ee52c270f6 100644
--- a/test/es-module/esm-snapshot-mutator.js
+++ b/test/fixtures/es-modules/esm-snapshot-mutator.js
@@ -1,4 +1,3 @@
-/* eslint-disable node-core/required-modules */
 'use strict';
 const shouldSnapshotFilePath = require.resolve('./esm-snapshot.js');
 require('./esm-snapshot.js');
diff --git a/test/fixtures/es-modules/esm-snapshot.js b/test/fixtures/es-modules/esm-snapshot.js
new file mode 100644
index 0000000000..329a0ca3f4
--- /dev/null
+++ b/test/fixtures/es-modules/esm-snapshot.js
@@ -0,0 +1,2 @@
+'use strict';
+module.exports = 1;
diff --git a/test/es-module/json.json b/test/fixtures/es-modules/json.json
index 8288d42e2b..8288d42e2b 100644
--- a/test/es-module/json.json
+++ b/test/fixtures/es-modules/json.json
diff --git a/test/es-module/test-esm-double-encoding-native%20.js b/test/fixtures/es-modules/test-esm-double-encoding-native%20.js
index 8780cf774d..ea1caa81be 100644
--- a/test/es-module/test-esm-double-encoding-native%20.js
+++ b/test/fixtures/es-modules/test-esm-double-encoding-native%20.js
@@ -1,5 +1,4 @@
 'use strict';
-require('../common');
 
 // Trivial test to assert we can load files with `%` in their pathname.
 // Imported by `test-esm-double-encoding.mjs`.
diff --git a/test/fixtures/es-modules/test-esm-ok.mjs b/test/fixtures/es-modules/test-esm-ok.mjs
new file mode 100644
index 0000000000..7dfc6eb587
--- /dev/null
+++ b/test/fixtures/es-modules/test-esm-ok.mjs
@@ -0,0 +1,2 @@
+const isJs = true;
+export default isJs;
diff --git a/test/parallel/test-module-main-extension-lookup.js b/test/parallel/test-module-main-extension-lookup.js
index 6f7bc2eb1d..3d20316647 100644
--- a/test/parallel/test-module-main-extension-lookup.js
+++ b/test/parallel/test-module-main-extension-lookup.js
@@ -1,9 +1,11 @@
 'use strict';
 require('../common');
+const fixtures = require('../common/fixtures');
 const { execFileSync } = require('child_process');
 
 const node = process.argv[0];
 
-execFileSync(node, ['--experimental-modules', 'test/es-module/test-esm-ok']);
 execFileSync(node, ['--experimental-modules',
-                    'test/fixtures/es-modules/noext']);
+                    fixtures.path('es-modules', 'test-esm-ok')]);
+execFileSync(node, ['--experimental-modules',
+                    fixtures.path('es-modules', 'noext')]);