diff options
author | David Sherret <dsherret@users.noreply.github.com> | 2024-03-15 15:46:51 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-15 15:46:51 -0400 |
commit | e40f9a5c14c51b6d05812e48fa072148fe79c74d (patch) | |
tree | e492e91717c7ddda3e31139f870706870449cdde /tests/integration | |
parent | 392579b5a673964752e38e1e0d9c2c9ae223a382 (diff) |
chore: move more tests away from itest (#22909)
Part of #22907
Diffstat (limited to 'tests/integration')
-rw-r--r-- | tests/integration/coverage_tests.rs | 7 | ||||
-rw-r--r-- | tests/integration/flags_tests.rs | 42 | ||||
-rw-r--r-- | tests/integration/jsr_tests.rs | 100 | ||||
-rw-r--r-- | tests/integration/jupyter_tests.rs | 10 | ||||
-rw-r--r-- | tests/integration/mod.rs | 2 |
5 files changed, 0 insertions, 161 deletions
diff --git a/tests/integration/coverage_tests.rs b/tests/integration/coverage_tests.rs index 5353996a0..1bc3e887a 100644 --- a/tests/integration/coverage_tests.rs +++ b/tests/integration/coverage_tests.rs @@ -3,7 +3,6 @@ use deno_core::serde_json; use std::fs; use test_util as util; -use test_util::itest; use test_util::TempDir; use util::assert_starts_with; use util::env_vars_for_npm_tests; @@ -631,9 +630,3 @@ File | Branch % | Line % | ", ); } - -itest!(no_files_found { - args: "coverage doesnt_exist.js", - exit_code: 1, - output: "coverage/doesnt_exist.out", -}); diff --git a/tests/integration/flags_tests.rs b/tests/integration/flags_tests.rs index c898c199c..751f4aafe 100644 --- a/tests/integration/flags_tests.rs +++ b/tests/integration/flags_tests.rs @@ -1,22 +1,9 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. use test_util as util; -use test_util::itest; use util::assert_contains; #[test] -fn help_flag() { - let status = util::deno_cmd() - .current_dir(util::testdata_path()) - .arg("--help") - .spawn() - .unwrap() - .wait() - .unwrap(); - assert!(status.success()); -} - -#[test] fn help_output() { let output = util::deno_cmd() .current_dir(util::testdata_path()) @@ -56,32 +43,3 @@ fn help_output() { assert_contains!(stdout, description); } } - -#[test] -fn version_short_flag() { - let status = util::deno_cmd() - .current_dir(util::testdata_path()) - .arg("-V") - .spawn() - .unwrap() - .wait() - .unwrap(); - assert!(status.success()); -} - -#[test] -fn version_long_flag() { - let status = util::deno_cmd() - .current_dir(util::testdata_path()) - .arg("--version") - .spawn() - .unwrap() - .wait() - .unwrap(); - assert!(status.success()); -} - -itest!(types { - args: "types", - output: "types/types.out", -}); diff --git a/tests/integration/jsr_tests.rs b/tests/integration/jsr_tests.rs index f78bea92d..307398fc5 100644 --- a/tests/integration/jsr_tests.rs +++ b/tests/integration/jsr_tests.rs @@ -4,87 +4,11 @@ use deno_core::serde_json::json; use deno_core::serde_json::Value; use deno_lockfile::Lockfile; use test_util as util; -use test_util::itest; use url::Url; use util::assert_contains; use util::assert_not_contains; -use util::env_vars_for_jsr_npm_tests; -use util::env_vars_for_jsr_tests; use util::TestContextBuilder; -itest!(no_module_graph_run { - args: "run jsr/no_module_graph/main.ts", - output: "jsr/no_module_graph/main.out", - envs: env_vars_for_jsr_tests(), - http_server: true, -}); - -itest!(no_module_graph_info { - args: "info jsr/no_module_graph/main.ts", - output: "jsr/no_module_graph/main_info.out", - envs: env_vars_for_jsr_tests(), - http_server: true, -}); - -itest!(same_package_multiple_versions { - args: "run --quiet jsr/no_module_graph/multiple.ts", - output: "jsr/no_module_graph/multiple.out", - envs: env_vars_for_jsr_tests(), - http_server: true, -}); - -itest!(module_graph_run { - args: "run jsr/module_graph/main.ts", - output: "jsr/module_graph/main.out", - envs: env_vars_for_jsr_tests(), - http_server: true, -}); - -itest!(module_graph_info { - args: "info jsr/module_graph/main.ts", - output: "jsr/module_graph/main_info.out", - envs: env_vars_for_jsr_tests(), - http_server: true, -}); - -itest!(deps_run { - args: "run jsr/deps/main.ts", - output: "jsr/deps/main.out", - envs: env_vars_for_jsr_tests(), - http_server: true, -}); - -itest!(deps_info { - args: "info jsr/deps/main.ts", - output: "jsr/deps/main_info.out", - envs: env_vars_for_jsr_tests(), - http_server: true, -}); - -itest!(import_https_url_analyzable { - args: "run -A jsr/import_https_url/analyzable.ts", - output: "jsr/import_https_url/analyzable.out", - envs: env_vars_for_jsr_tests(), - http_server: true, - exit_code: 1, -}); - -itest!(import_https_url_unanalyzable { - args: "run -A jsr/import_https_url/unanalyzable.ts", - output: "jsr/import_https_url/unanalyzable.out", - envs: env_vars_for_jsr_tests(), - http_server: true, - exit_code: 1, -}); - -itest!(subset_type_graph { - args: "check --all jsr/subset_type_graph/main.ts", - output: "jsr/subset_type_graph/main.check.out", - envs: env_vars_for_jsr_tests(), - http_server: true, - exit_code: 1, -}); - #[test] fn fast_check_cache() { let test_context = TestContextBuilder::for_jsr().use_temp_cwd().build(); @@ -197,14 +121,6 @@ export function asdf(a: number) { let err: number = ''; return Math.random(); } ); } -itest!(version_not_found { - args: "run jsr/version_not_found/main.ts", - output: "jsr/version_not_found/main.out", - envs: env_vars_for_jsr_tests(), - http_server: true, - exit_code: 1, -}); - #[test] fn specifiers_in_lockfile() { let test_context = TestContextBuilder::for_jsr().use_temp_cwd().build(); @@ -478,19 +394,3 @@ fn set_lockfile_pkg_integrity( .unwrap() .integrity = integrity.to_string(); } - -itest!(jsx_with_no_pragmas { - args: "run jsr/jsx_with_no_pragmas/main.ts", - output: "jsr/jsx_with_no_pragmas/main.out", - envs: env_vars_for_jsr_npm_tests(), - http_server: true, - exit_code: 1, -}); - -itest!(jsx_with_pragmas { - args: "run jsr/jsx_with_pragmas/main.ts", - output: "jsr/jsx_with_pragmas/main.out", - envs: env_vars_for_jsr_npm_tests(), - http_server: true, - exit_code: 0, -}); diff --git a/tests/integration/jupyter_tests.rs b/tests/integration/jupyter_tests.rs deleted file mode 100644 index 547861258..000000000 --- a/tests/integration/jupyter_tests.rs +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. - -use test_util::itest; - -itest!(jupyter_install_command_not_exists { - args: "jupyter --install", - output: "jupyter/install_command_not_exists.out", - envs: vec![("PATH".to_string(), "".to_string())], - exit_code: 1, -}); diff --git a/tests/integration/mod.rs b/tests/integration/mod.rs index 9253cae32..40dd880b5 100644 --- a/tests/integration/mod.rs +++ b/tests/integration/mod.rs @@ -38,8 +38,6 @@ mod install; mod js_unit_tests; #[path = "jsr_tests.rs"] mod jsr; -#[path = "jupyter_tests.rs"] -mod jupyter; #[path = "lint_tests.rs"] mod lint; #[path = "lsp_tests.rs"] |