From d39094913e91e5193f63459d9c5ca6ddc7779477 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Fri, 24 Jun 2022 12:00:53 +0200
Subject: fix: don't error if Deno.bench() or Deno.test() are used in run
 subcommand (#14946)

---
 cli/lsp/testing/execution.rs                | 5 +++++
 cli/tests/integration/run_tests.rs          | 5 +++++
 cli/tests/testdata/test_and_bench_in_run.js | 5 +++++
 cli/tools/bench.rs                          | 5 +++++
 cli/tools/test.rs                           | 5 +++++
 5 files changed, 25 insertions(+)
 create mode 100644 cli/tests/testdata/test_and_bench_in_run.js

(limited to 'cli')

diff --git a/cli/lsp/testing/execution.rs b/cli/lsp/testing/execution.rs
index 4f4b9bf1f..03fdba63c 100644
--- a/cli/lsp/testing/execution.rs
+++ b/cli/lsp/testing/execution.rs
@@ -199,6 +199,11 @@ async fn test_specifier(
       },
     );
 
+    worker.js_runtime.execute_script(
+      &located_script_name!(),
+      r#"Deno[Deno.internal].enableTestAndBench()"#,
+    )?;
+
     worker
       .execute_script(
         &located_script_name!(),
diff --git a/cli/tests/integration/run_tests.rs b/cli/tests/integration/run_tests.rs
index fb0d6313b..09a1ba500 100644
--- a/cli/tests/integration/run_tests.rs
+++ b/cli/tests/integration/run_tests.rs
@@ -2728,3 +2728,8 @@ fn running_declaration_files() {
     assert!(output.status.success());
   }
 }
+
+itest!(test_and_bench_are_noops_in_run {
+  args: "run test_and_bench_in_run.js",
+  output_str: Some(""),
+});
diff --git a/cli/tests/testdata/test_and_bench_in_run.js b/cli/tests/testdata/test_and_bench_in_run.js
new file mode 100644
index 000000000..108ae937a
--- /dev/null
+++ b/cli/tests/testdata/test_and_bench_in_run.js
@@ -0,0 +1,5 @@
+Deno.test(function foo() {
+});
+
+Deno.bench(function bar() {
+});
diff --git a/cli/tools/bench.rs b/cli/tools/bench.rs
index e88151648..b51938d13 100644
--- a/cli/tools/bench.rs
+++ b/cli/tools/bench.rs
@@ -369,6 +369,11 @@ async fn bench_specifier(
     Default::default(),
   );
 
+  worker.js_runtime.execute_script(
+    &located_script_name!(),
+    r#"Deno[Deno.internal].enableTestAndBench()"#,
+  )?;
+
   if options.compat_mode {
     worker.execute_side_module(&compat::GLOBAL_URL).await?;
     worker.execute_side_module(&compat::MODULE_URL).await?;
diff --git a/cli/tools/test.rs b/cli/tools/test.rs
index 170c1a12d..94412a3ae 100644
--- a/cli/tools/test.rs
+++ b/cli/tools/test.rs
@@ -743,6 +743,11 @@ async fn test_specifier(
     },
   );
 
+  worker.js_runtime.execute_script(
+    &located_script_name!(),
+    r#"Deno[Deno.internal].enableTestAndBench()"#,
+  )?;
+
   let mut maybe_coverage_collector = if let Some(ref coverage_dir) =
     ps.coverage_dir
   {
-- 
cgit v1.2.3