tests: restore use of Command::cargo_bin() to support running under "cross"

Author: davvid

Cargo.toml

@@ -18,7 +18,7 @@ package.version = "2.4.0-alpha.1"
 [workspace.dependencies]
 garden-tools = { path = ".", version = "2.4.0-alpha.1" }
 anyhow = "1.0"
-assert_cmd = "2.0"
+assert_cmd = "2.1"
 better_default = "1.0"
 clap = { version = "4.5", features = ["cargo", "derive", "string"] }
 clap-cargo = "0.17"

tests/common/mod.rs

@@ -5,7 +5,7 @@ use garden::model;
 use garden::string;
 
 use anyhow::Result;
-use assert_cmd::cargo;
+use assert_cmd::prelude::CommandCargoExt;
 
 use std::process::Command;
 
@@ -147,8 +147,7 @@ pub fn exec_garden(args: &[&str]) -> Result<()> {
     argv.extend(args);
     display::print_command_vec(&argv);
 
-    let garden_path = cargo::cargo_bin!("garden");
-    let mut exec = Command::new(garden_path);
+    let mut exec = Command::cargo_bin("garden").expect("garden not found");
     exec.args(args);
 
     assert!(exec.status().expect("garden returned an error").success());
@@ -162,8 +161,7 @@ pub fn garden_capture(args: &[&str]) -> String {
     argv.extend(args);
     display::print_command_vec(&argv);
 
-    let garden_path = cargo::cargo_bin!("garden");
-    let mut exec = Command::new(garden_path);
+    let mut exec = Command::cargo_bin("garden").expect("garden not found");
     exec.args(args);
     let capture = exec.output();
     assert!(capture.is_ok());
@@ -181,8 +179,7 @@ pub fn garden_exec(args: &[&str]) -> (i32, String, String) {
     argv.extend(args);
     display::print_command_vec(&argv);
 
-    let garden_path = cargo::cargo_bin!("garden");
-    let mut exec = Command::new(garden_path);
+    let mut exec = Command::cargo_bin("garden").expect("garden not found");
     exec.args(args);
     let output_result = exec.output();
     assert!(output_result.is_ok());