@@ -5,7 +5,7 @@ use garden::model;
55use garden:: string;
66
77use anyhow:: Result ;
8- use assert_cmd:: prelude :: CommandCargoExt ;
8+ use assert_cmd:: cargo ;
99
1010use std:: process:: Command ;
1111
@@ -147,7 +147,8 @@ pub fn exec_garden(args: &[&str]) -> Result<()> {
147147 argv. extend ( args) ;
148148 display:: print_command_vec ( & argv) ;
149149
150- let mut exec = Command :: cargo_bin ( "garden" ) . expect ( "garden not found" ) ;
150+ let garden_path = cargo:: cargo_bin!( "garden" ) ;
151+ let mut exec = Command :: new ( garden_path) ;
151152 exec. args ( args) ;
152153
153154 assert ! ( exec. status( ) . expect( "garden returned an error" ) . success( ) ) ;
@@ -161,7 +162,8 @@ pub fn garden_capture(args: &[&str]) -> String {
161162 argv. extend ( args) ;
162163 display:: print_command_vec ( & argv) ;
163164
164- let mut exec = Command :: cargo_bin ( "garden" ) . expect ( "garden not found" ) ;
165+ let garden_path = cargo:: cargo_bin!( "garden" ) ;
166+ let mut exec = Command :: new ( garden_path) ;
165167 exec. args ( args) ;
166168 let capture = exec. output ( ) ;
167169 assert ! ( capture. is_ok( ) ) ;
@@ -179,7 +181,8 @@ pub fn garden_exec(args: &[&str]) -> (i32, String, String) {
179181 argv. extend ( args) ;
180182 display:: print_command_vec ( & argv) ;
181183
182- let mut exec = Command :: cargo_bin ( "garden" ) . expect ( "garden not found" ) ;
184+ let garden_path = cargo:: cargo_bin!( "garden" ) ;
185+ let mut exec = Command :: new ( garden_path) ;
183186 exec. args ( args) ;
184187 let output_result = exec. output ( ) ;
185188 assert ! ( output_result. is_ok( ) ) ;
0 commit comments