refactor(cli): generalize module specifier collection (#11679)

1 files changed, 6 insertions, 14 deletions

diff --git a/cli/main.rs b/cli/main.rs
index da40e4528..9191ab86b 100644
--- a/cli/main.rs
+++ b/cli/main.rs
@@ -1019,7 +1019,6 @@ async fn test_command(
   let program_state = ProgramState::build(flags.clone()).await?;
 
   let include = include.unwrap_or_else(|| vec![".".to_string()]);
-  let cwd = std::env::current_dir().expect("No current directory");
 
   let permissions = Permissions::from_options(&flags.clone().into());
   let lib = if flags.unstable {
@@ -1040,15 +1039,13 @@ async fn test_command(
     // TODO(caspervonb) clean this up.
     let resolver = |changed: Option<Vec<PathBuf>>| {
       let test_modules_result = if doc {
-        test_runner::collect_test_module_specifiers(
+        fs_util::collect_specifiers(
           include.clone(),
-          &cwd,
           fs_util::is_supported_ext_test,
         )
       } else {
-        test_runner::collect_test_module_specifiers(
+        fs_util::collect_specifiers(
           include.clone(),
-          &cwd,
           tools::test_runner::is_supported,
         )
       };
@@ -1173,7 +1170,6 @@ async fn test_command(
     };
 
     let operation = |modules_to_reload: Vec<ModuleSpecifier>| {
-      let cwd = cwd.clone();
       let filter = filter.clone();
       let include = include.clone();
       let lib = lib.clone();
@@ -1182,9 +1178,8 @@ async fn test_command(
 
       async move {
         let doc_modules = if doc {
-          test_runner::collect_test_module_specifiers(
+          fs_util::collect_specifiers(
             include.clone(),
-            &cwd,
             fs_util::is_supported_ext_test,
           )?
         } else {
@@ -1197,9 +1192,8 @@ async fn test_command(
           .cloned()
           .collect();
 
-        let test_modules = test_runner::collect_test_module_specifiers(
+        let test_modules = fs_util::collect_specifiers(
           include.clone(),
-          &cwd,
           tools::test_runner::is_supported,
         )?;
 
@@ -1232,18 +1226,16 @@ async fn test_command(
     file_watcher::watch_func(resolver, operation, "Test").await?;
   } else {
     let doc_modules = if doc {
-      test_runner::collect_test_module_specifiers(
+      fs_util::collect_specifiers(
         include.clone(),
-        &cwd,
         fs_util::is_supported_ext_test,
       )?
     } else {
       Vec::new()
     };
 
-    let test_modules = test_runner::collect_test_module_specifiers(
+    let test_modules = fs_util::collect_specifiers(
       include.clone(),
-      &cwd,
       tools::test_runner::is_supported,
     )?;