test: migrate logout to snapbox

Author: eth3lbert

tests/testsuite/logout.rs

@@ -1,11 +1,9 @@
 //! Tests for the `cargo logout` command.
 
-#![allow(deprecated)]
-
 use super::login::check_token;
 use cargo_test_support::paths::{self, CargoPathExt};
 use cargo_test_support::registry::TestRegistry;
-use cargo_test_support::{cargo_process, registry};
+use cargo_test_support::{cargo_process, registry, str};
 
 fn simple_logout_test(registry: &TestRegistry, reg: Option<&str>, flag: &str, note: &str) {
     let msg = reg.unwrap_or("crates-io");
@@ -15,11 +13,11 @@ fn simple_logout_test(registry: &TestRegistry, reg: Option<&str>, flag: &str, no
         cargo.replace_crates_io(registry.index_url());
     }
     cargo
-        .with_stderr(&format!(
+        .with_stderr_data(&format!(
             "\
 [LOGOUT] token for `{msg}` has been removed from local storage
-[NOTE] This does not revoke the token on the registry server.\n    \
-If you need to revoke the token, visit {note} and follow the instructions there.
+[NOTE] This does not revoke the token on the registry server.
+    If you need to revoke the token, visit {note} and follow the instructions there.
 "
         ))
         .run();
@@ -30,7 +28,11 @@ If you need to revoke the token, visit {note} and follow the instructions there.
         cargo.replace_crates_io(registry.index_url());
     }
     cargo
-        .with_stderr(&format!("[LOGOUT] not currently logged in to `{msg}`"))
+        .with_stderr_data(&format!(
+            "\
+[LOGOUT] not currently logged in to `{msg}`
+"
+        ))
         .run();
     check_token(None, reg);
 }
@@ -85,21 +87,20 @@ fn default_registry_configured() {
     check_token(Some("dummy-token"), Some("dummy-registry"));
     check_token(Some("crates-io-token"), None);
 
-    cargo_process("logout")
-        .with_stderr(
-            "\
+    cargo_process("logout").with_stderr_data(str![[r#"
 [LOGOUT] token for `dummy-registry` has been removed from local storage
 [NOTE] This does not revoke the token on the registry server.
-    If you need to revoke the token, visit the `dummy-registry` website \
-    and follow the instructions there.
-",
-        )
-        .run();
+    If you need to revoke the token, visit the `dummy-registry` website and follow the instructions there.
+
+"#]]).run();
     check_token(None, Some("dummy-registry"));
     check_token(Some("crates-io-token"), None);
 
     cargo_process("logout")
-        .with_stderr("[LOGOUT] not currently logged in to `dummy-registry`")
+        .with_stderr_data(str![[r#"
+[LOGOUT] not currently logged in to `dummy-registry`
+
+"#]])
         .run();
 }
 
@@ -111,11 +112,17 @@ fn logout_asymmetric() {
 
     cargo_process("logout --registry crates-io -Zasymmetric-token")
         .masquerade_as_nightly_cargo(&["asymmetric-token"])
-        .with_stderr("[LOGOUT] secret-key for `crates-io` has been removed from local storage")
+        .with_stderr_data(str![[r#"
+[LOGOUT] secret-key for `crates-io` has been removed from local storage
+
+"#]])
         .run();
 
     cargo_process("logout --registry crates-io -Zasymmetric-token")
         .masquerade_as_nightly_cargo(&["asymmetric-token"])
-        .with_stderr("[LOGOUT] not currently logged in to `crates-io`")
+        .with_stderr_data(str![[r#"
+[LOGOUT] not currently logged in to `crates-io`
+
+"#]])
         .run();
 }