chore(deps): bump assert_cmd from 2.0.17 to 2.1.1

crates/cargo-contract/Cargo.toml

@@ -59,7 +59,7 @@ current_platform = "0.2.0"
 which = "8.0.0"
 
 [dev-dependencies]
-assert_cmd = "=2.0.17"
+assert_cmd = "=2.1.1"
 regex = "1.11.1"
 predicates = "3.1.3"
 tempfile = "3.23.0"

crates/cargo-contract/tests/utils/mod.rs

@@ -20,7 +20,15 @@ pub mod node_proc;
 
 /// Create a `cargo contract` command
 pub fn cargo_contract<P: AsRef<Path>>(path: P) -> assert_cmd::Command {
-    let mut cmd = assert_cmd::Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
+    let mut cmd = if let Ok(nextest_bin) = std::env::var("NEXTEST_BIN_EXE_cargo-contract")
+    {
+        // When running with nextest archive, use NEXTEST_BIN_EXE_* which has the
+        // correct remapped path
+        assert_cmd::Command::new(nextest_bin)
+    } else {
+        // Fall back to cargo_bin_cmd! for normal cargo test
+        assert_cmd::cargo::cargo_bin_cmd!(env!("CARGO_PKG_NAME"))
+    };
     cmd.current_dir(path).arg("contract");
     cmd
 }

crates/extrinsics/Cargo.toml

@@ -44,7 +44,7 @@ ink_env = { workspace = true }
 
 [dev-dependencies]
 ink = { version = "6.0.0-beta.1", features = ["unstable-hostfn"] }
-assert_cmd = "=2.0.17"
+assert_cmd = "=2.1.1"
 regex = "1.11.1"
 predicates = "3.1.3"
 tempfile = "3.23.0"

crates/extrinsics/src/integration_tests.rs

@@ -66,7 +66,18 @@ const CONTRACTS_NODE: &str = "ink-node";
 
 /// Create a `cargo contract` command
 fn cargo_contract(path: &Path) -> assert_cmd::Command {
-    let mut cmd = assert_cmd::Command::cargo_bin("cargo-contract").unwrap();
+    let mut cmd = if let Ok(nextest_bin) = std::env::var("NEXTEST_BIN_EXE_cargo-contract")
+    {
+        // When running with nextest archive, use NEXTEST_BIN_EXE_* which has the
+        // correct remapped path
+        assert_cmd::Command::new(nextest_bin)
+    } else {
+        // Fall back to cargo_bin for normal cargo test
+        // Note: cargo_bin is deprecated but we can't use cargo_bin_cmd! since we're
+        // testing a binary from a different crate
+        #[allow(deprecated)]
+        assert_cmd::Command::cargo_bin("cargo-contract").unwrap()
+    };
     cmd.current_dir(path).arg("contract");
     cmd
 }