From f5e46c9bf2f50d66a953fa133161fc829cecff06 Mon Sep 17 00:00:00 2001 From: Matt Mastracci Date: Sat, 10 Feb 2024 13:22:13 -0700 Subject: chore: move cli/tests/ -> tests/ (#22369) This looks like a massive PR, but it's only a move from cli/tests -> tests, and updates of relative paths for files. This is the first step towards aggregate all of the integration test files under tests/, which will lead to a set of integration tests that can run without the CLI binary being built. While we could leave these tests under `cli`, it would require us to keep a more complex directory structure for the various test runners. In addition, we have a lot of complexity to ignore various test files in the `cli` project itself (cargo publish exclusion rules, autotests = false, etc). And finally, the `tests/` folder will eventually house the `test_ffi`, `test_napi` and other testing code, reducing the size of the root repo directory. For easier review, the extremely large and noisy "move" is in the first commit (with no changes -- just a move), while the remainder of the changes to actual files is in the second commit. --- .../@denotest/imports-package-json/1.0.0/hi.js | 1 + .../1.0.0/import_not_defined.js | 3 +++ .../@denotest/imports-package-json/1.0.0/main.js | 13 +++++++++++++ .../imports-package-json/1.0.0/package.json | 21 +++++++++++++++++++++ .../imports-package-json/1.0.0/sub_path/bye.js | 1 + .../1.0.0/sub_path/import_not_defined.js | 4 ++++ .../imports-package-json/1.0.0/sub_path/main.js | 3 +++ .../1.0.0/sub_path/package.json | 6 ++++++ 8 files changed, 52 insertions(+) create mode 100644 tests/testdata/npm/registry/@denotest/imports-package-json/1.0.0/hi.js create mode 100644 tests/testdata/npm/registry/@denotest/imports-package-json/1.0.0/import_not_defined.js create mode 100644 tests/testdata/npm/registry/@denotest/imports-package-json/1.0.0/main.js create mode 100644 tests/testdata/npm/registry/@denotest/imports-package-json/1.0.0/package.json create mode 100644 tests/testdata/npm/registry/@denotest/imports-package-json/1.0.0/sub_path/bye.js create mode 100644 tests/testdata/npm/registry/@denotest/imports-package-json/1.0.0/sub_path/import_not_defined.js create mode 100644 tests/testdata/npm/registry/@denotest/imports-package-json/1.0.0/sub_path/main.js create mode 100644 tests/testdata/npm/registry/@denotest/imports-package-json/1.0.0/sub_path/package.json (limited to 'tests/testdata/npm/registry/@denotest/imports-package-json') diff --git a/tests/testdata/npm/registry/@denotest/imports-package-json/1.0.0/hi.js b/tests/testdata/npm/registry/@denotest/imports-package-json/1.0.0/hi.js new file mode 100644 index 000000000..407090812 --- /dev/null +++ b/tests/testdata/npm/registry/@denotest/imports-package-json/1.0.0/hi.js @@ -0,0 +1 @@ +export default "hi"; diff --git a/tests/testdata/npm/registry/@denotest/imports-package-json/1.0.0/import_not_defined.js b/tests/testdata/npm/registry/@denotest/imports-package-json/1.0.0/import_not_defined.js new file mode 100644 index 000000000..07864fd2c --- /dev/null +++ b/tests/testdata/npm/registry/@denotest/imports-package-json/1.0.0/import_not_defined.js @@ -0,0 +1,3 @@ +import notDefined from "#not-defined"; + +export default notDefined; diff --git a/tests/testdata/npm/registry/@denotest/imports-package-json/1.0.0/main.js b/tests/testdata/npm/registry/@denotest/imports-package-json/1.0.0/main.js new file mode 100644 index 000000000..9e7c247b7 --- /dev/null +++ b/tests/testdata/npm/registry/@denotest/imports-package-json/1.0.0/main.js @@ -0,0 +1,13 @@ +import hi from "#hi"; +import bye from "./sub_path/main.js"; +import fs from "#fs"; +import path from "#path"; +import fs2 from "#fs2"; + +export default { + hi, + bye, + fs, + path, + fs2, +}; diff --git a/tests/testdata/npm/registry/@denotest/imports-package-json/1.0.0/package.json b/tests/testdata/npm/registry/@denotest/imports-package-json/1.0.0/package.json new file mode 100644 index 000000000..2c294e680 --- /dev/null +++ b/tests/testdata/npm/registry/@denotest/imports-package-json/1.0.0/package.json @@ -0,0 +1,21 @@ +{ + "name": "imports-package-json", + "type": "module", + "version": "1.0.0", + "description": "", + "license": "ISC", + "author": "", + "exports": { + ".": "./main.js", + "./import-not-defined": "./import_not_defined.js", + "./sub-path-import-not-defined": "./sub_path/import_not_defined.js" + }, + "imports": { + "#hi": "./hi.js", + "#fs": "fs", + "#path": "node:path", + "#fs2": { + "node": "fs" + } + } +} diff --git a/tests/testdata/npm/registry/@denotest/imports-package-json/1.0.0/sub_path/bye.js b/tests/testdata/npm/registry/@denotest/imports-package-json/1.0.0/sub_path/bye.js new file mode 100644 index 000000000..6fc719e48 --- /dev/null +++ b/tests/testdata/npm/registry/@denotest/imports-package-json/1.0.0/sub_path/bye.js @@ -0,0 +1 @@ +export default "bye"; diff --git a/tests/testdata/npm/registry/@denotest/imports-package-json/1.0.0/sub_path/import_not_defined.js b/tests/testdata/npm/registry/@denotest/imports-package-json/1.0.0/sub_path/import_not_defined.js new file mode 100644 index 000000000..ffaa2b1ad --- /dev/null +++ b/tests/testdata/npm/registry/@denotest/imports-package-json/1.0.0/sub_path/import_not_defined.js @@ -0,0 +1,4 @@ +// this won't be defined in the closest package.json and will fail +import hi from "#hi"; + +export default hi; diff --git a/tests/testdata/npm/registry/@denotest/imports-package-json/1.0.0/sub_path/main.js b/tests/testdata/npm/registry/@denotest/imports-package-json/1.0.0/sub_path/main.js new file mode 100644 index 000000000..260ca79ae --- /dev/null +++ b/tests/testdata/npm/registry/@denotest/imports-package-json/1.0.0/sub_path/main.js @@ -0,0 +1,3 @@ +import bye from "#bye"; + +export default bye; diff --git a/tests/testdata/npm/registry/@denotest/imports-package-json/1.0.0/sub_path/package.json b/tests/testdata/npm/registry/@denotest/imports-package-json/1.0.0/sub_path/package.json new file mode 100644 index 000000000..3f2c2bbd8 --- /dev/null +++ b/tests/testdata/npm/registry/@denotest/imports-package-json/1.0.0/sub_path/package.json @@ -0,0 +1,6 @@ +{ + "type": "module", + "imports": { + "#bye": "./bye.js" + } +} -- cgit v1.2.3