From afef4f85ff8fdc32c23bf5cf283882bd470fd512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Ribaudo?= Date: Mon, 22 Mar 2021 23:08:18 +0100 Subject: [PATCH] Move `@babel/node` tests (#13037) --- .../babel-node/test/{index.js => fixtures.js} | 98 +++++++++---------- .../--config-file/in-files/configFile.js | 0 .../--config-file/in-files/index.js | 0 .../--config-file/options.json | 0 .../--config-file/stdout.txt | 0 .../{babel-node => cli}/--env-name/.babelrc | 0 .../--env-name/in-files/index.js | 0 .../--env-name/in-files/logPlugin.js | 0 .../--env-name/options.json | 0 .../{babel-node => cli}/--env-name/stdout.txt | 0 .../{babel-node => cli}/--eval/options.json | 0 .../--extensions/in-files/foo.bar | 0 .../--extensions/options.json | 0 .../{babel-node => cli}/--no-babelrc/.babelrc | 0 .../--no-babelrc/in-files/index.js | 0 .../--no-babelrc/in-files/logPlugin.js | 0 .../--no-babelrc/options.json | 0 .../--no-babelrc/stdout.txt | 0 .../--presets/in-files/index.js | 0 .../--presets/in-files/presetFile.js | 0 .../--presets/options.json | 0 .../{babel-node => cli}/--presets/stdout.txt | 0 .../{babel-node => cli}/--print/options.json | 0 .../--require/in-files/dep.js | 0 .../--require/in-files/foo.js | 0 .../--require/options.json | 0 .../{babel-node => cli}/--require/stdout.txt | 0 .../--require_node_modules/in-files/foo.js | 0 .../in-files/node_modules/dep.js | 0 .../--require_node_modules/options.json | 0 .../--require_node_modules/stdout.txt | 0 .../{babel-node => cli}/-b/in-files/index.js | 0 .../-b/in-files/presetFile.js | 0 .../{babel-node => cli}/-b/options.json | 0 .../{babel-node => cli}/-b/stdout.txt | 0 .../arguments/in-files/bar.js | 0 .../arguments/options.json | 0 .../directory/in-files/foo/index.js | 0 .../directory/options.json | 0 .../{babel-node => cli}/directory/stdout.txt | 0 .../filename/in-files/bar.js | 0 .../{babel-node => cli}/filename/options.json | 0 .../{babel-node => cli}/filename/stdout.txt | 0 .../no-strict/options.json | 0 .../node-execArgv/in-files/payload.js | 0 .../node-execArgv/options.json | 0 .../node_--inspect/options.json | 0 .../node_--no-lazy/options.json | 0 .../node_-gc_alias_--expose-gc/options.json | 0 .../require/in-files/bar2.js | 0 .../require/in-files/foo2.js | 0 .../require/in-files/not_node_modules.jsx | 0 .../{babel-node => cli}/require/options.json | 0 .../{babel-node => cli}/require/stdout.txt | 0 .../subprocess-send/in-files/payload.js | 0 .../subprocess-send/options.json | 0 .../v8Flag-dashed-with-param/options.json | 0 .../v8Flag-dashed/options.json | 0 .../options.json | 0 .../v8Flag-underscored/options.json | 0 60 files changed, 46 insertions(+), 52 deletions(-) rename packages/babel-node/test/{index.js => fixtures.js} (67%) rename packages/babel-node/test/fixtures/{babel-node => cli}/--config-file/in-files/configFile.js (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/--config-file/in-files/index.js (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/--config-file/options.json (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/--config-file/stdout.txt (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/--env-name/.babelrc (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/--env-name/in-files/index.js (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/--env-name/in-files/logPlugin.js (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/--env-name/options.json (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/--env-name/stdout.txt (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/--eval/options.json (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/--extensions/in-files/foo.bar (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/--extensions/options.json (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/--no-babelrc/.babelrc (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/--no-babelrc/in-files/index.js (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/--no-babelrc/in-files/logPlugin.js (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/--no-babelrc/options.json (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/--no-babelrc/stdout.txt (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/--presets/in-files/index.js (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/--presets/in-files/presetFile.js (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/--presets/options.json (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/--presets/stdout.txt (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/--print/options.json (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/--require/in-files/dep.js (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/--require/in-files/foo.js (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/--require/options.json (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/--require/stdout.txt (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/--require_node_modules/in-files/foo.js (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/--require_node_modules/in-files/node_modules/dep.js (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/--require_node_modules/options.json (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/--require_node_modules/stdout.txt (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/-b/in-files/index.js (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/-b/in-files/presetFile.js (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/-b/options.json (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/-b/stdout.txt (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/arguments/in-files/bar.js (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/arguments/options.json (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/directory/in-files/foo/index.js (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/directory/options.json (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/directory/stdout.txt (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/filename/in-files/bar.js (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/filename/options.json (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/filename/stdout.txt (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/no-strict/options.json (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/node-execArgv/in-files/payload.js (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/node-execArgv/options.json (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/node_--inspect/options.json (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/node_--no-lazy/options.json (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/node_-gc_alias_--expose-gc/options.json (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/require/in-files/bar2.js (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/require/in-files/foo2.js (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/require/in-files/not_node_modules.jsx (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/require/options.json (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/require/stdout.txt (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/subprocess-send/in-files/payload.js (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/subprocess-send/options.json (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/v8Flag-dashed-with-param/options.json (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/v8Flag-dashed/options.json (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/v8Flag-underscored-with-param/options.json (100%) rename packages/babel-node/test/fixtures/{babel-node => cli}/v8Flag-underscored/options.json (100%) diff --git a/packages/babel-node/test/index.js b/packages/babel-node/test/fixtures.js similarity index 67% rename from packages/babel-node/test/index.js rename to packages/babel-node/test/fixtures.js index 94f5025a80..463d48dc4a 100644 --- a/packages/babel-node/test/index.js +++ b/packages/babel-node/test/fixtures.js @@ -11,8 +11,9 @@ import { createRequire } from "module"; const require = createRequire(import.meta.url); const dirname = path.dirname(fileURLToPath(import.meta.url)); -const fixtureLoc = path.join(dirname, "fixtures"); +const fixtureLoc = path.join(dirname, "fixtures", "cli"); const tmpLoc = path.join(dirname, "tmp"); +const binLoc = path.join(dirname, "../lib/babel-node"); const fileFilter = function (x) { return x !== ".DS_Store"; @@ -93,9 +94,7 @@ const assertTest = function (stdout, stderr, opts) { } }; -const buildTest = function (binName, testName, opts) { - const binLoc = path.join(dirname, "../lib", binName); - +const buildTest = function (testName, opts) { return function (callback) { saveInFiles(opts.inFiles); let args = [binLoc]; @@ -139,62 +138,57 @@ const buildTest = function (binName, testName, opts) { }; }; -fs.readdirSync(fixtureLoc).forEach(function (binName) { - if (binName[0] === ".") return; +describe("bin/babel-node", function () { + let cwd; - const suiteLoc = path.join(fixtureLoc, binName); - describe("bin/" + binName, function () { - let cwd; + beforeEach(() => { + cwd = process.cwd(); - beforeEach(() => { - cwd = process.cwd(); + if (fs.existsSync(tmpLoc)) { + for (const child of fs.readdirSync(tmpLoc)) { + rimraf.sync(path.join(tmpLoc, child)); + } + } else { + fs.mkdirSync(tmpLoc); + } - if (fs.existsSync(tmpLoc)) { - for (const child of fs.readdirSync(tmpLoc)) { - rimraf.sync(path.join(tmpLoc, child)); - } + process.chdir(tmpLoc); + }); + + afterEach(() => { + process.chdir(cwd); + }); + + fs.readdirSync(fixtureLoc).forEach(function (testName) { + if (testName[0] === ".") return; + + const testLoc = path.join(fixtureLoc, testName); + + const opts = { + args: [], + }; + + const optionsLoc = path.join(testLoc, "options.json"); + if (fs.existsSync(optionsLoc)) Object.assign(opts, require(optionsLoc)); + + ["stdout", "stdin", "stderr"].forEach(function (key) { + const loc = path.join(testLoc, key + ".txt"); + if (fs.existsSync(loc)) { + opts[key] = helper.readFile(loc); } else { - fs.mkdirSync(tmpLoc); + opts[key] = opts[key] || ""; } - - process.chdir(tmpLoc); }); - afterEach(() => { - process.chdir(cwd); - }); + opts.outFiles = readDir(path.join(testLoc, "out-files"), fileFilter); + opts.inFiles = readDir(path.join(testLoc, "in-files"), fileFilter); - fs.readdirSync(suiteLoc).forEach(function (testName) { - if (testName[0] === ".") return; + const babelrcLoc = path.join(testLoc, ".babelrc"); + if (fs.existsSync(babelrcLoc)) { + // copy .babelrc file to tmp directory + opts.inFiles[".babelrc"] = helper.readFile(babelrcLoc); + } - const testLoc = path.join(suiteLoc, testName); - - const opts = { - args: [], - }; - - const optionsLoc = path.join(testLoc, "options.json"); - if (fs.existsSync(optionsLoc)) Object.assign(opts, require(optionsLoc)); - - ["stdout", "stdin", "stderr"].forEach(function (key) { - const loc = path.join(testLoc, key + ".txt"); - if (fs.existsSync(loc)) { - opts[key] = helper.readFile(loc); - } else { - opts[key] = opts[key] || ""; - } - }); - - opts.outFiles = readDir(path.join(testLoc, "out-files"), fileFilter); - opts.inFiles = readDir(path.join(testLoc, "in-files"), fileFilter); - - const babelrcLoc = path.join(testLoc, ".babelrc"); - if (fs.existsSync(babelrcLoc)) { - // copy .babelrc file to tmp directory - opts.inFiles[".babelrc"] = helper.readFile(babelrcLoc); - } - - it(testName, buildTest(binName, testName, opts), 20000); - }); + it(testName, buildTest(testName, opts), 20000); }); }); diff --git a/packages/babel-node/test/fixtures/babel-node/--config-file/in-files/configFile.js b/packages/babel-node/test/fixtures/cli/--config-file/in-files/configFile.js similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/--config-file/in-files/configFile.js rename to packages/babel-node/test/fixtures/cli/--config-file/in-files/configFile.js diff --git a/packages/babel-node/test/fixtures/babel-node/--config-file/in-files/index.js b/packages/babel-node/test/fixtures/cli/--config-file/in-files/index.js similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/--config-file/in-files/index.js rename to packages/babel-node/test/fixtures/cli/--config-file/in-files/index.js diff --git a/packages/babel-node/test/fixtures/babel-node/--config-file/options.json b/packages/babel-node/test/fixtures/cli/--config-file/options.json similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/--config-file/options.json rename to packages/babel-node/test/fixtures/cli/--config-file/options.json diff --git a/packages/babel-node/test/fixtures/babel-node/--config-file/stdout.txt b/packages/babel-node/test/fixtures/cli/--config-file/stdout.txt similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/--config-file/stdout.txt rename to packages/babel-node/test/fixtures/cli/--config-file/stdout.txt diff --git a/packages/babel-node/test/fixtures/babel-node/--env-name/.babelrc b/packages/babel-node/test/fixtures/cli/--env-name/.babelrc similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/--env-name/.babelrc rename to packages/babel-node/test/fixtures/cli/--env-name/.babelrc diff --git a/packages/babel-node/test/fixtures/babel-node/--env-name/in-files/index.js b/packages/babel-node/test/fixtures/cli/--env-name/in-files/index.js similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/--env-name/in-files/index.js rename to packages/babel-node/test/fixtures/cli/--env-name/in-files/index.js diff --git a/packages/babel-node/test/fixtures/babel-node/--env-name/in-files/logPlugin.js b/packages/babel-node/test/fixtures/cli/--env-name/in-files/logPlugin.js similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/--env-name/in-files/logPlugin.js rename to packages/babel-node/test/fixtures/cli/--env-name/in-files/logPlugin.js diff --git a/packages/babel-node/test/fixtures/babel-node/--env-name/options.json b/packages/babel-node/test/fixtures/cli/--env-name/options.json similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/--env-name/options.json rename to packages/babel-node/test/fixtures/cli/--env-name/options.json diff --git a/packages/babel-node/test/fixtures/babel-node/--env-name/stdout.txt b/packages/babel-node/test/fixtures/cli/--env-name/stdout.txt similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/--env-name/stdout.txt rename to packages/babel-node/test/fixtures/cli/--env-name/stdout.txt diff --git a/packages/babel-node/test/fixtures/babel-node/--eval/options.json b/packages/babel-node/test/fixtures/cli/--eval/options.json similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/--eval/options.json rename to packages/babel-node/test/fixtures/cli/--eval/options.json diff --git a/packages/babel-node/test/fixtures/babel-node/--extensions/in-files/foo.bar b/packages/babel-node/test/fixtures/cli/--extensions/in-files/foo.bar similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/--extensions/in-files/foo.bar rename to packages/babel-node/test/fixtures/cli/--extensions/in-files/foo.bar diff --git a/packages/babel-node/test/fixtures/babel-node/--extensions/options.json b/packages/babel-node/test/fixtures/cli/--extensions/options.json similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/--extensions/options.json rename to packages/babel-node/test/fixtures/cli/--extensions/options.json diff --git a/packages/babel-node/test/fixtures/babel-node/--no-babelrc/.babelrc b/packages/babel-node/test/fixtures/cli/--no-babelrc/.babelrc similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/--no-babelrc/.babelrc rename to packages/babel-node/test/fixtures/cli/--no-babelrc/.babelrc diff --git a/packages/babel-node/test/fixtures/babel-node/--no-babelrc/in-files/index.js b/packages/babel-node/test/fixtures/cli/--no-babelrc/in-files/index.js similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/--no-babelrc/in-files/index.js rename to packages/babel-node/test/fixtures/cli/--no-babelrc/in-files/index.js diff --git a/packages/babel-node/test/fixtures/babel-node/--no-babelrc/in-files/logPlugin.js b/packages/babel-node/test/fixtures/cli/--no-babelrc/in-files/logPlugin.js similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/--no-babelrc/in-files/logPlugin.js rename to packages/babel-node/test/fixtures/cli/--no-babelrc/in-files/logPlugin.js diff --git a/packages/babel-node/test/fixtures/babel-node/--no-babelrc/options.json b/packages/babel-node/test/fixtures/cli/--no-babelrc/options.json similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/--no-babelrc/options.json rename to packages/babel-node/test/fixtures/cli/--no-babelrc/options.json diff --git a/packages/babel-node/test/fixtures/babel-node/--no-babelrc/stdout.txt b/packages/babel-node/test/fixtures/cli/--no-babelrc/stdout.txt similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/--no-babelrc/stdout.txt rename to packages/babel-node/test/fixtures/cli/--no-babelrc/stdout.txt diff --git a/packages/babel-node/test/fixtures/babel-node/--presets/in-files/index.js b/packages/babel-node/test/fixtures/cli/--presets/in-files/index.js similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/--presets/in-files/index.js rename to packages/babel-node/test/fixtures/cli/--presets/in-files/index.js diff --git a/packages/babel-node/test/fixtures/babel-node/--presets/in-files/presetFile.js b/packages/babel-node/test/fixtures/cli/--presets/in-files/presetFile.js similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/--presets/in-files/presetFile.js rename to packages/babel-node/test/fixtures/cli/--presets/in-files/presetFile.js diff --git a/packages/babel-node/test/fixtures/babel-node/--presets/options.json b/packages/babel-node/test/fixtures/cli/--presets/options.json similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/--presets/options.json rename to packages/babel-node/test/fixtures/cli/--presets/options.json diff --git a/packages/babel-node/test/fixtures/babel-node/--presets/stdout.txt b/packages/babel-node/test/fixtures/cli/--presets/stdout.txt similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/--presets/stdout.txt rename to packages/babel-node/test/fixtures/cli/--presets/stdout.txt diff --git a/packages/babel-node/test/fixtures/babel-node/--print/options.json b/packages/babel-node/test/fixtures/cli/--print/options.json similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/--print/options.json rename to packages/babel-node/test/fixtures/cli/--print/options.json diff --git a/packages/babel-node/test/fixtures/babel-node/--require/in-files/dep.js b/packages/babel-node/test/fixtures/cli/--require/in-files/dep.js similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/--require/in-files/dep.js rename to packages/babel-node/test/fixtures/cli/--require/in-files/dep.js diff --git a/packages/babel-node/test/fixtures/babel-node/--require/in-files/foo.js b/packages/babel-node/test/fixtures/cli/--require/in-files/foo.js similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/--require/in-files/foo.js rename to packages/babel-node/test/fixtures/cli/--require/in-files/foo.js diff --git a/packages/babel-node/test/fixtures/babel-node/--require/options.json b/packages/babel-node/test/fixtures/cli/--require/options.json similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/--require/options.json rename to packages/babel-node/test/fixtures/cli/--require/options.json diff --git a/packages/babel-node/test/fixtures/babel-node/--require/stdout.txt b/packages/babel-node/test/fixtures/cli/--require/stdout.txt similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/--require/stdout.txt rename to packages/babel-node/test/fixtures/cli/--require/stdout.txt diff --git a/packages/babel-node/test/fixtures/babel-node/--require_node_modules/in-files/foo.js b/packages/babel-node/test/fixtures/cli/--require_node_modules/in-files/foo.js similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/--require_node_modules/in-files/foo.js rename to packages/babel-node/test/fixtures/cli/--require_node_modules/in-files/foo.js diff --git a/packages/babel-node/test/fixtures/babel-node/--require_node_modules/in-files/node_modules/dep.js b/packages/babel-node/test/fixtures/cli/--require_node_modules/in-files/node_modules/dep.js similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/--require_node_modules/in-files/node_modules/dep.js rename to packages/babel-node/test/fixtures/cli/--require_node_modules/in-files/node_modules/dep.js diff --git a/packages/babel-node/test/fixtures/babel-node/--require_node_modules/options.json b/packages/babel-node/test/fixtures/cli/--require_node_modules/options.json similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/--require_node_modules/options.json rename to packages/babel-node/test/fixtures/cli/--require_node_modules/options.json diff --git a/packages/babel-node/test/fixtures/babel-node/--require_node_modules/stdout.txt b/packages/babel-node/test/fixtures/cli/--require_node_modules/stdout.txt similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/--require_node_modules/stdout.txt rename to packages/babel-node/test/fixtures/cli/--require_node_modules/stdout.txt diff --git a/packages/babel-node/test/fixtures/babel-node/-b/in-files/index.js b/packages/babel-node/test/fixtures/cli/-b/in-files/index.js similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/-b/in-files/index.js rename to packages/babel-node/test/fixtures/cli/-b/in-files/index.js diff --git a/packages/babel-node/test/fixtures/babel-node/-b/in-files/presetFile.js b/packages/babel-node/test/fixtures/cli/-b/in-files/presetFile.js similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/-b/in-files/presetFile.js rename to packages/babel-node/test/fixtures/cli/-b/in-files/presetFile.js diff --git a/packages/babel-node/test/fixtures/babel-node/-b/options.json b/packages/babel-node/test/fixtures/cli/-b/options.json similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/-b/options.json rename to packages/babel-node/test/fixtures/cli/-b/options.json diff --git a/packages/babel-node/test/fixtures/babel-node/-b/stdout.txt b/packages/babel-node/test/fixtures/cli/-b/stdout.txt similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/-b/stdout.txt rename to packages/babel-node/test/fixtures/cli/-b/stdout.txt diff --git a/packages/babel-node/test/fixtures/babel-node/arguments/in-files/bar.js b/packages/babel-node/test/fixtures/cli/arguments/in-files/bar.js similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/arguments/in-files/bar.js rename to packages/babel-node/test/fixtures/cli/arguments/in-files/bar.js diff --git a/packages/babel-node/test/fixtures/babel-node/arguments/options.json b/packages/babel-node/test/fixtures/cli/arguments/options.json similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/arguments/options.json rename to packages/babel-node/test/fixtures/cli/arguments/options.json diff --git a/packages/babel-node/test/fixtures/babel-node/directory/in-files/foo/index.js b/packages/babel-node/test/fixtures/cli/directory/in-files/foo/index.js similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/directory/in-files/foo/index.js rename to packages/babel-node/test/fixtures/cli/directory/in-files/foo/index.js diff --git a/packages/babel-node/test/fixtures/babel-node/directory/options.json b/packages/babel-node/test/fixtures/cli/directory/options.json similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/directory/options.json rename to packages/babel-node/test/fixtures/cli/directory/options.json diff --git a/packages/babel-node/test/fixtures/babel-node/directory/stdout.txt b/packages/babel-node/test/fixtures/cli/directory/stdout.txt similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/directory/stdout.txt rename to packages/babel-node/test/fixtures/cli/directory/stdout.txt diff --git a/packages/babel-node/test/fixtures/babel-node/filename/in-files/bar.js b/packages/babel-node/test/fixtures/cli/filename/in-files/bar.js similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/filename/in-files/bar.js rename to packages/babel-node/test/fixtures/cli/filename/in-files/bar.js diff --git a/packages/babel-node/test/fixtures/babel-node/filename/options.json b/packages/babel-node/test/fixtures/cli/filename/options.json similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/filename/options.json rename to packages/babel-node/test/fixtures/cli/filename/options.json diff --git a/packages/babel-node/test/fixtures/babel-node/filename/stdout.txt b/packages/babel-node/test/fixtures/cli/filename/stdout.txt similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/filename/stdout.txt rename to packages/babel-node/test/fixtures/cli/filename/stdout.txt diff --git a/packages/babel-node/test/fixtures/babel-node/no-strict/options.json b/packages/babel-node/test/fixtures/cli/no-strict/options.json similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/no-strict/options.json rename to packages/babel-node/test/fixtures/cli/no-strict/options.json diff --git a/packages/babel-node/test/fixtures/babel-node/node-execArgv/in-files/payload.js b/packages/babel-node/test/fixtures/cli/node-execArgv/in-files/payload.js similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/node-execArgv/in-files/payload.js rename to packages/babel-node/test/fixtures/cli/node-execArgv/in-files/payload.js diff --git a/packages/babel-node/test/fixtures/babel-node/node-execArgv/options.json b/packages/babel-node/test/fixtures/cli/node-execArgv/options.json similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/node-execArgv/options.json rename to packages/babel-node/test/fixtures/cli/node-execArgv/options.json diff --git a/packages/babel-node/test/fixtures/babel-node/node_--inspect/options.json b/packages/babel-node/test/fixtures/cli/node_--inspect/options.json similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/node_--inspect/options.json rename to packages/babel-node/test/fixtures/cli/node_--inspect/options.json diff --git a/packages/babel-node/test/fixtures/babel-node/node_--no-lazy/options.json b/packages/babel-node/test/fixtures/cli/node_--no-lazy/options.json similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/node_--no-lazy/options.json rename to packages/babel-node/test/fixtures/cli/node_--no-lazy/options.json diff --git a/packages/babel-node/test/fixtures/babel-node/node_-gc_alias_--expose-gc/options.json b/packages/babel-node/test/fixtures/cli/node_-gc_alias_--expose-gc/options.json similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/node_-gc_alias_--expose-gc/options.json rename to packages/babel-node/test/fixtures/cli/node_-gc_alias_--expose-gc/options.json diff --git a/packages/babel-node/test/fixtures/babel-node/require/in-files/bar2.js b/packages/babel-node/test/fixtures/cli/require/in-files/bar2.js similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/require/in-files/bar2.js rename to packages/babel-node/test/fixtures/cli/require/in-files/bar2.js diff --git a/packages/babel-node/test/fixtures/babel-node/require/in-files/foo2.js b/packages/babel-node/test/fixtures/cli/require/in-files/foo2.js similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/require/in-files/foo2.js rename to packages/babel-node/test/fixtures/cli/require/in-files/foo2.js diff --git a/packages/babel-node/test/fixtures/babel-node/require/in-files/not_node_modules.jsx b/packages/babel-node/test/fixtures/cli/require/in-files/not_node_modules.jsx similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/require/in-files/not_node_modules.jsx rename to packages/babel-node/test/fixtures/cli/require/in-files/not_node_modules.jsx diff --git a/packages/babel-node/test/fixtures/babel-node/require/options.json b/packages/babel-node/test/fixtures/cli/require/options.json similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/require/options.json rename to packages/babel-node/test/fixtures/cli/require/options.json diff --git a/packages/babel-node/test/fixtures/babel-node/require/stdout.txt b/packages/babel-node/test/fixtures/cli/require/stdout.txt similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/require/stdout.txt rename to packages/babel-node/test/fixtures/cli/require/stdout.txt diff --git a/packages/babel-node/test/fixtures/babel-node/subprocess-send/in-files/payload.js b/packages/babel-node/test/fixtures/cli/subprocess-send/in-files/payload.js similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/subprocess-send/in-files/payload.js rename to packages/babel-node/test/fixtures/cli/subprocess-send/in-files/payload.js diff --git a/packages/babel-node/test/fixtures/babel-node/subprocess-send/options.json b/packages/babel-node/test/fixtures/cli/subprocess-send/options.json similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/subprocess-send/options.json rename to packages/babel-node/test/fixtures/cli/subprocess-send/options.json diff --git a/packages/babel-node/test/fixtures/babel-node/v8Flag-dashed-with-param/options.json b/packages/babel-node/test/fixtures/cli/v8Flag-dashed-with-param/options.json similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/v8Flag-dashed-with-param/options.json rename to packages/babel-node/test/fixtures/cli/v8Flag-dashed-with-param/options.json diff --git a/packages/babel-node/test/fixtures/babel-node/v8Flag-dashed/options.json b/packages/babel-node/test/fixtures/cli/v8Flag-dashed/options.json similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/v8Flag-dashed/options.json rename to packages/babel-node/test/fixtures/cli/v8Flag-dashed/options.json diff --git a/packages/babel-node/test/fixtures/babel-node/v8Flag-underscored-with-param/options.json b/packages/babel-node/test/fixtures/cli/v8Flag-underscored-with-param/options.json similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/v8Flag-underscored-with-param/options.json rename to packages/babel-node/test/fixtures/cli/v8Flag-underscored-with-param/options.json diff --git a/packages/babel-node/test/fixtures/babel-node/v8Flag-underscored/options.json b/packages/babel-node/test/fixtures/cli/v8Flag-underscored/options.json similarity index 100% rename from packages/babel-node/test/fixtures/babel-node/v8Flag-underscored/options.json rename to packages/babel-node/test/fixtures/cli/v8Flag-underscored/options.json