diff options
| author | David Sherret <dsherret@users.noreply.github.com> | 2023-08-21 11:53:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-21 09:53:52 +0000 |
| commit | 5834d282d4de5d0b5cacb9bf068f3896bef0a48a (patch) | |
| tree | 0e1d15e9f81600ce3c910a70c6e7c12952778f72 /cli/tests/integration | |
| parent | af125c8e700eacc7360b3d81ffe4de13e12a612a (diff) | |
refactor: upgrade deno_ast 0.28 and deno_semver 0.4 (#20193)
Diffstat (limited to 'cli/tests/integration')
| -rw-r--r-- | cli/tests/integration/compile_tests.rs | 4 | ||||
| -rw-r--r-- | cli/tests/integration/inspector_tests.rs | 8 | ||||
| -rw-r--r-- | cli/tests/integration/npm_tests.rs | 12 |
3 files changed, 15 insertions, 9 deletions
diff --git a/cli/tests/integration/compile_tests.rs b/cli/tests/integration/compile_tests.rs index 022148ce4..f43b1cff9 100644 --- a/cli/tests/integration/compile_tests.rs +++ b/cli/tests/integration/compile_tests.rs @@ -120,9 +120,9 @@ fn standalone_error() { assert_contains!(stderr, "error: Uncaught Error: boom!"); assert_contains!(stderr, "throw new Error(\"boom!\");"); assert_contains!(stderr, "\n at boom (file://"); - assert_contains!(stderr, "standalone_error.ts:2:11"); + assert_contains!(stderr, "standalone_error.ts:2:9"); assert_contains!(stderr, "at foo (file://"); - assert_contains!(stderr, "standalone_error.ts:5:5"); + assert_contains!(stderr, "standalone_error.ts:5:3"); assert_contains!(stderr, "standalone_error.ts:7:1"); } diff --git a/cli/tests/integration/inspector_tests.rs b/cli/tests/integration/inspector_tests.rs index 79422ee5a..c507204e4 100644 --- a/cli/tests/integration/inspector_tests.rs +++ b/cli/tests/integration/inspector_tests.rs @@ -75,6 +75,12 @@ struct InspectorTester { stdout_lines: Box<dyn Iterator<Item = String>>, } +impl Drop for InspectorTester { + fn drop(&mut self) { + _ = self.child.kill(); + } +} + fn ignore_script_parsed(msg: &str) -> bool { !msg.starts_with(r#"{"method":"Debugger.scriptParsed","#) } @@ -953,7 +959,7 @@ async fn inspector_with_ts_files() { tester.assert_received_messages( &[ r#"{"id":4,"result":{"scriptSource":"import { foo } from \"./foo.ts\";\nimport { bar } from \"./bar.js\";\nconsole.log(foo());\nconsole.log(bar());\n//# sourceMappingURL=data:application/json;base64,"#, - r#"{"id":5,"result":{"scriptSource":"class Foo {\n hello() {\n return \"hello\";\n }\n}\nexport function foo() {\n const f = new Foo();\n return f.hello();\n}\n//# sourceMappingURL=data:application/json;base64,"#, + r#"{"id":5,"result":{"scriptSource":"class Foo {\n hello() {\n return \"hello\";\n }\n}\nexport function foo() {\n const f = new Foo();\n return f.hello();\n}\n//# sourceMappingURL=data:application/json;base64,"#, r#"{"id":6,"result":{"scriptSource":"export function bar() {\n return \"world\";\n}\n"#, ], &[], diff --git a/cli/tests/integration/npm_tests.rs b/cli/tests/integration/npm_tests.rs index f27befe54..1352777d2 100644 --- a/cli/tests/integration/npm_tests.rs +++ b/cli/tests/integration/npm_tests.rs @@ -988,12 +988,12 @@ fn ensure_registry_files_local() { } itest!(bundle_errors { - args: "bundle --quiet npm/esm/main.js", - output_str: Some("error: npm specifiers have not yet been implemented for this subcommand (https://github.com/denoland/deno/issues/15960). Found: npm:chalk@5.0.1\n"), - exit_code: 1, - envs: env_vars_for_npm_tests(), - http_server: true, - }); + args: "bundle --quiet npm/esm/main.js", + output_str: Some("error: npm specifiers have not yet been implemented for this subcommand (https://github.com/denoland/deno/issues/15960). Found: npm:/chalk@5.0.1\n"), + exit_code: 1, + envs: env_vars_for_npm_tests(), + http_server: true, +}); itest!(info_chalk_display { args: "info --quiet npm/cjs_with_deps/main.js", |