test: migrate login to snapbox

Author: eth3lbert

tests/testsuite/login.rs

@@ -1,10 +1,9 @@
 //! Tests for the `cargo login` command.
 
-#![allow(deprecated)]
-
 use cargo_test_support::cargo_process;
 use cargo_test_support::paths::{self, CargoPathExt};
 use cargo_test_support::registry::{self, RegistryBuilder};
+use cargo_test_support::str;
 use cargo_test_support::t;
 use std::fs;
 use std::path::PathBuf;
@@ -112,30 +111,28 @@ fn empty_login_token() {
     cargo_process("login")
         .replace_crates_io(registry.index_url())
         .with_stdin("\t\n")
-        .with_stderr(
-            "\
+        .with_stderr_data(str![[r#"
 [UPDATING] crates.io index
-please paste the token found on [..] below
+please paste the token found on [ROOTURL]/api/me below
 [ERROR] credential provider `cargo:token` failed action `login`
 
 Caused by:
   please provide a non-empty token
-",
-        )
+
+"#]])
         .with_status(101)
         .run();
 
     cargo_process("login")
         .replace_crates_io(registry.index_url())
         .arg("")
-        .with_stderr(
-            "\
+        .with_stderr_data(str![[r#"
 [ERROR] credential provider `cargo:token` failed action `login`
 
 Caused by:
   please provide a non-empty token
-",
-        )
+
+"#]])
         .with_status(101)
         .run();
 }
@@ -152,7 +149,7 @@ fn invalid_login_token() {
         cargo_process("login")
             .replace_crates_io(registry.index_url())
             .with_stdin(stdin)
-            .with_stderr(stderr)
+            .with_stderr_data(stderr)
             .with_status(status)
             .run();
     };
@@ -164,11 +161,20 @@ fn invalid_login_token() {
 
 Caused by:
   token contains invalid characters.
-  Only printable ISO-8859-1 characters are allowed as it is sent in a HTTPS header.",
+  Only printable ISO-8859-1 characters are allowed as it is sent in a HTTPS header.
+",
             101,
         )
     };
-    let valid = |stdin: &str| check(stdin, "[LOGIN] token for `crates-io` saved", 0);
+    let valid = |stdin: &str| {
+        check(
+            stdin,
+            "\
+[LOGIN] token for `crates-io` saved
+",
+            0,
+        )
+    };
 
     // Update config.json so that the rest of the tests don't need to care
     // whether or not `Updating` is printed.
@@ -203,9 +209,16 @@ fn bad_asymmetric_token_args() {
     cargo_process("login -Zasymmetric-token -- --key-subject")
         .masquerade_as_nightly_cargo(&["asymmetric-token"])
         .replace_crates_io(registry.index_url())
-        .with_stderr_contains(
-            "  error: a value is required for '--key-subject <SUBJECT>' but none was supplied",
-        )
+        .with_stderr_data(str![[r#"
+[UPDATING] crates.io index
+[ERROR] credential provider `cargo:paseto --key-subject` failed action `login`
+
+Caused by:
+  [ERROR] a value is required for '--key-subject <SUBJECT>' but none was supplied
+
+  For more information, try '--help'.
+
+"#]])
         .with_status(101)
         .run();
 }
@@ -234,10 +247,12 @@ fn login_with_asymmetric_token_and_subject_on_stdin() {
     cargo_process("login -v -Z asymmetric-token -- --key-subject=foo")
         .masquerade_as_nightly_cargo(&["asymmetric-token"])
         .replace_crates_io(registry.index_url())
-        .with_stderr_contains(
-            "\
-k3.public.AmDwjlyf8jAV3gm5Z7Kz9xAOcsKslt_Vwp5v-emjFzBHLCtcANzTaVEghTNEMj9PkQ",
-        )
+        .with_stderr_data(str![[r#"
+[UPDATING] crates.io index
+[CREDENTIAL] cargo:paseto --key-subject=foo login crates-io
+k3.public.AmDwjlyf8jAV3gm5Z7Kz9xAOcsKslt_Vwp5v-emjFzBHLCtcANzTaVEghTNEMj9PkQ
+
+"#]])
         .with_stdin("k3.secret.fNYVuMvBgOlljt9TDohnaYLblghqaHoQquVZwgR6X12cBFHZLFsaU3q7X3k1Zn36")
         .run();
     let credentials = fs::read_to_string(&credentials).unwrap();
@@ -291,12 +306,12 @@ fn login_with_asymmetric_token_on_stdin() {
     let credentials = credentials_toml();
     cargo_process("login -v -Z asymmetric-token --registry alternative")
         .masquerade_as_nightly_cargo(&["asymmetric-token"])
-        .with_stderr(
-            "\
-[UPDATING] [..]
+        .with_stderr_data(str![[r#"
+[UPDATING] `alternative` index
 [CREDENTIAL] cargo:paseto login alternative
-k3.public.AmDwjlyf8jAV3gm5Z7Kz9xAOcsKslt_Vwp5v-emjFzBHLCtcANzTaVEghTNEMj9PkQ",
-        )
+k3.public.AmDwjlyf8jAV3gm5Z7Kz9xAOcsKslt_Vwp5v-emjFzBHLCtcANzTaVEghTNEMj9PkQ
+
+"#]])
         .with_stdin("k3.secret.fNYVuMvBgOlljt9TDohnaYLblghqaHoQquVZwgR6X12cBFHZLFsaU3q7X3k1Zn36")
         .run();
     let credentials = fs::read_to_string(&credentials).unwrap();
@@ -313,7 +328,11 @@ fn login_with_generate_asymmetric_token() {
     let credentials = credentials_toml();
     cargo_process("login -Z asymmetric-token --registry alternative")
         .masquerade_as_nightly_cargo(&["asymmetric-token"])
-        .with_stderr("[UPDATING] `alternative` index\nk3.public.[..]")
+        .with_stderr_data(str![[r#"
+[UPDATING] `alternative` index
+k3.public.[..]
+
+"#]])
         .run();
     let credentials = fs::read_to_string(&credentials).unwrap();
     assert!(credentials.contains("secret-key = \"k3.secret."));
@@ -336,12 +355,11 @@ fn default_registry_configured() {
 
     cargo_process("login")
         .arg("a-new-token")
-        .with_stderr(
-            "\
+        .with_stderr_data(str![[r#"
 [UPDATING] `alternative` index
 [LOGIN] token for `alternative` saved
-",
-        )
+
+"#]])
         .run();
 
     check_token(None, None);