Update clipboard test specs.

Cargo.toml

@@ -54,7 +54,7 @@ tempfile = "3.5"
 prost = "0.13"
 clap = { version = "4.3.19", features = ["derive", "wrap_help", "env"] }
 colored = "2"
-arboard = "3"
+arboard = { version = "3", default-features = false }
 zeroize = "1"
 
 axum-server = { version = "0.7", features = ["tls-rustls-no-provider"] }

crates/account_extras/src/clipboard.rs

@@ -13,19 +13,20 @@ use zeroize::Zeroize;
 /// Wraps [arboard::Clipboard](https://docs.rs/arboard/latest/arboard/struct.Clipboard.html) and provides functions for
 /// setting clipboard text with a timeout to clear the clipboard
 /// content.
+///
 pub struct NativeClipboard {
     clipboard: Clipboard,
     timeout_seconds: u16,
 }
 
 impl NativeClipboard {
-    /// Create a new native clipboard using the default
+    /// Create a native clipboard using the default
     /// timeout of 90 seconds.
     pub fn new() -> Result<Self> {
         Self::new_timeout(90)
     }
 
-    /// Create a new native clipboard with a timeout.
+    /// Create a native clipboard with a timeout.
     pub fn new_timeout(timeout_seconds: u16) -> Result<Self> {
         Ok(Self {
             clipboard: Clipboard::new()?,

crates/account_extras/tests/clipboard.rs

@@ -2,22 +2,59 @@ use anyhow::Result;
 
 #[cfg(feature = "clipboard")]
 #[tokio::test]
+async fn clipboard() -> Result<()> {
+    // NOTE: we must run these tests in serial
+    // NOTE: as the underlying Clipboard cannot
+    // NOTE: be concurrently created on MacOS
+    // NOTE: (and possibly other platforms)
+    clipboard_timeout().await?;
+    clipboard_timeout_preserve().await?;
+    Ok(())
+}
+
+#[cfg(feature = "clipboard")]
 async fn clipboard_timeout() -> Result<()> {
     use sos_account_extras::clipboard::NativeClipboard;
     use std::time::Duration;
 
-    let mut clipboard = NativeClipboard::new_timeout(2)?;
+    let mut clipboard = NativeClipboard::new_timeout(1)?;
     let text = "mock-secret";
 
     clipboard.set_text_timeout(text).await?;
 
     let value = clipboard.get_text()?;
     assert_eq!(text, value);
 
-    tokio::time::sleep(Duration::from_secs(4)).await;
+    tokio::time::sleep(Duration::from_secs(2)).await;
 
     // Should error when the clipboard is empty
     assert!(clipboard.get_text().is_err());
 
     Ok(())
 }
+
+#[cfg(feature = "clipboard")]
+async fn clipboard_timeout_preserve() -> Result<()> {
+    use sos_account_extras::clipboard::NativeClipboard;
+    use std::time::Duration;
+
+    let mut clipboard = NativeClipboard::new_timeout(1)?;
+    let text = "mock-secret";
+    let other_value = "mock-value";
+
+    clipboard.set_text_timeout(text).await?;
+
+    let value = clipboard.get_text()?;
+    assert_eq!(text, value);
+
+    // Set to another value so the clipboard will not
+    // be cleared on timeout
+    clipboard.set_text(other_value)?;
+    tokio::time::sleep(Duration::from_secs(2)).await;
+
+    // Verify the clipboard was not cleared on timeout
+    let value = clipboard.get_text()?;
+    assert_eq!(other_value, value);
+
+    Ok(())
+}