refactor(cli): Update test to work with [email protected]

- Integration test needed to be full integration tests to have access to `CARGO_BIN_EXE_parsec-cli` env var.
- The changes above needed to how `testenv_utils` is exposed and need to import self as dev-dependencies with `testenv` feature enabled.
- Now every cli test use either `std_cmd` or `assert_cmd` macros.

Author: FirelightFlagboy

Cargo.lock

@@ -13,6 +13,10 @@ autotests = false
 name = "minimal_short_id"
 harness = false
 
+[[test]]
+name = "integration"
+path = "tests/integration/mod.rs"
+
 [features]
 use-libsodium = ["libparsec_crypto/use-libsodium"]
 vendored-openssl = ["libparsec_crypto/vendored-openssl"]
@@ -47,6 +51,7 @@ itertools = { workspace = true, features = ["use_std"] }
 [dev-dependencies]
 libparsec = { workspace = true, features = ["cli-tests"] }
 libparsec_tests_fixtures = { workspace = true }
+parsec-cli = { path = ".", features = ["testenv"] }
 
 assert_cmd = { workspace = true }
 predicates = { workspace = true, features = ["regex"] }

cli/Cargo.toml

@@ -50,7 +50,7 @@ pub async fn main(args: Args) -> anyhow::Result<()> {
 }
 
 #[derive(serde::Serialize)]
-pub(crate) struct TosReq<'a> {
+pub struct TosReq<'a> {
     tos: Option<HashMap<&'a str, &'a str>>,
 }
 
@@ -59,12 +59,12 @@ impl<'a> TosReq<'a> {
         Self { tos: None }
     }
 
-    pub(crate) fn set_tos(tos: HashMap<&'a str, &'a str>) -> Self {
+    pub fn set_tos(tos: HashMap<&'a str, &'a str>) -> Self {
         Self { tos: Some(tos) }
     }
 }
 
-pub(crate) async fn config_tos_for_org_req<'a>(
+pub async fn config_tos_for_org_req<'a>(
     addr: &ParsecAddr,
     token: &'a str,
     organization: &OrganizationID,

cli/src/commands/tos/config.rs

@@ -1,9 +1,6 @@
 pub mod commands;
 pub mod macros;
 
-#[cfg(test)]
-#[path = "../tests/integration/mod.rs"]
-mod integration_tests;
 #[cfg(any(test, feature = "testenv"))]
 pub mod testenv_utils;
 #[cfg(test)]

cli/src/lib.rs

@@ -22,7 +22,7 @@ use crate::{
 };
 
 pub const DEFAULT_ADMINISTRATION_TOKEN: &str = "s3cr3t";
-pub(crate) const DEFAULT_DEVICE_PASSWORD: &str = "P@ssw0rd.";
+pub const DEFAULT_DEVICE_PASSWORD: &str = "P@ssw0rd.";
 const RESERVED_PORT_OFFSET: u16 = 1024;
 const AVAILABLE_PORT_COUNT: u16 = u16::MAX - RESERVED_PORT_OFFSET;
 const LAST_SERVER_PID: &str = "LAST_SERVER_ID";
@@ -221,7 +221,7 @@ async fn register_new_user(
     Ok(new_device)
 }
 
-pub(crate) fn create_new_user(
+pub fn create_new_user(
     new_device: Arc<LocalDevice>,
     author: Arc<LocalDevice>,
     initial_profile: UserProfile,
@@ -246,7 +246,7 @@ pub(crate) fn create_new_user(
     (user_certificate, redacted_user_certificate)
 }
 
-pub(crate) fn create_new_device(
+pub fn create_new_device(
     new_device: Arc<LocalDevice>,
     author: Arc<LocalDevice>,
     now: DateTime,

cli/src/testenv_utils.rs

@@ -1,11 +1,11 @@
 use std::io::{BufReader, Write};
 
-use assert_cmd::cargo::CommandCargoExt;
 use libparsec::{tmp_path, TmpPath};
 
 use crate::{
-    integration_tests::{bootstrap_cli_test, wait_for},
+    bootstrap_cli_test,
     testenv_utils::{TestOrganization, DEFAULT_DEVICE_PASSWORD},
+    wait_for,
 };
 
 #[rstest::rstest]
@@ -31,20 +31,18 @@ async fn poll_and_forget(tmp_path: TmpPath) {
     )
     .stdout(predicates::str::contains("Added 0 new certificates"));
 
-    let mut process = std::process::Command::cargo_bin("parsec-cli")
-        .unwrap()
-        .args([
-            "certificate",
-            "forget-all-certificates",
-            "--device",
-            &alice.device_id.hex(),
-            "--password-stdin",
-        ])
-        .stdin(std::process::Stdio::piped())
-        .stderr(std::process::Stdio::inherit())
-        .stdout(std::process::Stdio::piped())
-        .spawn()
-        .unwrap();
+    let mut process = crate::std_cmd!(
+        "certificate",
+        "forget-all-certificates",
+        "--device",
+        &alice.device_id.hex(),
+        "--password-stdin"
+    )
+    .stdin(std::process::Stdio::piped())
+    .stderr(std::process::Stdio::inherit())
+    .stdout(std::process::Stdio::piped())
+    .spawn()
+    .unwrap();
 
     let mut stdout = BufReader::new(process.stdout.as_mut().unwrap());
     let stdin = process.stdin.as_mut().unwrap();

cli/tests/integration/certificate/poll_and_forget.rs

@@ -1,12 +1,12 @@
 use std::io::{BufReader, Write};
 
-use assert_cmd::cargo::CommandCargoExt;
 use libparsec::{tmp_path, TmpPath};
 use libparsec_tests_fixtures::prelude::*;
 
 use crate::{
-    integration_tests::{bootstrap_cli_test, wait_for},
+    bootstrap_cli_test,
     testenv_utils::{TestOrganization, DEFAULT_DEVICE_PASSWORD},
+    wait_for,
 };
 
 #[rstest::rstest]
@@ -16,21 +16,19 @@ async fn ok(tmp_path: TmpPath) {
 
     let (_, TestOrganization { alice, .. }, _) = bootstrap_cli_test(&tmp_path).await.unwrap();
 
-    let mut process = std::process::Command::cargo_bin("parsec-cli")
-        .unwrap()
-        .args([
-            "device",
-            "change-authentication",
-            "--device",
-            &alice.device_id.hex(),
-            "--password",
-            "--password-stdin",
-        ])
-        .stdin(std::process::Stdio::piped())
-        .stderr(std::process::Stdio::inherit())
-        .stdout(std::process::Stdio::piped())
-        .spawn()
-        .unwrap();
+    let mut process = crate::std_cmd!(
+        "device",
+        "change-authentication",
+        "--device",
+        &alice.device_id.hex(),
+        "--password",
+        "--password-stdin"
+    )
+    .stdin(std::process::Stdio::piped())
+    .stderr(std::process::Stdio::inherit())
+    .stdout(std::process::Stdio::piped())
+    .spawn()
+    .unwrap();
 
     let mut stdout = BufReader::new(process.stdout.as_mut().unwrap());
     let stdin = process.stdin.as_mut().unwrap();

cli/tests/integration/device/change_authentication.rs

@@ -1,7 +1,7 @@
 use libparsec::{tmp_path, TmpPath};
 
 use crate::{
-    integration_tests::bootstrap_cli_test,
+    bootstrap_cli_test,
     testenv_utils::{TestOrganization, DEFAULT_DEVICE_PASSWORD},
 };
 

cli/tests/integration/device/export_recovery_device.rs

@@ -1,10 +1,10 @@
 use libparsec::{tmp_path, DeviceLabel, TmpPath};
 
 use crate::{
-    integration_tests::bootstrap_cli_test,
+    bootstrap_cli_test,
     testenv_utils::{TestOrganization, DEFAULT_DEVICE_PASSWORD},
-    utils::start_client,
 };
+use parsec_cli::utils::start_client;
 
 #[rstest::rstest]
 #[tokio::test]

cli/tests/integration/device/import_recovery_device.rs

@@ -1,9 +1,7 @@
 use libparsec::{tmp_path, TmpPath};
 
-use crate::{
-    integration_tests::bootstrap_cli_test,
-    utils::{GREEN, RESET, YELLOW},
-};
+use crate::bootstrap_cli_test;
+use parsec_cli::utils::{GREEN, RESET, YELLOW};
 
 #[rstest::rstest]
 #[tokio::test]