upleb.uk

Public git repos — served from a NIP-34 GRASP relay at git.upleb.uk

summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDanConwayDev <DanConwayDev@protonmail.com>2024-11-25 12:59:43 +0000
committerDanConwayDev <DanConwayDev@protonmail.com>2024-11-25 12:59:43 +0000
commit1fe1b917b71f6897deaf89f5ee725614cba9b693 (patch)
treef7b29410dc0689e9f4200f0d78e1e1d66a5b25f1 /tests
parentb09cf3ef8bbb5d31e4c424ff28282f5029f95fb2 (diff)
test: fix login copy
appended 'via cli arguments' to 'logged in as fred' during login step
Diffstat (limited to 'tests')
-rw-r--r--tests/ngit_init.rs2
-rw-r--r--tests/ngit_login.rs10
-rw-r--r--tests/ngit_push.rs4
-rw-r--r--tests/ngit_send.rs6
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, *};
5 5
6fn expect_msgs_first(p: &mut CliTester) -> Result<()> { 6fn expect_msgs_first(p: &mut CliTester) -> Result<()> {
7 p.expect("searching for profile...\r\n")?; 7 p.expect("searching for profile...\r\n")?;
8 p.expect("logged in as fred\r\n")?; 8 p.expect("logged in as fred via cli arguments\r\n")?;
9 // // p.expect("searching for existing claims on repository...\r\n")?; 9 // // p.expect("searching for existing claims on repository...\r\n")?;
10 p.expect("publishing repostory reference...\r\n")?; 10 p.expect("publishing repostory reference...\r\n")?;
11 Ok(()) 11 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 {
87 87
88 p.expect("searching for profile...\r\n")?; 88 p.expect("searching for profile...\r\n")?;
89 89
90 p.expect_end_with("logged in as fred\r\n")?; 90 p.expect_end_with("logged in as fred via cli arguments\r\n")?;
91 for p in [51, 52] { 91 for p in [51, 52] {
92 shutdown_relay(8000 + p)?; 92 shutdown_relay(8000 + p)?;
93 } 93 }
@@ -437,7 +437,7 @@ mod with_relays {
437 437
438 p.expect("searching for profile...\r\n")?; 438 p.expect("searching for profile...\r\n")?;
439 439
440 p.expect_end_with("logged in as fred\r\n")?; 440 p.expect_end_with("logged in as fred via cli arguments\r\n")?;
441 for p in [51, 52] { 441 for p in [51, 52] {
442 shutdown_relay(8000 + p)?; 442 shutdown_relay(8000 + p)?;
443 } 443 }
@@ -504,7 +504,7 @@ mod with_relays {
504 504
505 p.expect("searching for profile...\r\n")?; 505 p.expect("searching for profile...\r\n")?;
506 506
507 p.expect_end_with("logged in as fred\r\n")?; 507 p.expect_end_with("logged in as fred via cli arguments\r\n")?;
508 for p in [51, 52] { 508 for p in [51, 52] {
509 shutdown_relay(8000 + p)?; 509 shutdown_relay(8000 + p)?;
510 } 510 }
@@ -566,7 +566,7 @@ mod with_relays {
566 566
567 p.expect("searching for profile...\r\n")?; 567 p.expect("searching for profile...\r\n")?;
568 568
569 p.expect_end_with("logged in as fred\r\n")?; 569 p.expect_end_with("logged in as fred via cli arguments\r\n")?;
570 for p in [51, 52] { 570 for p in [51, 52] {
571 shutdown_relay(8000 + p)?; 571 shutdown_relay(8000 + p)?;
572 } 572 }
@@ -747,7 +747,7 @@ mod with_relays {
747 747
748 p.expect("saved login details to local git config\r\n")?; 748 p.expect("saved login details to local git config\r\n")?;
749 749
750 p.expect_end_eventually_with("logged in as fred\r\n")?; 750 p.expect_end_eventually_with("logged in as fred via cli arguments\r\n")?;
751 751
752 for p in [51, 52] { 752 for p in [51, 52] {
753 shutdown_relay(8000 + p)?; 753 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 {
252 p.expect( 252 p.expect(
253 "1 commits ahead. preparing to create creating patch events.\r\n", 253 "1 commits ahead. preparing to create creating patch events.\r\n",
254 )?; 254 )?;
255 p.expect("logged in as fred\r\n")?; 255 p.expect("logged in as fred via cli arguments\r\n")?;
256 p.expect("pushing 1 commits\r\n")?; 256 p.expect("pushing 1 commits\r\n")?;
257 257
258 expect_send_with_progress( 258 expect_send_with_progress(
@@ -490,7 +490,7 @@ mod when_branch_is_checked_out {
490 p.expect("creating proposal from 2 commits:\r\n")?; 490 p.expect("creating proposal from 2 commits:\r\n")?;
491 p.expect("355bdf1 add a4.md\r\n")?; 491 p.expect("355bdf1 add a4.md\r\n")?;
492 p.expect("dbd1115 add a3.md\r\n")?; 492 p.expect("dbd1115 add a3.md\r\n")?;
493 p.expect("logged in as fred\r\n")?; 493 p.expect("logged in as fred via cli arguments\r\n")?;
494 p.expect("posting 2 patches without a covering letter...\r\n")?; 494 p.expect("posting 2 patches without a covering letter...\r\n")?;
495 495
496 relay::expect_send_with_progress( 496 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<()
145 p.expect("fe973a8 add t4.md\r\n")?; 145 p.expect("fe973a8 add t4.md\r\n")?;
146 p.expect("232efb3 add t3.md\r\n")?; 146 p.expect("232efb3 add t3.md\r\n")?;
147 // sometimes there will be a 'searching for profile...' msg 147 // sometimes there will be a 'searching for profile...' msg
148 p.expect_eventually("logged in as fred\r\n")?; 148 p.expect_eventually("logged in as fred via cli arguments\r\n")?;
149 p.expect(format!( 149 p.expect(format!(
150 "posting 2 patches {} a covering letter...\r\n", 150 "posting 2 patches {} a covering letter...\r\n",
151 if include_cover_letter { 151 if include_cover_letter {
@@ -1215,7 +1215,7 @@ mod when_range_ommited_prompts_for_selection_defaulting_ahead_of_main {
1215 p.expect("fe973a8 add t4.md\r\n")?; 1215 p.expect("fe973a8 add t4.md\r\n")?;
1216 p.expect("232efb3 add t3.md\r\n")?; 1216 p.expect("232efb3 add t3.md\r\n")?;
1217 p.expect("searching for profile...\r\n")?; 1217 p.expect("searching for profile...\r\n")?;
1218 p.expect("logged in as fred\r\n")?; 1218 p.expect("logged in as fred via cli arguments\r\n")?;
1219 p.expect("posting 2 patches without a covering letter...\r\n")?; 1219 p.expect("posting 2 patches without a covering letter...\r\n")?;
1220 Ok(()) 1220 Ok(())
1221 } 1221 }
@@ -1408,7 +1408,7 @@ mod root_proposal_specified_using_in_reply_to_with_range_of_head_2_and_cover_let
1408 p.expect("creating proposal from 2 commits:\r\n")?; 1408 p.expect("creating proposal from 2 commits:\r\n")?;
1409 p.expect("fe973a8 add t4.md\r\n")?; 1409 p.expect("fe973a8 add t4.md\r\n")?;
1410 p.expect("232efb3 add t3.md\r\n")?; 1410 p.expect("232efb3 add t3.md\r\n")?;
1411 p.expect("logged in as fred\r\n")?; 1411 p.expect("logged in as fred via cli arguments\r\n")?;
1412 p.expect(format!( 1412 p.expect(format!(
1413 "posting 2 patches {} a covering letter...\r\n", 1413 "posting 2 patches {} a covering letter...\r\n",
1414 if include_cover_letter { 1414 if include_cover_letter {