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. --- .../npm/registry/@denotest/dual-cjs-esm/1.0.0/cjs/main.cjs | 10 ---------- .../npm/registry/@denotest/dual-cjs-esm/1.0.0/cjs/package.json | 3 --- .../npm/registry/@denotest/dual-cjs-esm/1.0.0/main.cjs | 3 --- .../npm/registry/@denotest/dual-cjs-esm/1.0.0/main.d.cts | 1 - .../npm/registry/@denotest/dual-cjs-esm/1.0.0/main.d.mts | 1 - .../npm/registry/@denotest/dual-cjs-esm/1.0.0/main.mjs | 3 --- .../npm/registry/@denotest/dual-cjs-esm/1.0.0/package.json | 7 ------- .../npm/registry/@denotest/dual-cjs-esm/1.0.0/subpath/main.cjs | 3 --- .../npm/registry/@denotest/dual-cjs-esm/1.0.0/subpath/main.mjs | 3 --- .../registry/@denotest/dual-cjs-esm/1.0.0/subpath/package.json | 5 ----- 10 files changed, 39 deletions(-) delete mode 100644 cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/cjs/main.cjs delete mode 100644 cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/cjs/package.json delete mode 100644 cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/main.cjs delete mode 100644 cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/main.d.cts delete mode 100644 cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/main.d.mts delete mode 100644 cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/main.mjs delete mode 100644 cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/package.json delete mode 100644 cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/subpath/main.cjs delete mode 100644 cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/subpath/main.mjs delete mode 100644 cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/subpath/package.json (limited to 'cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm') diff --git a/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/cjs/main.cjs b/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/cjs/main.cjs deleted file mode 100644 index 51d32ff89..000000000 --- a/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/cjs/main.cjs +++ /dev/null @@ -1,10 +0,0 @@ -const root = require("../"); -const subPath = require("../subpath"); - -module.exports.getKind = function() { - return root.getKind(); -}; - -module.exports.getSubPathKind = function() { - return subPath.getSubPathKind(); -}; diff --git a/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/cjs/package.json b/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/cjs/package.json deleted file mode 100644 index 73847e365..000000000 --- a/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/cjs/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "main": "./main.cjs" -} \ No newline at end of file diff --git a/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/main.cjs b/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/main.cjs deleted file mode 100644 index 990605527..000000000 --- a/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/main.cjs +++ /dev/null @@ -1,3 +0,0 @@ -exports.getKind = function() { - return "cjs"; -}; diff --git a/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/main.d.cts b/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/main.d.cts deleted file mode 100644 index f969ba996..000000000 --- a/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/main.d.cts +++ /dev/null @@ -1 +0,0 @@ -export function getKind(): string; diff --git a/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/main.d.mts b/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/main.d.mts deleted file mode 100644 index f969ba996..000000000 --- a/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/main.d.mts +++ /dev/null @@ -1 +0,0 @@ -export function getKind(): string; diff --git a/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/main.mjs b/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/main.mjs deleted file mode 100644 index b48b9a3a6..000000000 --- a/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/main.mjs +++ /dev/null @@ -1,3 +0,0 @@ -export function getKind() { - return "esm"; -} diff --git a/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/package.json b/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/package.json deleted file mode 100644 index 18b72e97a..000000000 --- a/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "@denotest/dual-cjs-esm", - "version": "1.0.0", - "type": "module", - "main": "./main.cjs", - "module": "./main.mjs" -} diff --git a/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/subpath/main.cjs b/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/subpath/main.cjs deleted file mode 100644 index 18a22e6f1..000000000 --- a/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/subpath/main.cjs +++ /dev/null @@ -1,3 +0,0 @@ -exports.getSubPathKind = function() { - return "cjs"; -}; diff --git a/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/subpath/main.mjs b/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/subpath/main.mjs deleted file mode 100644 index 47e8cd516..000000000 --- a/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/subpath/main.mjs +++ /dev/null @@ -1,3 +0,0 @@ -export function getSubPathKind() { - return "esm"; -} diff --git a/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/subpath/package.json b/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/subpath/package.json deleted file mode 100644 index 149ce36a3..000000000 --- a/cli/tests/testdata/npm/registry/@denotest/dual-cjs-esm/1.0.0/subpath/package.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "module", - "main": "./main.cjs", - "module": "./main.mjs" -} \ No newline at end of file -- cgit v1.2.3