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. --- tests/testdata/run/with_package_json/no_deno_json/main.out | 4 ++++ tests/testdata/run/with_package_json/no_deno_json/main.ts | 4 ++++ .../with_package_json/no_deno_json/no_package_json_imports.out | 1 + .../with_package_json/no_deno_json/no_package_json_imports.ts | 1 + tests/testdata/run/with_package_json/no_deno_json/noconfig.out | 4 ++++ tests/testdata/run/with_package_json/no_deno_json/noconfig.ts | 8 ++++++++ tests/testdata/run/with_package_json/no_deno_json/package.json | 9 +++++++++ .../testdata/run/with_package_json/no_deno_json/sub_dir/main.js | 3 +++ .../testdata/run/with_package_json/no_deno_json/sub_dir/main.out | 7 +++++++ tests/testdata/run/with_package_json/npm_binary/main.out | 7 +++++++ tests/testdata/run/with_package_json/npm_binary/package.json | 8 ++++++++ tests/testdata/run/with_package_json/with_stop/main.out | 5 +++++ tests/testdata/run/with_package_json/with_stop/package.json | 8 ++++++++ .../run/with_package_json/with_stop/some/nested/deno.json | 5 +++++ .../run/with_package_json/with_stop/some/nested/dir/main.ts | 6 ++++++ 15 files changed, 80 insertions(+) create mode 100644 tests/testdata/run/with_package_json/no_deno_json/main.out create mode 100644 tests/testdata/run/with_package_json/no_deno_json/main.ts create mode 100644 tests/testdata/run/with_package_json/no_deno_json/no_package_json_imports.out create mode 100644 tests/testdata/run/with_package_json/no_deno_json/no_package_json_imports.ts create mode 100644 tests/testdata/run/with_package_json/no_deno_json/noconfig.out create mode 100644 tests/testdata/run/with_package_json/no_deno_json/noconfig.ts create mode 100644 tests/testdata/run/with_package_json/no_deno_json/package.json create mode 100644 tests/testdata/run/with_package_json/no_deno_json/sub_dir/main.js create mode 100644 tests/testdata/run/with_package_json/no_deno_json/sub_dir/main.out create mode 100644 tests/testdata/run/with_package_json/npm_binary/main.out create mode 100644 tests/testdata/run/with_package_json/npm_binary/package.json create mode 100644 tests/testdata/run/with_package_json/with_stop/main.out create mode 100644 tests/testdata/run/with_package_json/with_stop/package.json create mode 100644 tests/testdata/run/with_package_json/with_stop/some/nested/deno.json create mode 100644 tests/testdata/run/with_package_json/with_stop/some/nested/dir/main.ts (limited to 'tests/testdata/run/with_package_json') diff --git a/tests/testdata/run/with_package_json/no_deno_json/main.out b/tests/testdata/run/with_package_json/no_deno_json/main.out new file mode 100644 index 000000000..402b30ed4 --- /dev/null +++ b/tests/testdata/run/with_package_json/no_deno_json/main.out @@ -0,0 +1,4 @@ +[WILDCARD]package.json file found at '[WILDCARD]with_package_json[WILDCARD]no_deno_json[WILDCARD]package.json' +[WILDCARD] +ok +[Function (anonymous)] Chalk [WILDCARD] diff --git a/tests/testdata/run/with_package_json/no_deno_json/main.ts b/tests/testdata/run/with_package_json/no_deno_json/main.ts new file mode 100644 index 000000000..1e6e50040 --- /dev/null +++ b/tests/testdata/run/with_package_json/no_deno_json/main.ts @@ -0,0 +1,4 @@ +import chalk from "chalk"; + +console.log("ok"); +console.log(chalk); diff --git a/tests/testdata/run/with_package_json/no_deno_json/no_package_json_imports.out b/tests/testdata/run/with_package_json/no_deno_json/no_package_json_imports.out new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/tests/testdata/run/with_package_json/no_deno_json/no_package_json_imports.out @@ -0,0 +1 @@ +5 diff --git a/tests/testdata/run/with_package_json/no_deno_json/no_package_json_imports.ts b/tests/testdata/run/with_package_json/no_deno_json/no_package_json_imports.ts new file mode 100644 index 000000000..0f3785f91 --- /dev/null +++ b/tests/testdata/run/with_package_json/no_deno_json/no_package_json_imports.ts @@ -0,0 +1 @@ +console.log(5); diff --git a/tests/testdata/run/with_package_json/no_deno_json/noconfig.out b/tests/testdata/run/with_package_json/no_deno_json/noconfig.out new file mode 100644 index 000000000..b9f9a6dea --- /dev/null +++ b/tests/testdata/run/with_package_json/no_deno_json/noconfig.out @@ -0,0 +1,4 @@ +[WILDCARD]package.json auto-discovery is disabled +[WILDCARD] +success +[WILDCARD] diff --git a/tests/testdata/run/with_package_json/no_deno_json/noconfig.ts b/tests/testdata/run/with_package_json/no_deno_json/noconfig.ts new file mode 100644 index 000000000..73b348fbc --- /dev/null +++ b/tests/testdata/run/with_package_json/no_deno_json/noconfig.ts @@ -0,0 +1,8 @@ +// ensure the cwd is this directory +const cwd = Deno.cwd(); +if (!cwd.endsWith("no_deno_json")) { + console.log(cwd); + throw "FAIL"; +} else { + console.log("success"); +} diff --git a/tests/testdata/run/with_package_json/no_deno_json/package.json b/tests/testdata/run/with_package_json/no_deno_json/package.json new file mode 100644 index 000000000..a85b890a8 --- /dev/null +++ b/tests/testdata/run/with_package_json/no_deno_json/package.json @@ -0,0 +1,9 @@ +{ + "dependencies": { + "@denotest/check-error": "1.0.0", + "chalk": "4" + }, + "devDependencies": { + "@denotest/cjs-default-export": "1.0.0" + } +} diff --git a/tests/testdata/run/with_package_json/no_deno_json/sub_dir/main.js b/tests/testdata/run/with_package_json/no_deno_json/sub_dir/main.js new file mode 100644 index 000000000..492a8fa40 --- /dev/null +++ b/tests/testdata/run/with_package_json/no_deno_json/sub_dir/main.js @@ -0,0 +1,3 @@ +import "chalk"; +console.log(Deno.cwd()); +console.log(Deno.statSync("../node_modules")); diff --git a/tests/testdata/run/with_package_json/no_deno_json/sub_dir/main.out b/tests/testdata/run/with_package_json/no_deno_json/sub_dir/main.out new file mode 100644 index 000000000..0ec791960 --- /dev/null +++ b/tests/testdata/run/with_package_json/no_deno_json/sub_dir/main.out @@ -0,0 +1,7 @@ +Download http://[WILDCARD] +[WILDCARD]sub_dir +{ + [WILDCARD] + isDirectory: true, + [WILDCARD] +} diff --git a/tests/testdata/run/with_package_json/npm_binary/main.out b/tests/testdata/run/with_package_json/npm_binary/main.out new file mode 100644 index 000000000..13d196a5e --- /dev/null +++ b/tests/testdata/run/with_package_json/npm_binary/main.out @@ -0,0 +1,7 @@ +[WILDCARD]package.json file found at '[WILDCARD]with_package_json[WILDCARD]npm_binary[WILDCARD]package.json' +[WILDCARD] +this +is +a +test +[WILDCARD] diff --git a/tests/testdata/run/with_package_json/npm_binary/package.json b/tests/testdata/run/with_package_json/npm_binary/package.json new file mode 100644 index 000000000..9ee3f39a8 --- /dev/null +++ b/tests/testdata/run/with_package_json/npm_binary/package.json @@ -0,0 +1,8 @@ +{ + "dependencies": { + "@denotest/check-error": "1.0.0" + }, + "devDependencies": { + "@denotest/cjs-default-export": "1.0.0" + } +} diff --git a/tests/testdata/run/with_package_json/with_stop/main.out b/tests/testdata/run/with_package_json/with_stop/main.out new file mode 100644 index 000000000..b199faf8d --- /dev/null +++ b/tests/testdata/run/with_package_json/with_stop/main.out @@ -0,0 +1,5 @@ +[WILDCARD]Config file found at '[WILDCARD]with_package_json[WILDCARD]with_stop[WILDCARD]some[WILDCARD]nested[WILDCARD]deno.json' +[WILDCARD]No package.json file found +[WILDCARD] +error: Relative import path "chalk" not prefixed with / or ./ or ../ + at file:///[WILDCARD]with_package_json/with_stop/some/nested/dir/main.ts:3:19 diff --git a/tests/testdata/run/with_package_json/with_stop/package.json b/tests/testdata/run/with_package_json/with_stop/package.json new file mode 100644 index 000000000..9ee3f39a8 --- /dev/null +++ b/tests/testdata/run/with_package_json/with_stop/package.json @@ -0,0 +1,8 @@ +{ + "dependencies": { + "@denotest/check-error": "1.0.0" + }, + "devDependencies": { + "@denotest/cjs-default-export": "1.0.0" + } +} diff --git a/tests/testdata/run/with_package_json/with_stop/some/nested/deno.json b/tests/testdata/run/with_package_json/with_stop/some/nested/deno.json new file mode 100644 index 000000000..36e1765d1 --- /dev/null +++ b/tests/testdata/run/with_package_json/with_stop/some/nested/deno.json @@ -0,0 +1,5 @@ +{ + "tasks": { + "dev": "deno run main.ts" + } +} diff --git a/tests/testdata/run/with_package_json/with_stop/some/nested/dir/main.ts b/tests/testdata/run/with_package_json/with_stop/some/nested/dir/main.ts new file mode 100644 index 000000000..6016470a1 --- /dev/null +++ b/tests/testdata/run/with_package_json/with_stop/some/nested/dir/main.ts @@ -0,0 +1,6 @@ +// This import should fail, because `package.json` is not discovered, as we're +// stopping the discovery when encountering `deno.json`. +import chalk from "chalk"; + +console.log("ok"); +console.log(chalk); -- cgit v1.2.3