Skip to content

Commit fddcd62

Browse files
committed
test: move ESM fixtures to fixtures dir
Also consistently import the `common` module where possible. PR-URL: #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>
1 parent 9b7a691 commit fddcd62

24 files changed

+30
-40
lines changed

test/es-module/esm-snapshot.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

test/es-module/test-esm-basic-imports.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Flags: --experimental-modules
22
import '../common';
33
import assert from 'assert';
4-
import ok from './test-esm-ok.mjs';
4+
import ok from '../fixtures/es-modules/test-esm-ok.mjs';
55
import okShebang from './test-esm-shebang.mjs';
66

77
assert(ok);

test/es-module/test-esm-double-encoding.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ import '../common';
33

44
// Assert we can import files with `%` in their pathname.
55

6-
import './test-esm-double-encoding-native%2520.js';
6+
import '../fixtures/es-modules/test-esm-double-encoding-native%2520.js';

test/es-module/test-esm-dynamic-import.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ const vm = require('vm');
77

88
common.crashOnUnhandledRejection();
99

10-
const relativePath = './test-esm-ok.mjs';
11-
const absolutePath = require.resolve('./test-esm-ok.mjs');
10+
const relativePath = '../fixtures/es-modules/test-esm-ok.mjs';
11+
const absolutePath = require.resolve('../fixtures/es-modules/test-esm-ok.mjs');
1212
const targetURL = new URL('file:///');
1313
targetURL.pathname = absolutePath;
1414

test/es-module/test-esm-encoded-path.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
import '../common';
33
import assert from 'assert';
44
// ./test-esm-ok.mjs
5-
import ok from './test-%65%73%6d-ok.mjs';
5+
import ok from '../fixtures/es-modules/test-%65%73%6d-ok.mjs';
66

77
assert(ok);
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Flags: --experimental-modules --loader ./test/fixtures/es-module-loaders/example-loader.mjs
22
/* eslint-disable node-core/required-modules */
33
import assert from 'assert';
4-
import ok from './test-esm-ok.mjs';
4+
import ok from '../fixtures/es-modules/test-esm-ok.mjs';
55

66
assert(ok);

test/es-module/test-esm-forbidden-globals.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Flags: --experimental-modules
2-
/* eslint-disable node-core/required-modules */
2+
import '../common';
33

44
if (typeof arguments !== 'undefined') {
55
throw new Error('not an ESM');

test/es-module/test-esm-json.mjs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
// Flags: --experimental-modules
2-
/* eslint-disable node-core/required-modules */
3-
import '../common/index';
2+
import '../common';
43
import assert from 'assert';
5-
import ok from './test-esm-ok.mjs';
6-
import json from './json.json';
4+
import ok from '../fixtures/es-modules/test-esm-ok.mjs';
5+
import json from '../fixtures/es-modules/json.json';
76

87
assert(ok);
98
assert.strictEqual(json.val, 42);
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Flags: --experimental-modules --loader ./test/fixtures/es-module-loaders/loader-with-dep.mjs
22
/* eslint-disable node-core/required-modules */
3-
import './test-esm-ok.mjs';
3+
import '../fixtures/es-modules/test-esm-ok.mjs';
44

55
// We just test that this module doesn't fail loading

test/es-module/test-esm-main-lookup.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Flags: --experimental-modules
2-
/* eslint-disable node-core/required-modules */
2+
import '../common';
33
import assert from 'assert';
44
import main from '../fixtures/es-modules/pjson-main';
55

0 commit comments

Comments
 (0)