From fc63ee3466ed5088cedb278d2b56a989668f273c Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Thu, 15 Feb 2024 10:21:09 +0000 Subject: fix: improve 'searching for profile updates' msg it wasn't clear why no results were coming back from relays or why it is needs (added reference to relay updates) --- src/login.rs | 2 +- tests/init.rs | 2 +- tests/login.rs | 18 +++++++++--------- tests/push.rs | 2 +- tests/send.rs | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/login.rs b/src/login.rs index f07b8f1..b0fe230 100644 --- a/src/login.rs +++ b/src/login.rs @@ -96,7 +96,7 @@ async fn get_user_details( #[cfg(not(test))] client: &Client, ) -> Result { let term = console::Term::stdout(); - term.write_line("searching for your details...")?; + term.write_line("searching for profile and relay updates...")?; let user_manager = UserManager::default(); let user_ref = user_manager .get_user( diff --git a/tests/init.rs b/tests/init.rs index 6db2554..1ad3810 100644 --- a/tests/init.rs +++ b/tests/init.rs @@ -3,7 +3,7 @@ use serial_test::serial; use test_utils::{git::GitTestRepo, *}; fn expect_msgs_first(p: &mut CliTester) -> Result<()> { - p.expect("searching for your details...\r\n")?; + p.expect("searching for profile and relay updates...\r\n")?; p.expect("\r")?; p.expect("logged in as fred\r\n")?; // // p.expect("searching for existing claims on repository...\r\n")?; diff --git a/tests/login.rs b/tests/login.rs index 7fc9356..351d099 100644 --- a/tests/login.rs +++ b/tests/login.rs @@ -60,7 +60,7 @@ mod with_relays { .with_confirmation(EXPECTED_SET_PASSWORD_CONFIRM_PROMPT)? .succeeds_with(TEST_PASSWORD)?; - p.expect("searching for your details...\r\n")?; + p.expect("searching for profile and relay updates...\r\n")?; p.expect("\r")?; // p.expect_end_with( @@ -101,7 +101,7 @@ mod with_relays { .with_confirmation(EXPECTED_SET_PASSWORD_CONFIRM_PROMPT)? .succeeds_with(TEST_PASSWORD)?; - p.expect("searching for your details...\r\n")?; + p.expect("searching for profile and relay updates...\r\n")?; p.expect("\r")?; p.expect_end_with( @@ -418,7 +418,7 @@ mod with_relays { with_fresh_config(|| { let mut p = CliTester::new(["login", "--nsec", TEST_KEY_1_NSEC]); - p.expect("searching for your details...\r\n")?; + p.expect("searching for profile and relay updates...\r\n")?; p.expect("\r")?; p.expect_end_with("logged in as fred\r\n")?; @@ -481,7 +481,7 @@ mod with_relays { let mut p = CliTester::new(["login", "--password", TEST_PASSWORD]); - p.expect("searching for your details...\r\n")?; + p.expect("searching for profile and relay updates...\r\n")?; p.expect("\r")?; p.expect_end_with("logged in as fred\r\n")?; @@ -540,7 +540,7 @@ mod with_relays { TEST_PASSWORD, ]); - p.expect("searching for your details...\r\n")?; + p.expect("searching for profile and relay updates...\r\n")?; p.expect("\r")?; p.expect_end_with("logged in as fred\r\n")?; @@ -589,7 +589,7 @@ mod with_relays { .with_confirmation(EXPECTED_SET_PASSWORD_CONFIRM_PROMPT)? .succeeds_with(TEST_PASSWORD)?; - p.expect("searching for your details...\r\n")?; + p.expect("searching for profile and relay updates...\r\n")?; p.expect("\r")?; p.expect( "cannot find your account metadata (name, etc) on relays\r\n", @@ -653,7 +653,7 @@ mod with_relays { .with_confirmation(EXPECTED_SET_PASSWORD_CONFIRM_PROMPT)? .succeeds_with(TEST_PASSWORD)?; - p.expect("searching for your details...\r\n")?; + p.expect("searching for profile and relay updates...\r\n")?; p.expect("\r")?; p.expect("cannot find your relay list. consider using another nostr client to create one to enhance your nostr experience.\r\n")?; @@ -729,7 +729,7 @@ mod with_relays { let mut p = CliTester::new(["login", "--password", TEST_PASSWORD]); - p.expect("searching for your details...\r\n")?; + p.expect("searching for profile and relay updates...\r\n")?; p.expect("\r")?; p.expect_end_eventually_with("logged in as fred\r\n")?; @@ -774,7 +774,7 @@ mod with_relays { .with_confirmation(EXPECTED_SET_PASSWORD_CONFIRM_PROMPT)? .succeeds_with(TEST_PASSWORD)?; - p.expect("searching for your details...\r\n")?; + p.expect("searching for profile and relay updates...\r\n")?; p.expect("\r")?; p.expect_end_with("logged in as fred\r\n")?; diff --git a/tests/push.rs b/tests/push.rs index 409b36f..07148ae 100644 --- a/tests/push.rs +++ b/tests/push.rs @@ -355,7 +355,7 @@ mod when_branch_is_checked_out { p.expect( "1 commits ahead. preparing to create creating patch events.\r\n", )?; - p.expect("searching for your details...\r\n")?; + p.expect("searching for profile and relay updates...\r\n")?; p.expect("\r")?; p.expect("logged in as fred\r\n")?; p.expect("pushing 1 commits\r\n")?; diff --git a/tests/send.rs b/tests/send.rs index b202d54..6d3e138 100644 --- a/tests/send.rs +++ b/tests/send.rs @@ -185,7 +185,7 @@ fn cli_tester_create_pr(git_repo: &GitTestRepo, include_cover_letter: bool) -> C fn expect_msgs_first(p: &mut CliTester, include_cover_letter: bool) -> Result<()> { p.expect("creating patch for 2 commits from 'head' that can be merged into 'main'\r\n")?; - p.expect("searching for your details...\r\n")?; + p.expect("searching for profile and relay updates...\r\n")?; p.expect("\r")?; p.expect("logged in as fred\r\n")?; p.expect(format!( -- cgit v1.2.3