diff options
| author | Asher Gomez <ashersaupingomez@gmail.com> | 2024-07-25 10:26:54 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-25 10:26:54 +1000 |
| commit | f248050cb467eaed8d65428b8808254e26797cc5 (patch) | |
| tree | 7e43f16a8754a6313f65f0f65c037fdae2ce986f /tests/integration | |
| parent | 795ed23b356dc044cfb497a6189d588604a6c335 (diff) | |
chore: use `@std` prefix for internal module specifiers (#24543)
This change aims to replace all relative import specifiers targeted at
`tests/util/std` with mapped ones (using a `deno.json` file). Towards
updating the `std` git submodule.
Diffstat (limited to 'tests/integration')
| -rw-r--r-- | tests/integration/compile_tests.rs | 2 | ||||
| -rw-r--r-- | tests/integration/coverage_tests.rs | 6 | ||||
| -rw-r--r-- | tests/integration/run_tests.rs | 10 | ||||
| -rw-r--r-- | tests/integration/test_tests.rs | 4 |
4 files changed, 17 insertions, 5 deletions
diff --git a/tests/integration/compile_tests.rs b/tests/integration/compile_tests.rs index 17054637e..df9ea26df 100644 --- a/tests/integration/compile_tests.rs +++ b/tests/integration/compile_tests.rs @@ -195,6 +195,8 @@ fn standalone_follow_redirects() { "compile", "--output", &exe.to_string_lossy(), + "--config", + "../config/deno.json", "./compile/standalone_follow_redirects.ts", ]) .run() diff --git a/tests/integration/coverage_tests.rs b/tests/integration/coverage_tests.rs index 51b82af07..c5f8b1453 100644 --- a/tests/integration/coverage_tests.rs +++ b/tests/integration/coverage_tests.rs @@ -216,6 +216,8 @@ fn no_snaps_included(test_name: &str, extension: &str) { "--quiet".to_string(), "--allow-read".to_string(), format!("--coverage={}", tempdir), + "--config".to_string(), + "../config/deno.json".to_string(), format!("coverage/no_snaps_included/{test_name}_test.{extension}"), ]) .run(); @@ -256,6 +258,8 @@ fn no_tests_included(test_name: &str, extension: &str) { "--quiet".to_string(), "--allow-read".to_string(), format!("--coverage={}", tempdir), + "--config".to_string(), + "../config/deno.json".to_string(), format!("coverage/no_tests_included/{test_name}.test.{extension}"), ]) .run(); @@ -337,6 +341,8 @@ fn no_transpiled_lines() { "test".to_string(), "--quiet".to_string(), format!("--coverage={}", tempdir), + "--config".to_string(), + "../config/deno.json".to_string(), "coverage/no_transpiled_lines/".to_string(), ]) .run(); diff --git a/tests/integration/run_tests.rs b/tests/integration/run_tests.rs index 6a9b47b1a..73d98aff5 100644 --- a/tests/integration/run_tests.rs +++ b/tests/integration/run_tests.rs @@ -206,7 +206,7 @@ itest!(_033_import_map_data_uri { }); itest!(onload { - args: "run --quiet --reload run/onload/main.ts", + args: "run --quiet --reload --config ../config/deno.json run/onload/main.ts", output: "run/onload/main.out", }); @@ -3163,12 +3163,12 @@ mod permissions { } itest!(tls_starttls { - args: "run --quiet --reload --allow-net --allow-read --cert tls/RootCA.pem run/tls_starttls.js", + args: "run --quiet --reload --allow-net --allow-read --cert tls/RootCA.pem --config ../config/deno.json run/tls_starttls.js", output: "run/tls.out", }); itest!(tls_connecttls { - args: "run --quiet --reload --allow-net --allow-read --cert tls/RootCA.pem run/tls_connecttls.js", + args: "run --quiet --reload --allow-net --allow-read --cert tls/RootCA.pem --config ../config/deno.json run/tls_connecttls.js", output: "run/tls.out", }); @@ -4512,6 +4512,8 @@ async fn websocket_server_idletimeout() { .arg("--allow-net") .arg("--cert") .arg(root_ca) + .arg("--config") + .arg("./config/deno.json") .arg(script) .stdout_piped() .spawn() @@ -5377,6 +5379,8 @@ async fn listen_tls_alpn_fail() { .arg("--quiet") .arg("--allow-net") .arg("--allow-read") + .arg("--config") + .arg("../config/deno.json") .arg("./cert/listen_tls_alpn_fail.ts") .arg("4505") .stdout_piped() diff --git a/tests/integration/test_tests.rs b/tests/integration/test_tests.rs index 2f5a620e1..d4934e03c 100644 --- a/tests/integration/test_tests.rs +++ b/tests/integration/test_tests.rs @@ -251,13 +251,13 @@ itest!(no_run { }); itest!(allow_all { - args: "test --allow-all test/allow_all.ts", + args: "test --config ../config/deno.json --allow-all test/allow_all.ts", exit_code: 0, output: "test/allow_all.out", }); itest!(allow_none { - args: "test test/allow_none.ts", + args: "test --config ../config/deno.json test/allow_none.ts", exit_code: 1, output: "test/allow_none.out", }); |
