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. --- cli/tests/testdata/task/deno_json/deno.json | 13 ------------- .../testdata/task/deno_json/task_additional_args.out | 1 - .../task_additional_args_nested_strings.out | 1 - .../task/deno_json/task_additional_args_no_logic.out | 1 - .../task_additional_args_no_shell_expansion.out | 1 - .../testdata/task/deno_json/task_boolean_logic.out | 4 ---- cli/tests/testdata/task/deno_json/task_cwd.out | 1 - .../testdata/task/deno_json/task_deno_exe_no_env.out | 1 - .../testdata/task/deno_json/task_exit_code_5.out | 2 -- cli/tests/testdata/task/deno_json/task_init_cwd.out | 1 - .../task/deno_json/task_init_cwd_already_set.out | 1 - cli/tests/testdata/task/deno_json/task_no_args.out | 19 ------------------- .../testdata/task/deno_json/task_non_existent.out | 20 -------------------- .../testdata/task/deno_json/task_piped_stdin.out | 2 -- 14 files changed, 68 deletions(-) delete mode 100644 cli/tests/testdata/task/deno_json/deno.json delete mode 100644 cli/tests/testdata/task/deno_json/task_additional_args.out delete mode 100644 cli/tests/testdata/task/deno_json/task_additional_args_nested_strings.out delete mode 100644 cli/tests/testdata/task/deno_json/task_additional_args_no_logic.out delete mode 100644 cli/tests/testdata/task/deno_json/task_additional_args_no_shell_expansion.out delete mode 100644 cli/tests/testdata/task/deno_json/task_boolean_logic.out delete mode 100644 cli/tests/testdata/task/deno_json/task_cwd.out delete mode 100644 cli/tests/testdata/task/deno_json/task_deno_exe_no_env.out delete mode 100644 cli/tests/testdata/task/deno_json/task_exit_code_5.out delete mode 100644 cli/tests/testdata/task/deno_json/task_init_cwd.out delete mode 100644 cli/tests/testdata/task/deno_json/task_init_cwd_already_set.out delete mode 100644 cli/tests/testdata/task/deno_json/task_no_args.out delete mode 100644 cli/tests/testdata/task/deno_json/task_non_existent.out delete mode 100644 cli/tests/testdata/task/deno_json/task_piped_stdin.out (limited to 'cli/tests/testdata/task/deno_json') diff --git a/cli/tests/testdata/task/deno_json/deno.json b/cli/tests/testdata/task/deno_json/deno.json deleted file mode 100644 index c57426d25..000000000 --- a/cli/tests/testdata/task/deno_json/deno.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "tasks": { - "boolean_logic": "sleep 0.1 && echo 3 && echo 4 & echo 1 && echo 2 || echo NOPE", - "echo": "echo 1", - "deno_echo": "deno eval 'console.log(5)'", - "strings": "deno run main.ts && deno eval \"console.log(\\\"test\\\")\"", - "piped": "echo 12345 | (deno eval 'const b = new Uint8Array(1);Deno.stdin.readSync(b);console.log(b)' && deno eval 'const b = new Uint8Array(1);Deno.stdin.readSync(b);console.log(b)')", - "exit_code_5": "echo $(echo 10 ; exit 2) && exit 5", - "echo_cwd": "echo $(pwd)", - "echo_init_cwd": "echo $INIT_CWD", - "echo_emoji": "echo 🔥" - } -} diff --git a/cli/tests/testdata/task/deno_json/task_additional_args.out b/cli/tests/testdata/task/deno_json/task_additional_args.out deleted file mode 100644 index 8d04f961a..000000000 --- a/cli/tests/testdata/task/deno_json/task_additional_args.out +++ /dev/null @@ -1 +0,0 @@ -1 2 diff --git a/cli/tests/testdata/task/deno_json/task_additional_args_nested_strings.out b/cli/tests/testdata/task/deno_json/task_additional_args_nested_strings.out deleted file mode 100644 index 0e5f35c7f..000000000 --- a/cli/tests/testdata/task/deno_json/task_additional_args_nested_strings.out +++ /dev/null @@ -1 +0,0 @@ -1 string "quoted string" diff --git a/cli/tests/testdata/task/deno_json/task_additional_args_no_logic.out b/cli/tests/testdata/task/deno_json/task_additional_args_no_logic.out deleted file mode 100644 index a4886a60d..000000000 --- a/cli/tests/testdata/task/deno_json/task_additional_args_no_logic.out +++ /dev/null @@ -1 +0,0 @@ -1 || echo 5 diff --git a/cli/tests/testdata/task/deno_json/task_additional_args_no_shell_expansion.out b/cli/tests/testdata/task/deno_json/task_additional_args_no_shell_expansion.out deleted file mode 100644 index 826a3aaf1..000000000 --- a/cli/tests/testdata/task/deno_json/task_additional_args_no_shell_expansion.out +++ /dev/null @@ -1 +0,0 @@ -1 $(echo 5) diff --git a/cli/tests/testdata/task/deno_json/task_boolean_logic.out b/cli/tests/testdata/task/deno_json/task_boolean_logic.out deleted file mode 100644 index 94ebaf900..000000000 --- a/cli/tests/testdata/task/deno_json/task_boolean_logic.out +++ /dev/null @@ -1,4 +0,0 @@ -1 -2 -3 -4 diff --git a/cli/tests/testdata/task/deno_json/task_cwd.out b/cli/tests/testdata/task/deno_json/task_cwd.out deleted file mode 100644 index bfe3e7b11..000000000 --- a/cli/tests/testdata/task/deno_json/task_cwd.out +++ /dev/null @@ -1 +0,0 @@ -[WILDCARD]tests diff --git a/cli/tests/testdata/task/deno_json/task_deno_exe_no_env.out b/cli/tests/testdata/task/deno_json/task_deno_exe_no_env.out deleted file mode 100644 index 7ed6ff82d..000000000 --- a/cli/tests/testdata/task/deno_json/task_deno_exe_no_env.out +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/cli/tests/testdata/task/deno_json/task_exit_code_5.out b/cli/tests/testdata/task/deno_json/task_exit_code_5.out deleted file mode 100644 index 12d171939..000000000 --- a/cli/tests/testdata/task/deno_json/task_exit_code_5.out +++ /dev/null @@ -1,2 +0,0 @@ -Task exit_code_5 echo $(echo 10 ; exit 2) && exit 5 -10 diff --git a/cli/tests/testdata/task/deno_json/task_init_cwd.out b/cli/tests/testdata/task/deno_json/task_init_cwd.out deleted file mode 100644 index 95ea8a545..000000000 --- a/cli/tests/testdata/task/deno_json/task_init_cwd.out +++ /dev/null @@ -1 +0,0 @@ -[WILDCARD]testdata diff --git a/cli/tests/testdata/task/deno_json/task_init_cwd_already_set.out b/cli/tests/testdata/task/deno_json/task_init_cwd_already_set.out deleted file mode 100644 index e427984d4..000000000 --- a/cli/tests/testdata/task/deno_json/task_init_cwd_already_set.out +++ /dev/null @@ -1 +0,0 @@ -HELLO diff --git a/cli/tests/testdata/task/deno_json/task_no_args.out b/cli/tests/testdata/task/deno_json/task_no_args.out deleted file mode 100644 index 18f86fce6..000000000 --- a/cli/tests/testdata/task/deno_json/task_no_args.out +++ /dev/null @@ -1,19 +0,0 @@ -Available tasks: -- boolean_logic - sleep 0.1 && echo 3 && echo 4 & echo 1 && echo 2 || echo NOPE -- echo - echo 1 -- deno_echo - deno eval 'console.log(5)' -- strings - deno run main.ts && deno eval "console.log(\"test\")" -- piped - echo 12345 | (deno eval 'const b = new Uint8Array(1);Deno.stdin.readSync(b);console.log(b)' && deno eval 'const b = new Uint8Array(1);Deno.stdin.readSync(b);console.log(b)') -- exit_code_5 - echo $(echo 10 ; exit 2) && exit 5 -- echo_cwd - echo $(pwd) -- echo_init_cwd - echo $INIT_CWD -- echo_emoji - echo 🔥 diff --git a/cli/tests/testdata/task/deno_json/task_non_existent.out b/cli/tests/testdata/task/deno_json/task_non_existent.out deleted file mode 100644 index efe3805f6..000000000 --- a/cli/tests/testdata/task/deno_json/task_non_existent.out +++ /dev/null @@ -1,20 +0,0 @@ -Task not found: non_existent -Available tasks: -- boolean_logic - sleep 0.1 && echo 3 && echo 4 & echo 1 && echo 2 || echo NOPE -- echo - echo 1 -- deno_echo - deno eval 'console.log(5)' -- strings - deno run main.ts && deno eval "console.log(\"test\")" -- piped - echo 12345 | (deno eval 'const b = new Uint8Array(1);Deno.stdin.readSync(b);console.log(b)' && deno eval 'const b = new Uint8Array(1);Deno.stdin.readSync(b);console.log(b)') -- exit_code_5 - echo $(echo 10 ; exit 2) && exit 5 -- echo_cwd - echo $(pwd) -- echo_init_cwd - echo $INIT_CWD -- echo_emoji - echo 🔥 diff --git a/cli/tests/testdata/task/deno_json/task_piped_stdin.out b/cli/tests/testdata/task/deno_json/task_piped_stdin.out deleted file mode 100644 index a0d636f15..000000000 --- a/cli/tests/testdata/task/deno_json/task_piped_stdin.out +++ /dev/null @@ -1,2 +0,0 @@ -Uint8Array(1) [ 49 ] -Uint8Array(1) [ 50 ] -- cgit v1.2.3