From 1fe1b917b71f6897deaf89f5ee725614cba9b693 Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Mon, 25 Nov 2024 12:59:43 +0000 Subject: test: fix login copy appended 'via cli arguments' to 'logged in as fred' during login step --- tests/ngit_init.rs | 2 +- tests/ngit_login.rs | 10 +++++----- tests/ngit_push.rs | 4 ++-- tests/ngit_send.rs | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/ngit_init.rs b/tests/ngit_init.rs index 34da16f..1183b3c 100644 --- a/tests/ngit_init.rs +++ b/tests/ngit_init.rs @@ -5,7 +5,7 @@ use test_utils::{git::GitTestRepo, *}; fn expect_msgs_first(p: &mut CliTester) -> Result<()> { p.expect("searching for profile...\r\n")?; - p.expect("logged in as fred\r\n")?; + p.expect("logged in as fred via cli arguments\r\n")?; // // p.expect("searching for existing claims on repository...\r\n")?; p.expect("publishing repostory reference...\r\n")?; Ok(()) diff --git a/tests/ngit_login.rs b/tests/ngit_login.rs index 9b467b3..c928cc4 100644 --- a/tests/ngit_login.rs +++ b/tests/ngit_login.rs @@ -87,7 +87,7 @@ mod with_relays { p.expect("searching for profile...\r\n")?; - p.expect_end_with("logged in as fred\r\n")?; + p.expect_end_with("logged in as fred via cli arguments\r\n")?; for p in [51, 52] { shutdown_relay(8000 + p)?; } @@ -437,7 +437,7 @@ mod with_relays { p.expect("searching for profile...\r\n")?; - p.expect_end_with("logged in as fred\r\n")?; + p.expect_end_with("logged in as fred via cli arguments\r\n")?; for p in [51, 52] { shutdown_relay(8000 + p)?; } @@ -504,7 +504,7 @@ mod with_relays { p.expect("searching for profile...\r\n")?; - p.expect_end_with("logged in as fred\r\n")?; + p.expect_end_with("logged in as fred via cli arguments\r\n")?; for p in [51, 52] { shutdown_relay(8000 + p)?; } @@ -566,7 +566,7 @@ mod with_relays { p.expect("searching for profile...\r\n")?; - p.expect_end_with("logged in as fred\r\n")?; + p.expect_end_with("logged in as fred via cli arguments\r\n")?; for p in [51, 52] { shutdown_relay(8000 + p)?; } @@ -747,7 +747,7 @@ mod with_relays { p.expect("saved login details to local git config\r\n")?; - p.expect_end_eventually_with("logged in as fred\r\n")?; + p.expect_end_eventually_with("logged in as fred via cli arguments\r\n")?; for p in [51, 52] { shutdown_relay(8000 + p)?; diff --git a/tests/ngit_push.rs b/tests/ngit_push.rs index 3d89f6b..f37e027 100644 --- a/tests/ngit_push.rs +++ b/tests/ngit_push.rs @@ -252,7 +252,7 @@ mod when_branch_is_checked_out { p.expect( "1 commits ahead. preparing to create creating patch events.\r\n", )?; - p.expect("logged in as fred\r\n")?; + p.expect("logged in as fred via cli arguments\r\n")?; p.expect("pushing 1 commits\r\n")?; expect_send_with_progress( @@ -490,7 +490,7 @@ mod when_branch_is_checked_out { p.expect("creating proposal from 2 commits:\r\n")?; p.expect("355bdf1 add a4.md\r\n")?; p.expect("dbd1115 add a3.md\r\n")?; - p.expect("logged in as fred\r\n")?; + p.expect("logged in as fred via cli arguments\r\n")?; p.expect("posting 2 patches without a covering letter...\r\n")?; relay::expect_send_with_progress( diff --git a/tests/ngit_send.rs b/tests/ngit_send.rs index 620146e..1d5b308 100644 --- a/tests/ngit_send.rs +++ b/tests/ngit_send.rs @@ -145,7 +145,7 @@ fn expect_msgs_first(p: &mut CliTester, include_cover_letter: bool) -> Result<() p.expect("fe973a8 add t4.md\r\n")?; p.expect("232efb3 add t3.md\r\n")?; // sometimes there will be a 'searching for profile...' msg - p.expect_eventually("logged in as fred\r\n")?; + p.expect_eventually("logged in as fred via cli arguments\r\n")?; p.expect(format!( "posting 2 patches {} a covering letter...\r\n", if include_cover_letter { @@ -1215,7 +1215,7 @@ mod when_range_ommited_prompts_for_selection_defaulting_ahead_of_main { p.expect("fe973a8 add t4.md\r\n")?; p.expect("232efb3 add t3.md\r\n")?; p.expect("searching for profile...\r\n")?; - p.expect("logged in as fred\r\n")?; + p.expect("logged in as fred via cli arguments\r\n")?; p.expect("posting 2 patches without a covering letter...\r\n")?; Ok(()) } @@ -1408,7 +1408,7 @@ mod root_proposal_specified_using_in_reply_to_with_range_of_head_2_and_cover_let p.expect("creating proposal from 2 commits:\r\n")?; p.expect("fe973a8 add t4.md\r\n")?; p.expect("232efb3 add t3.md\r\n")?; - p.expect("logged in as fred\r\n")?; + p.expect("logged in as fred via cli arguments\r\n")?; p.expect(format!( "posting 2 patches {} a covering letter...\r\n", if include_cover_letter { -- cgit v1.2.3