Fix cargo test when running in a terminal

Make existing tests deterministically use the no-tty path.
Previously, running cargo test in a terminal would block
on reading stdin unless </dev/null was used. This was
caused by tests reaching the interactive path for missing
parameters.

Use this as an opportunity to define some more tests,
though none that requires true interaction with stdin.

Author: yjugl

src/commands/execute.rs

@@ -137,6 +137,7 @@ fn build_parameter_map(
     metadata: &QueryMetadata,
     cli_params: &[(String, serde_json::Value)],
     interactive: bool,
+    has_tty: bool,
 ) -> Result<Option<HashMap<String, serde_json::Value>>> {
     if metadata.options.parameters.is_empty() {
         return Ok(None);
@@ -154,8 +155,6 @@ fn build_parameter_map(
         param_map.insert(name.clone(), coerced);
     }
 
-    let has_tty = std::io::stdin().is_terminal();
-
     for param in &metadata.options.parameters {
         if !param_map.contains_key(&param.name) {
             if interactive && has_tty {
@@ -290,7 +289,8 @@ pub async fn execute(
         .map(|arg| parse_parameter_arg(arg))
         .collect::<Result<Vec<_>>>()?;
 
-    let parameters = build_parameter_map(&metadata, &cli_params, interactive)?;
+    let has_tty = std::io::stdin().is_terminal();
+    let parameters = build_parameter_map(&metadata, &cli_params, interactive, has_tty)?;
 
     if let Some(ref params) = parameters {
         eprintln!("Parameters:");
@@ -584,7 +584,7 @@ mod tests {
     fn test_build_parameter_map_coerces_text_param() {
         let metadata = make_metadata_with_param("days", None);
         let cli_params = vec![("days".to_string(), serde_json::json!(90))];
-        let result = build_parameter_map(&metadata, &cli_params, false)
+        let result = build_parameter_map(&metadata, &cli_params, false, false)
             .unwrap()
             .unwrap();
         assert_eq!(result["days"], serde_json::Value::String("90".to_string()));
@@ -593,24 +593,61 @@ mod tests {
     #[test]
     fn test_build_parameter_map_interactive_no_tty_uses_default() {
         let metadata = make_metadata_with_param("p", Some(serde_json::json!("default_val")));
-        let result = build_parameter_map(&metadata, &[], true).unwrap();
+        let result = build_parameter_map(&metadata, &[], true, false).unwrap();
         let map = result.unwrap();
         assert_eq!(map["p"], serde_json::json!("default_val"));
     }
 
     #[test]
     fn test_build_parameter_map_interactive_no_tty_no_default_bails() {
         let metadata = make_metadata_with_param("p", None);
-        let err = build_parameter_map(&metadata, &[], true).unwrap_err();
+        let err = build_parameter_map(&metadata, &[], true, false).unwrap_err();
         assert!(err.to_string().contains("--param p="));
     }
 
     #[test]
     fn test_build_parameter_map_interactive_no_tty_cli_param_overrides() {
         let metadata = make_metadata_with_param("p", None);
         let cli_params = vec![("p".to_string(), serde_json::json!("provided"))];
-        let result = build_parameter_map(&metadata, &cli_params, true).unwrap();
+        let result = build_parameter_map(&metadata, &cli_params, true, false).unwrap();
+        let map = result.unwrap();
+        assert_eq!(map["p"], serde_json::json!("provided"));
+    }
+
+    #[test]
+    fn test_build_parameter_map_interactive_tty_cli_param_skips_prompt() {
+        let metadata = make_metadata_with_param("p", None);
+        let cli_params = vec![("p".to_string(), serde_json::json!("provided"))];
+        // interactive + has_tty would prompt for a missing param (blocking on
+        // stdin); supplying it via CLI must satisfy it without prompting.
+        let result = build_parameter_map(&metadata, &cli_params, true, true).unwrap();
         let map = result.unwrap();
         assert_eq!(map["p"], serde_json::json!("provided"));
     }
+
+    #[test]
+    fn test_build_parameter_map_interactive_tty_cli_param_coerces() {
+        let metadata = make_metadata_with_param("days", None);
+        let cli_params = vec![("days".to_string(), serde_json::json!(90))];
+        let result = build_parameter_map(&metadata, &cli_params, true, true)
+            .unwrap()
+            .unwrap();
+        assert_eq!(result["days"], serde_json::Value::String("90".to_string()));
+    }
+
+    #[test]
+    fn test_build_parameter_map_non_interactive_tty_uses_default() {
+        let metadata = make_metadata_with_param("p", Some(serde_json::json!("default_val")));
+        // has_tty alone must not trigger prompting when not interactive.
+        let result = build_parameter_map(&metadata, &[], false, true).unwrap();
+        let map = result.unwrap();
+        assert_eq!(map["p"], serde_json::json!("default_val"));
+    }
+
+    #[test]
+    fn test_build_parameter_map_non_interactive_tty_no_default_bails() {
+        let metadata = make_metadata_with_param("p", None);
+        let err = build_parameter_map(&metadata, &[], false, true).unwrap_err();
+        assert!(err.to_string().contains("Missing required parameter"));
+    }
 }