summaryrefslogtreecommitdiff
path: root/cli/tools/test.rs
diff options
context:
space:
mode:
Diffstat (limited to 'cli/tools/test.rs')
-rw-r--r--cli/tools/test.rs24
1 files changed, 5 insertions, 19 deletions
diff --git a/cli/tools/test.rs b/cli/tools/test.rs
index 56674b976..c4c39ede3 100644
--- a/cli/tools/test.rs
+++ b/cli/tools/test.rs
@@ -7,7 +7,6 @@ use crate::args::TypeCheckMode;
use crate::colors;
use crate::display;
use crate::file_fetcher::File;
-use crate::graph_util::contains_specifier;
use crate::graph_util::graph_valid;
use crate::ops;
use crate::proc_state::ProcState;
@@ -32,7 +31,6 @@ use deno_core::futures::StreamExt;
use deno_core::parking_lot::Mutex;
use deno_core::url::Url;
use deno_core::ModuleSpecifier;
-use deno_graph::ModuleKind;
use deno_runtime::fmt_errors::format_js_error;
use deno_runtime::ops::io::Stdio;
use deno_runtime::ops::io::StdioPipe;
@@ -1374,19 +1372,9 @@ pub async fn run_tests_with_watch(
let mut modules_to_reload = if files_changed {
Vec::new()
} else {
- test_modules
- .iter()
- .map(|url| (url.clone(), ModuleKind::Esm))
- .collect()
+ test_modules.clone()
};
- let graph = ps
- .create_graph(
- test_modules
- .iter()
- .map(|s| (s.clone(), ModuleKind::Esm))
- .collect(),
- )
- .await?;
+ let graph = ps.create_graph(test_modules.clone()).await?;
graph_valid(&graph, !no_check, ps.options.check_js())?;
// TODO(@kitsonk) - This should be totally derivable from the graph.
@@ -1445,7 +1433,7 @@ pub async fn run_tests_with_watch(
deno_core::resolve_url_or_path(&path.to_string_lossy()).ok()
}) {
if modules.contains(&path) {
- modules_to_reload.push((specifier, ModuleKind::Esm));
+ modules_to_reload.push(specifier);
break;
}
}
@@ -1476,7 +1464,7 @@ pub async fn run_tests_with_watch(
})
};
- let operation = |modules_to_reload: Vec<(ModuleSpecifier, ModuleKind)>| {
+ let operation = |modules_to_reload: Vec<ModuleSpecifier>| {
let permissions = &permissions;
let test_options = &test_options;
ps.borrow_mut().reset_for_file_watcher();
@@ -1490,9 +1478,7 @@ pub async fn run_tests_with_watch(
)
.await?
.into_iter()
- .filter(|(specifier, _)| {
- contains_specifier(&modules_to_reload, specifier)
- })
+ .filter(|(specifier, _)| modules_to_reload.contains(specifier))
.collect::<Vec<(ModuleSpecifier, TestMode)>>();
check_specifiers(&ps, permissions.clone(), specifiers_with_mode.clone())