fix failing windows test

denoland · dsherret · Sep 26, 2024 · Sep 5, 2024 · Sep 5, 2024 · Sep 17, 2024
commit c66b814b264b8071e61e4945aac25d0c35200e4c
diff --git a/cli/file_fetcher.rs b/cli/file_fetcher.rs
@@ -23,6 +23,7 @@ use deno_graph::source::LoaderChecksum;
 
 use deno_runtime::deno_permissions::PermissionsContainer;
 use deno_runtime::deno_web::BlobStore;
+use deno_runtime::fs_util::specifier_to_file_path;
 use log::debug;
 use std::borrow::Cow;
 use std::collections::HashMap;
@@ -135,7 +136,7 @@ impl MemoryFiles {
 
 /// Fetch a source file from the local file system.
 fn fetch_local(specifier: &ModuleSpecifier) -> Result<File, AnyError> {
-  let local = specifier.to_file_path().map_err(|_| {
+  let local = specifier_to_file_path(specifier).map_err(|_| {
     uri_error(format!("Invalid file path.\n  Specifier: {specifier}"))
   })?;
   // If it doesnt have a extension, we want to treat it as typescript by default

diff --git a/tests/integration/run_tests.rs b/tests/integration/run_tests.rs
@@ -5137,21 +5137,23 @@ fn emit_failed_readonly_file_system() {
 fn handle_invalid_path_error() {
   let deno_cmd = util::deno_cmd_with_deno_dir(&util::new_deno_dir());
   let output = deno_cmd.arg("run").arg("file://asdf").output().unwrap();
-  assert!(
-    String::from_utf8_lossy(&output.stderr).contains("Invalid file path.")
+  assert_contains!(
+    String::from_utf8_lossy(&output.stderr),
+    "Invalid file path."
   );
 
   let deno_cmd = util::deno_cmd_with_deno_dir(&util::new_deno_dir());
   let output = deno_cmd.arg("run").arg("/a/b").output().unwrap();
-  assert!(String::from_utf8_lossy(&output.stderr).contains("Module not found"));
+  assert_contains!(String::from_utf8_lossy(&output.stderr), "Module not found");
 
   let deno_cmd = util::deno_cmd_with_deno_dir(&util::new_deno_dir());
   let output = deno_cmd.arg("run").arg("//a/b").output().unwrap();
-  assert!(
-    String::from_utf8_lossy(&output.stderr).contains("Invalid file path.")
+  assert_contains!(
+    String::from_utf8_lossy(&output.stderr),
+    "Invalid file path."
   );
 
   let deno_cmd = util::deno_cmd_with_deno_dir(&util::new_deno_dir());
   let output = deno_cmd.arg("run").arg("///a/b").output().unwrap();
-  assert!(String::from_utf8_lossy(&output.stderr).contains("Module not found"));
+  assert_contains!(String::from_utf8_lossy(&output.stderr), "Module not found");
 }