From 1d08d2e77dec6dc2c5a8df8776b74f4ba5405e8d Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Mon, 16 Feb 2026 10:57:39 +0000 Subject: fix: report wording `fetching` ~> `checking` to be consistent with the summary version --- src/lib/client.rs | 4 ++-- test_utils/src/lib.rs | 2 +- tests/ngit_list.rs | 34 +++++++++++++++++----------------- tests/ngit_send.rs | 8 ++++---- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/lib/client.rs b/src/lib/client.rs index 580db5c..6f817d5 100644 --- a/src/lib/client.rs +++ b/src/lib/client.rs @@ -493,7 +493,7 @@ impl Connect for Client { // Finish the pre-added heading bar now that the draw target // is visible so indicatif actually renders it. if let Some(heading) = heading_bar_for_timer { - heading.finish_with_message("fetching updates..."); + heading.finish_with_message("Checking nostr relays..."); } // Mark as revealed and flush all bars that finished while // the draw target was hidden. Hold the lock across the flag @@ -2239,7 +2239,7 @@ pub async fn fetching_with_report( let verbose = is_verbose(); if verbose { let term = console::Term::stderr(); - term.write_line("fetching updates...")?; + term.write_line("Checking nostr relays...")?; } let (relay_reports, progress_reporter) = client .fetch_all( diff --git a/test_utils/src/lib.rs b/test_utils/src/lib.rs index a9a6d1e..0f59539 100644 --- a/test_utils/src/lib.rs +++ b/test_utils/src/lib.rs @@ -1493,7 +1493,7 @@ pub fn use_ngit_list_to_download_and_checkout_proposal_branch( proposal_number: u16, ) -> Result<()> { let mut p = CliTester::new_from_dir(&test_repo.dir, ["-i", "list"]); - p.expect("fetching updates...\r\n")?; + p.expect("Checking nostr relays...\r\n")?; p.expect_eventually("\r\n")?; // some updates listed here let mut c = p.expect_choice( "all proposals", diff --git a/tests/ngit_list.rs b/tests/ngit_list.rs index 59e326a..30e6fe6 100644 --- a/tests/ngit_list.rs +++ b/tests/ngit_list.rs @@ -114,7 +114,7 @@ mod cannot_find_repo_event { coordinate.identifier, ); p.expect(format!("set git remote \"origin\" to {}\r\n", &nostr_url))?; - p.expect("fetching updates...\r\n")?; + p.expect("Checking nostr relays...\r\n")?; // no updates as they were fetched when searching for repo p.expect("no updates\r\n")?; p.expect_end_with("no proposals found... create one? try `ngit send`\r\n")?; @@ -199,7 +199,7 @@ mod when_main_branch_is_uptodate { test_repo.populate()?; let mut p = CliTester::new_from_dir(&test_repo.dir, ["-i", "list"]); - p.expect("fetching updates...\r\n")?; + p.expect("Checking nostr relays...\r\n")?; p.expect_eventually("\r\n")?; // some updates listed here let mut c = p.expect_choice( "all proposals", @@ -318,7 +318,7 @@ mod when_main_branch_is_uptodate { test_repo.populate()?; let mut p = CliTester::new_from_dir(&test_repo.dir, ["-i", "list"]); - p.expect("fetching updates...\r\n")?; + p.expect("Checking nostr relays...\r\n")?; p.expect_eventually("\r\n")?; // some updates listed here let mut c = p.expect_choice( "all proposals", @@ -440,7 +440,7 @@ mod when_main_branch_is_uptodate { test_repo.populate()?; let mut p = CliTester::new_from_dir(&test_repo.dir, ["-i", "list"]); - p.expect("fetching updates...\r\n")?; + p.expect("Checking nostr relays...\r\n")?; p.expect_eventually("\r\n")?; // some updates listed here let mut c = p.expect_choice( "all proposals", @@ -518,7 +518,7 @@ mod when_main_branch_is_uptodate { test_repo.populate()?; let mut p = CliTester::new_from_dir(&test_repo.dir, ["-i", "list"]); - p.expect("fetching updates...\r\n")?; + p.expect("Checking nostr relays...\r\n")?; p.expect_eventually("\r\n")?; // some updates listed here let mut c = p.expect_choice( "all proposals", @@ -640,7 +640,7 @@ mod when_main_branch_is_uptodate { test_repo.populate()?; // create proposal branch let mut p = CliTester::new_from_dir(&test_repo.dir, ["-i", "list"]); - p.expect("fetching updates...\r\n")?; + p.expect("Checking nostr relays...\r\n")?; p.expect_eventually("\r\n")?; // some updates listed here let mut c = p.expect_choice( "all proposals", @@ -665,7 +665,7 @@ mod when_main_branch_is_uptodate { test_repo.checkout("main")?; // run test p = CliTester::new_from_dir(&test_repo.dir, ["-i", "list"]); - p.expect("fetching updates...\r\n")?; + p.expect("Checking nostr relays...\r\n")?; p.expect_eventually("\r\n")?; // some updates listed here let mut c = p.expect_choice( "all proposals", @@ -736,7 +736,7 @@ mod when_main_branch_is_uptodate { test_repo.populate()?; // create proposal branch let mut p = CliTester::new_from_dir(&test_repo.dir, ["-i", "list"]); - p.expect("fetching updates...\r\n")?; + p.expect("Checking nostr relays...\r\n")?; p.expect_eventually("\r\n")?; // some updates listed here let mut c = p.expect_choice( "all proposals", @@ -761,7 +761,7 @@ mod when_main_branch_is_uptodate { test_repo.checkout("main")?; // run test p = CliTester::new_from_dir(&test_repo.dir, ["-i", "list"]); - p.expect("fetching updates...\r\n")?; + p.expect("Checking nostr relays...\r\n")?; p.expect_eventually("\r\n")?; // some updates listed here let mut c = p.expect_choice( "all proposals", @@ -851,7 +851,7 @@ mod when_main_branch_is_uptodate { // run test let mut p = CliTester::new_from_dir(&test_repo.dir, ["-i", "list"]); - p.expect("fetching updates...\r\n")?; + p.expect("Checking nostr relays...\r\n")?; p.expect_eventually("\r\n")?; // some updates listed here let mut c = p.expect_choice( "all proposals", @@ -927,7 +927,7 @@ mod when_main_branch_is_uptodate { // run test let mut p = CliTester::new_from_dir(&test_repo.dir, ["-i", "list"]); - p.expect("fetching updates...\r\n")?; + p.expect("Checking nostr relays...\r\n")?; p.expect_eventually("\r\n")?; // some updates listed here let mut c = p.expect_choice( "all proposals", @@ -1040,7 +1040,7 @@ mod when_main_branch_is_uptodate { // run test let mut p = CliTester::new_from_dir(&test_repo.dir, ["-i", "list"]); - p.expect("fetching updates...\r\n")?; + p.expect("Checking nostr relays...\r\n")?; p.expect_eventually("\r\n")?; // some updates listed here let mut c = p.expect_choice( "all proposals", @@ -1119,7 +1119,7 @@ mod when_main_branch_is_uptodate { // run test let mut p = CliTester::new_from_dir(&test_repo.dir, ["-i", "list"]); - p.expect("fetching updates...\r\n")?; + p.expect("Checking nostr relays...\r\n")?; p.expect_eventually("\r\n")?; // some updates listed here let mut c = p.expect_choice( "all proposals", @@ -1224,7 +1224,7 @@ mod when_main_branch_is_uptodate { // run test let mut p = CliTester::new_from_dir(&test_repo.dir, ["-i", "list"]); - p.expect("fetching updates...\r\n")?; + p.expect("Checking nostr relays...\r\n")?; p.expect_eventually("\r\n")?; // some updates listed here let mut c = p.expect_choice( "all proposals", @@ -1306,7 +1306,7 @@ mod when_main_branch_is_uptodate { // run test let mut p = CliTester::new_from_dir(&test_repo.dir, ["-i", "list"]); - p.expect("fetching updates...\r\n")?; + p.expect("Checking nostr relays...\r\n")?; p.expect_eventually("\r\n")?; // some updates listed here let mut c = p.expect_choice( "all proposals", @@ -1408,7 +1408,7 @@ mod when_main_branch_is_uptodate { test_repo.checkout("main")?; let mut p = CliTester::new_from_dir(&test_repo.dir, ["-i", "list"]); - p.expect("fetching updates...\r\n")?; + p.expect("Checking nostr relays...\r\n")?; p.expect_eventually("\r\n")?; // some updates listed here let mut c = p.expect_choice( "all proposals", @@ -1481,7 +1481,7 @@ mod when_main_branch_is_uptodate { test_repo.checkout("main")?; let mut p = CliTester::new_from_dir(&test_repo.dir, ["-i", "list"]); - p.expect("fetching updates...\r\n")?; + p.expect("Checking nostr relays...\r\n")?; p.expect_eventually("\r\n")?; // some updates listed here let mut c = p.expect_choice( "all proposals", diff --git a/tests/ngit_send.rs b/tests/ngit_send.rs index eca09d5..67b2209 100644 --- a/tests/ngit_send.rs +++ b/tests/ngit_send.rs @@ -80,7 +80,7 @@ mod when_commits_behind_ask_to_proceed { } fn expect_confirm_prompt(p: &'_ mut CliTester) -> Result> { - p.expect("fetching updates...\r\n")?; + p.expect("Checking nostr relays...\r\n")?; p.expect_eventually("\r\n")?; // may be 'no updates' or some updates p.expect("creating proposal from 2 commits:\r\n")?; p.expect("fe973a8 add t4.md\r\n")?; @@ -230,7 +230,7 @@ fn cli_tester_create_proposal(git_repo: &GitTestRepo, include_cover_letter: bool } fn expect_msgs_first(p: &mut CliTester, include_cover_letter: bool) -> Result<()> { - p.expect("fetching updates...\r\n")?; + p.expect("Checking nostr relays...\r\n")?; p.expect_eventually("\r\n")?; // may be 'no updates' or some updates p.expect("creating proposal from 2 commits:\r\n")?; p.expect("fe973a8 add t4.md\r\n")?; @@ -1307,7 +1307,7 @@ mod when_range_ommited_prompts_for_selection_defaulting_ahead_of_main { CliTester::new_from_dir(&git_repo.dir, args) } fn expect_msgs_first(p: &mut CliTester) -> Result<()> { - p.expect("fetching updates...\r\n")?; + p.expect("Checking nostr relays...\r\n")?; p.expect_eventually("\r\n")?; // may be 'no updates' or some updates let mut selector = p.expect_multi_select( "select commits for proposal", @@ -1513,7 +1513,7 @@ mod root_proposal_specified_using_in_reply_to_with_range_of_head_2_and_cover_let CliTester::new_from_dir(&git_repo.dir, args) } fn expect_msgs_first(p: &mut CliTester, include_cover_letter: bool) -> Result<()> { - p.expect("fetching updates...\r\n")?; + p.expect("Checking nostr relays...\r\n")?; p.expect("updates: 1 announcement, 1 announcement update, 1 proposal\r\n")?; let proposal_root_bech32 = get_pretend_proposal_root_event().id.to_bech32().unwrap(); p.expect(format!( -- cgit v1.2.3