From f6a80f34d9f750e6c9c6c40f57211fc95befdf7a Mon Sep 17 00:00:00 2001
From: Yosi Pramajaya <yosi.pramajaya@gmail.com>
Date: Wed, 24 Feb 2021 21:18:35 +0700
Subject: [PATCH] test: Fix --reload in integration_tests (#9345)

This commit removes redundant "--reload" args because "util::deno_cmd"
recreates "DENO_DIR".

This commit also fixes ta_reload in integration tests to actually test reload.
---
 cli/tests/integration_tests.rs | 20 ++++++++++++--------
 test_util/src/lib.rs           |  8 ++++++--
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/cli/tests/integration_tests.rs b/cli/tests/integration_tests.rs
index 78cecf2fbd..e57bca27f8 100644
--- a/cli/tests/integration_tests.rs
+++ b/cli/tests/integration_tests.rs
@@ -31,7 +31,6 @@ fn js_unit_tests() {
     .current_dir(util::root_path())
     .arg("run")
     .arg("--unstable")
-    .arg("--reload")
     .arg("-A")
     .arg("cli/tests/unit/unit_test_runner.ts")
     .arg("--master")
@@ -1328,31 +1327,37 @@ mod integration {
   fn ts_reload() {
     let hello_ts = util::root_path().join("cli/tests/002_hello.ts");
     assert!(hello_ts.is_file());
-    let mut initial = util::deno_cmd()
+
+    let deno_dir = TempDir::new().expect("tempdir fail");
+    let mut initial = util::deno_cmd_with_deno_dir(deno_dir.path())
       .current_dir(util::root_path())
       .arg("cache")
-      .arg("--reload")
-      .arg(hello_ts.clone())
+      .arg(&hello_ts)
       .spawn()
       .expect("failed to spawn script");
     let status_initial =
       initial.wait().expect("failed to wait for child process");
     assert!(status_initial.success());
 
-    let output = util::deno_cmd()
+    let output = util::deno_cmd_with_deno_dir(deno_dir.path())
       .current_dir(util::root_path())
       .arg("cache")
       .arg("--reload")
       .arg("-L")
       .arg("debug")
-      .arg(hello_ts)
+      .arg(&hello_ts)
       .output()
       .expect("failed to spawn script");
+
     // check the output of the the bundle program.
+    let output_path = hello_ts.canonicalize().unwrap();
     assert!(std::str::from_utf8(&output.stderr)
       .unwrap()
       .trim()
-      .contains("host.writeFile(\"deno://002_hello.js\")"));
+      .contains(&format!(
+        "host.getSourceFile(\"{}\", Latest)",
+        url::Url::from_file_path(&output_path).unwrap().as_str()
+      )));
   }
 
   #[test]
@@ -1494,7 +1499,6 @@ mod integration {
     let output = util::deno_cmd()
       .current_dir(util::root_path())
       .arg("run")
-      .arg("--reload")
       .arg(&bundle)
       .output()
       .expect("failed to spawn script");
diff --git a/test_util/src/lib.rs b/test_util/src/lib.rs
index 8dcd4f6237..5440154135 100644
--- a/test_util/src/lib.rs
+++ b/test_util/src/lib.rs
@@ -1151,11 +1151,15 @@ pub fn new_deno_dir() -> TempDir {
 }
 
 pub fn deno_cmd() -> Command {
-  let e = deno_exe_path();
   let deno_dir = new_deno_dir();
+  deno_cmd_with_deno_dir(deno_dir.path())
+}
+
+pub fn deno_cmd_with_deno_dir(deno_dir: &std::path::Path) -> Command {
+  let e = deno_exe_path();
   assert!(e.exists());
   let mut c = Command::new(e);
-  c.env("DENO_DIR", deno_dir.path());
+  c.env("DENO_DIR", deno_dir);
   c
 }