diff options
author | Bartek IwaĆczuk <biwanczuk@gmail.com> | 2024-09-24 02:33:03 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-09-24 03:33:03 +0200 |
commit | 74e294c8c1873db447af0f02229470f8d78fffdd (patch) | |
tree | 49a9bf57993a30fdb5eacac3901cce3c8baf00ae | |
parent | d8036ab20c18572fdda26fa7398a152c734c62ed (diff) |
refactor: reenable more tests after DENO_FUTURE migration (#25752)
Rewrites and reenables following tests:
- `task::task_both_package_json_selected`
-rw-r--r-- | tests/integration/task_tests.rs | 11 | ||||
-rw-r--r-- | tests/specs/task/both_package_json_selected/__test__.jsonc | 10 | ||||
-rw-r--r-- | tests/specs/task/both_package_json_selected/deno.json (renamed from tests/testdata/task/both/deno.json) | 0 | ||||
-rw-r--r-- | tests/specs/task/both_package_json_selected/install.out (renamed from tests/testdata/task/both/package_json_selected.out) | 5 | ||||
-rw-r--r-- | tests/specs/task/both_package_json_selected/package.json (renamed from tests/testdata/task/both/package.json) | 0 | ||||
-rw-r--r-- | tests/specs/task/both_package_json_selected/package_json_selected.out | 5 | ||||
-rwxr-xr-x | tools/lint.js | 2 |
7 files changed, 16 insertions, 17 deletions
diff --git a/tests/integration/task_tests.rs b/tests/integration/task_tests.rs index 895e643a0..d198a3be6 100644 --- a/tests/integration/task_tests.rs +++ b/tests/integration/task_tests.rs @@ -31,17 +31,6 @@ // http_server: true, // }); -// TODO(2.0): not entirely clear what's wrong with this test -// itest!(task_both_package_json_selected { -// args: "task bin asdf", -// cwd: Some("task/both/"), -// output: "task/both/package_json_selected.out", -// copy_temp_dir: Some("task/both/"), -// envs: env_vars_for_npm_tests(), -// exit_code: 0, -// http_server: true, -// }); - // TODO(2.0): not entirely clear what's wrong with this test but it hangs for more than 60s // itest!(task_npx_on_own { // args: "task on-own", diff --git a/tests/specs/task/both_package_json_selected/__test__.jsonc b/tests/specs/task/both_package_json_selected/__test__.jsonc new file mode 100644 index 000000000..acdb7892d --- /dev/null +++ b/tests/specs/task/both_package_json_selected/__test__.jsonc @@ -0,0 +1,10 @@ +{ + "tempDir": true, + "steps": [ + { + "args": "install", + "output": "install.out" + }, + { "args": "task bin asdf", "output": "package_json_selected.out" } + ] +} diff --git a/tests/testdata/task/both/deno.json b/tests/specs/task/both_package_json_selected/deno.json index 1038609a4..1038609a4 100644 --- a/tests/testdata/task/both/deno.json +++ b/tests/specs/task/both_package_json_selected/deno.json diff --git a/tests/testdata/task/both/package_json_selected.out b/tests/specs/task/both_package_json_selected/install.out index c72baeb64..645501a3d 100644 --- a/tests/testdata/task/both/package_json_selected.out +++ b/tests/specs/task/both_package_json_selected/install.out @@ -1,8 +1,3 @@ Download http://localhost:4260/@denotest/bin Download http://localhost:4260/@denotest/bin/1.0.0.tgz Initialize @denotest/bin@1.0.0 -Task bin cli-esm testing this out "asdf" -testing -this -out -asdf diff --git a/tests/testdata/task/both/package.json b/tests/specs/task/both_package_json_selected/package.json index 708ccc6b1..708ccc6b1 100644 --- a/tests/testdata/task/both/package.json +++ b/tests/specs/task/both_package_json_selected/package.json diff --git a/tests/specs/task/both_package_json_selected/package_json_selected.out b/tests/specs/task/both_package_json_selected/package_json_selected.out new file mode 100644 index 000000000..6c42a2efb --- /dev/null +++ b/tests/specs/task/both_package_json_selected/package_json_selected.out @@ -0,0 +1,5 @@ +Task bin cli-esm testing this out "asdf" +testing +this +out +asdf diff --git a/tools/lint.js b/tools/lint.js index 496e83fc4..6cb27f8dc 100755 --- a/tools/lint.js +++ b/tools/lint.js @@ -220,7 +220,7 @@ async function ensureNoNewITests() { "repl_tests.rs": 0, "run_tests.rs": 331, "shared_library_tests.rs": 0, - "task_tests.rs": 4, + "task_tests.rs": 3, "test_tests.rs": 0, "upgrade_tests.rs": 0, "vendor_tests.rs": 1, |