4 files changed, 49 insertions, 23 deletions
diff --git a/cli/tests/integration/coverage_tests.rs b/cli/tests/integration/coverage_tests.rs
index 0ac5974a6..f256d0121 100644
--- a/cli/tests/integration/coverage_tests.rs
+++ b/cli/tests/integration/coverage_tests.rs
@@ -38,10 +38,9 @@ fn no_tests() {
 #[test]
 fn error_if_invalid_cache() {
   let context = TestContextBuilder::new().use_temp_cwd().build();
-  let deno_dir = context.deno_dir();
-  let deno_dir_path = deno_dir.path();
-  let tempdir = TempDir::new();
-  let tempdir = tempdir.path().join("cov");
+  let temp_dir_path = context.temp_dir().path();
+  let other_temp_dir = TempDir::new();
+  let other_tempdir = other_temp_dir.path().join("cov");
 
   let invalid_cache_path = util::testdata_path().join("coverage/invalid_cache");
   let mod_before_path = util::testdata_path()
@@ -54,8 +53,8 @@ fn error_if_invalid_cache() {
     .join(&invalid_cache_path)
     .join("mod.test.ts");
 
-  let mod_temp_path = deno_dir_path.join("mod.ts");
-  let mod_test_temp_path = deno_dir_path.join("mod.test.ts");
+  let mod_temp_path = temp_dir_path.join("mod.ts");
+  let mod_test_temp_path = temp_dir_path.join("mod.test.ts");
 
   // Write the initial mod.ts file
   std::fs::copy(mod_before_path, &mod_temp_path).unwrap();
@@ -68,7 +67,7 @@ fn error_if_invalid_cache() {
     .args_vec(vec![
       "test".to_string(),
       "--quiet".to_string(),
-      format!("--coverage={}", tempdir),
+      format!("--coverage={}", other_tempdir),
     ])
     .run();
 
@@ -80,7 +79,7 @@ fn error_if_invalid_cache() {
 
   let output = context
     .new_command()
-    .args_vec(vec!["coverage".to_string(), format!("{}/", tempdir)])
+    .args_vec(vec!["coverage".to_string(), format!("{}/", other_tempdir)])
     .run();
 
   output.assert_exit_code(1);
@@ -94,7 +93,7 @@ fn error_if_invalid_cache() {
 
 fn run_coverage_text(test_name: &str, extension: &str) {
   let context = TestContext::default();
-  let tempdir = context.deno_dir();
+  let tempdir = context.temp_dir();
   let tempdir = tempdir.path().join("cov");
 
   let output = context
@@ -164,7 +163,7 @@ fn run_coverage_text(test_name: &str, extension: &str) {
 #[test]
 fn multifile_coverage() {
   let context = TestContext::default();
-  let tempdir = context.deno_dir();
+  let tempdir = context.temp_dir();
   let tempdir = tempdir.path().join("cov");
 
   let output = context
@@ -231,7 +230,7 @@ fn multifile_coverage() {
 
 fn no_snaps_included(test_name: &str, extension: &str) {
   let context = TestContext::default();
-  let tempdir = context.deno_dir();
+  let tempdir = context.temp_dir();
   let tempdir = tempdir.path().join("cov");
 
   let output = context
@@ -279,7 +278,7 @@ fn no_snaps_included(test_name: &str, extension: &str) {
 
 fn no_tests_included(test_name: &str, extension: &str) {
   let context = TestContext::default();
-  let tempdir = context.deno_dir();
+  let tempdir = context.temp_dir();
   let tempdir = tempdir.path().join("cov");
 
   let output = context
@@ -328,7 +327,7 @@ fn no_tests_included(test_name: &str, extension: &str) {
 #[test]
 fn no_npm_cache_coverage() {
   let context = TestContext::default();
-  let tempdir = context.deno_dir();
+  let tempdir = context.temp_dir();
   let tempdir = tempdir.path().join("cov");
 
   let output = context
@@ -373,7 +372,7 @@ fn no_npm_cache_coverage() {
 #[test]
 fn no_transpiled_lines() {
   let context = TestContext::default();
-  let tempdir = context.deno_dir();
+  let tempdir = context.temp_dir();
   let tempdir = tempdir.path().join("cov");
 
   let output = context
diff --git a/cli/tests/integration/init_tests.rs b/cli/tests/integration/init_tests.rs
index d92bfd371..e3f146c2a 100644
--- a/cli/tests/integration/init_tests.rs
+++ b/cli/tests/integration/init_tests.rs
@@ -7,9 +7,7 @@ use util::TestContextBuilder;
 #[test]
 fn init_subcommand_without_dir() {
   let context = TestContextBuilder::new().use_temp_cwd().build();
-  let deno_dir = context.deno_dir();
-
-  let cwd = deno_dir.path();
+  let cwd = context.temp_dir().path();
 
   let output = context.new_command().args("init").split_output().run();
 
@@ -59,8 +57,7 @@ fn init_subcommand_without_dir() {
 #[test]
 fn init_subcommand_with_dir_arg() {
   let context = TestContextBuilder::new().use_temp_cwd().build();
-  let deno_dir = context.deno_dir();
-  let cwd = deno_dir.path();
+  let cwd = context.temp_dir().path();
 
   let output = context
     .new_command()
@@ -117,8 +114,7 @@ fn init_subcommand_with_dir_arg() {
 #[test]
 fn init_subcommand_with_quiet_arg() {
   let context = TestContextBuilder::new().use_temp_cwd().build();
-  let deno_dir = context.deno_dir();
-  let cwd = deno_dir.path();
+  let cwd = context.temp_dir().path();
 
   let output = context
     .new_command()
diff --git a/cli/tests/integration/lsp_tests.rs b/cli/tests/integration/lsp_tests.rs
index dc68ab514..15ede69ea 100644
--- a/cli/tests/integration/lsp_tests.rs
+++ b/cli/tests/integration/lsp_tests.rs
@@ -611,6 +611,39 @@ fn lsp_import_map_config_file_auto_discovered_symlink() {
 }
 
 #[test]
+fn lsp_import_map_node_specifiers() {
+  let context = TestContextBuilder::for_npm().use_temp_cwd().build();
+  let temp_dir = context.temp_dir();
+
+  temp_dir.write("deno.json", r#"{ "imports": { "fs": "node:fs" } }"#);
+
+  // cache @types/node
+  context
+    .new_command()
+    .args("cache npm:@types/node")
+    .run()
+    .skip_output_check()
+    .assert_exit_code(0);
+
+  let mut client = context.new_lsp_command().build();
+  client.initialize(|builder| {
+    builder.set_config("./deno.json");
+  });
+
+  let diagnostics = client.did_open(json!({
+    "textDocument": {
+      "uri": temp_dir.uri().join("a.ts").unwrap(),
+      "languageId": "typescript",
+      "version": 1,
+      "text": "import fs from \"fs\";\nconsole.log(fs);"
+    }
+  }));
+  assert_eq!(diagnostics.all(), vec![]);
+
+  client.shutdown();
+}
+
+#[test]
 fn lsp_deno_task() {
   let context = TestContextBuilder::new().use_temp_cwd().build();
   let temp_dir = context.temp_dir();
diff --git a/cli/tests/integration/npm_tests.rs b/cli/tests/integration/npm_tests.rs
index f1ba0cdfa..e14da4aca 100644
--- a/cli/tests/integration/npm_tests.rs
+++ b/cli/tests/integration/npm_tests.rs
@@ -1524,7 +1524,6 @@ fn auto_discover_lock_file() {
 fn peer_deps_with_copied_folders_and_lockfile() {
   let context = TestContextBuilder::for_npm()
     .use_sync_npm_download()
-    .use_separate_deno_dir() // the "npm" folder means something in the deno dir, so use a separate folder
     .use_copy_temp_dir("npm/peer_deps_with_copied_folders")
     .cwd("npm/peer_deps_with_copied_folders")
     .build();
@@ -1906,7 +1905,6 @@ fn reload_info_not_found_cache_but_exists_remote() {
 fn binary_package_with_optional_dependencies() {
   let context = TestContextBuilder::for_npm()
     .use_sync_npm_download()
-    .use_separate_deno_dir() // the "npm" folder means something in the deno dir, so use a separate folder
     .use_copy_temp_dir("npm/binary_package")
     .cwd("npm/binary_package")
     .build();