From 16cbed7d6e93806d5b94bcbb90297b030b4796c9 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Fri, 5 Apr 2024 20:57:47 -0700
Subject: [PATCH] Fix some of the tests in `tests::shell` (#12417)

# Description
Some of the tests in `tests::shell` were using `sh` unnecessarily, and
had `#[cfg(not(windows))]` when they should be testable on Windows if
`sh` is not used.

I also found that they were using `.expect()` incorrectly, under the
assumption that that would check their output, when really an
`assert_eq!` on the output is needed to do that. So these tests weren't
even really working properly before.

# User-Facing Changes
None

# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
---
 tests/shell/mod.rs | 48 ++++++++++++++++------------------------------
 1 file changed, 16 insertions(+), 32 deletions(-)

diff --git a/tests/shell/mod.rs b/tests/shell/mod.rs
index 5c0f367e46..bd49cc0c64 100644
--- a/tests/shell/mod.rs
+++ b/tests/shell/mod.rs
@@ -229,62 +229,46 @@ fn run_export_extern() {
 }
 
 #[test]
-#[cfg(not(windows))]
 fn run_in_login_mode() {
-    let child_output = std::process::Command::new("sh")
-        .arg("-c")
-        .arg(format!(
-            "{:?} --no-config-file --login --commands 'echo $nu.is-login'",
-            nu_test_support::fs::executable_path()
-        ))
+    let child_output = std::process::Command::new(nu_test_support::fs::executable_path())
+        .args(["-n", "-l", "-c", "echo $nu.is-login"])
         .output()
-        .expect("true");
+        .expect("failed to run nu");
 
+    assert_eq!("true\n", String::from_utf8_lossy(&child_output.stdout));
     assert!(child_output.stderr.is_empty());
 }
 
 #[test]
-#[cfg(not(windows))]
 fn run_in_not_login_mode() {
-    let child_output = std::process::Command::new("sh")
-        .arg("-c")
-        .arg(format!(
-            "{:?} -c 'echo $nu.is-login'",
-            nu_test_support::fs::executable_path()
-        ))
+    let child_output = std::process::Command::new(nu_test_support::fs::executable_path())
+        .args(["-c", "echo $nu.is-login"])
         .output()
-        .expect("false");
+        .expect("failed to run nu");
 
+    assert_eq!("false\n", String::from_utf8_lossy(&child_output.stdout));
     assert!(child_output.stderr.is_empty());
 }
 
 #[test]
-#[cfg(not(windows))]
 fn run_in_interactive_mode() {
-    let child_output = std::process::Command::new("sh")
-        .arg("-c")
-        .arg(format!(
-            "{:?} -i -c 'echo $nu.is-interactive'",
-            nu_test_support::fs::executable_path()
-        ))
+    let child_output = std::process::Command::new(nu_test_support::fs::executable_path())
+        .args(["-i", "-c", "echo $nu.is-interactive"])
         .output()
-        .expect("true");
+        .expect("failed to run nu");
 
+    assert_eq!("true\n", String::from_utf8_lossy(&child_output.stdout));
     assert!(child_output.stderr.is_empty());
 }
 
 #[test]
-#[cfg(not(windows))]
 fn run_in_noninteractive_mode() {
-    let child_output = std::process::Command::new("sh")
-        .arg("-c")
-        .arg(format!(
-            "{:?} -c 'echo $nu.is-interactive'",
-            nu_test_support::fs::executable_path()
-        ))
+    let child_output = std::process::Command::new(nu_test_support::fs::executable_path())
+        .args(["-c", "echo $nu.is-interactive"])
         .output()
-        .expect("false");
+        .expect("failed to run nu");
 
+    assert_eq!("false\n", String::from_utf8_lossy(&child_output.stdout));
     assert!(child_output.stderr.is_empty());
 }