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>
This commit is contained in:
Michaël Zasso 2018-03-17 12:45:22 +01:00
parent 9b7a6914a7
commit fddcd6253b
No known key found for this signature in database
GPG Key ID: 770F7A9A5AE15600
24 changed files with 30 additions and 40 deletions

View File

@ -1,3 +0,0 @@
/* eslint-disable node-core/required-modules */
'use strict';
module.exports = 1;

View File

@ -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);

View File

@ -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';

View File

@ -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;

View File

@ -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);

View File

@ -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);

View File

@ -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');

View File

@ -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);

View File

@ -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

View File

@ -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';

View File

@ -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);

View File

@ -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';

View File

@ -1,5 +0,0 @@
// Flags: --experimental-modules
/* eslint-disable node-core/required-modules */
const isJs = true;
export default isJs;

View File

@ -1,4 +1,3 @@
// Flags: --experimental-modules
'use strict';
const common = require('../common');

View File

@ -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);

View File

@ -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');

View File

@ -1,6 +1,6 @@
#! }]) // isn't js
// Flags: --experimental-modules
/* eslint-disable node-core/required-modules */
import '../common';
const isJs = true;
export default isJs;

View File

@ -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);

View File

@ -1,4 +1,3 @@
/* eslint-disable node-core/required-modules */
'use strict';
const shouldSnapshotFilePath = require.resolve('./esm-snapshot.js');
require('./esm-snapshot.js');

View File

@ -0,0 +1,2 @@
'use strict';
module.exports = 1;

View File

@ -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`.

View File

@ -0,0 +1,2 @@
const isJs = true;
export default isJs;

View File

@ -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')]);