use anyhow::Result; use futures::join; use serial_test::serial; use test_utils::{git::GitTestRepo, relay::Relay, *}; #[test] fn when_no_main_or_master_branch_return_error() -> Result<()> { let test_repo = GitTestRepo::new("notmain")?; test_repo.populate()?; let mut p = CliTester::new_from_dir(&test_repo.dir, ["send"]); p.expect("Error: the default branches (main or master) do not exist")?; Ok(()) } #[test] fn when_no_commits_ahead_of_main_return_error() -> Result<()> { let test_repo = GitTestRepo::default(); test_repo.populate()?; // create feature branch with 1 commit ahead test_repo.create_branch("feature")?; test_repo.checkout("feature")?; let mut p = CliTester::new_from_dir(&test_repo.dir, ["send"]); p.expect("Error: 'feature' is 0 commits ahead of 'main' so no patches were created")?; Ok(()) } mod when_commits_behind_ask_to_proceed { use super::*; fn prep_test_repo() -> Result { let test_repo = GitTestRepo::default(); test_repo.populate()?; // create feature branch with 2 commit ahead test_repo.create_branch("feature")?; test_repo.checkout("feature")?; std::fs::write(test_repo.dir.join("t3.md"), "some content")?; test_repo.stage_and_commit("add t3.md")?; std::fs::write(test_repo.dir.join("t4.md"), "some content")?; test_repo.stage_and_commit("add t4.md")?; // checkout main and add 1 commit test_repo.checkout("main")?; std::fs::write(test_repo.dir.join("t5.md"), "some content")?; test_repo.stage_and_commit("add t5.md")?; // checkout feature branch test_repo.checkout("feature")?; Ok(test_repo) } static BEHIND_LEN: u8 = 1; static AHEAD_LEN: u8 = 2; fn expect_confirm_prompt( p: &mut CliTester, behind: u8, ahead: u8, ) -> Result { p.expect_confirm( format!("'feature' is {behind} commits behind 'main' and {ahead} ahead. Consider rebasing before sending patches. Proceed anyway?").as_str(), Some(false), ) } #[test] fn asked_with_default_no() -> Result<()> { let test_repo = prep_test_repo()?; let mut p = CliTester::new_from_dir(&test_repo.dir, ["send"]); expect_confirm_prompt(&mut p, BEHIND_LEN, AHEAD_LEN)?; p.exit()?; Ok(()) } #[test] fn when_response_is_false_aborts() -> Result<()> { let test_repo = prep_test_repo()?; let mut p = CliTester::new_from_dir(&test_repo.dir, ["send"]); expect_confirm_prompt(&mut p, BEHIND_LEN, AHEAD_LEN)?.succeeds_with(Some(false))?; p.expect_end_with("Error: aborting so branch can be rebased\r\n")?; Ok(()) } #[test] #[serial] fn when_response_is_true_proceeds() -> Result<()> { let test_repo = prep_test_repo()?; let mut p = CliTester::new_from_dir(&test_repo.dir, ["send"]); expect_confirm_prompt(&mut p, BEHIND_LEN, AHEAD_LEN)?.succeeds_with(Some(true))?; p.expect( format!("creating patch for {AHEAD_LEN} commits from 'feature' that are {BEHIND_LEN} behind 'main'",) .as_str(), )?; p.exit()?; Ok(()) } } #[test] #[serial] fn cli_message_creating_patches() -> Result<()> { let test_repo = GitTestRepo::default(); test_repo.populate()?; // create feature branch with 2 commit ahead test_repo.create_branch("feature")?; test_repo.checkout("feature")?; std::fs::write(test_repo.dir.join("t3.md"), "some content")?; test_repo.stage_and_commit("add t3.md")?; std::fs::write(test_repo.dir.join("t4.md"), "some content")?; test_repo.stage_and_commit("add t4.md")?; let mut p = CliTester::new_from_dir(&test_repo.dir, ["send"]); p.expect("creating patch for 2 commits from 'feature' that can be merged into 'main'")?; p.exit()?; Ok(()) } fn is_cover_letter(event: &nostr::Event) -> bool { event.kind.as_u64().eq(&PATCH_KIND) && event.iter_tags().any(|t| t.as_vec()[1].eq("cover-letter")) } fn is_patch(event: &nostr::Event) -> bool { event.kind.as_u64().eq(&PATCH_KIND) && !event.iter_tags().any(|t| t.as_vec()[1].eq("cover-letter")) } fn prep_git_repo() -> Result { let test_repo = GitTestRepo::default(); test_repo.populate()?; // create feature branch with 2 commit ahead test_repo.create_branch("feature")?; test_repo.checkout("feature")?; std::fs::write(test_repo.dir.join("t3.md"), "some content")?; test_repo.stage_and_commit("add t3.md")?; std::fs::write(test_repo.dir.join("t4.md"), "some content")?; test_repo.stage_and_commit("add t4.md")?; Ok(test_repo) } fn cli_tester_create_proposal(git_repo: &GitTestRepo, include_cover_letter: bool) -> CliTester { let mut args = vec![ "--nsec", TEST_KEY_1_NSEC, "--password", TEST_PASSWORD, "--disable-cli-spinners", "send", ]; if include_cover_letter { for arg in [ "--title", "exampletitle", "--description", "exampledescription", ] { args.push(arg); } } else { args.push("--no-cover-letter"); } CliTester::new_from_dir(&git_repo.dir, args) } fn expect_msgs_first(p: &mut CliTester, include_cover_letter: bool) -> Result<()> { p.expect("creating patch for 2 commits from 'feature' that can be merged into 'main'\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!( "posting 2 patches {} a covering letter...\r\n", if include_cover_letter { "with" } else { "without" } ))?; Ok(()) } async fn prep_run_create_proposal( include_cover_letter: bool, ) -> Result<( Relay<'static>, Relay<'static>, Relay<'static>, Relay<'static>, Relay<'static>, )> { let git_repo = prep_git_repo()?; // fallback (51,52) user write (53, 55) repo (55, 56) let (mut r51, mut r52, mut r53, mut r55, mut r56) = ( Relay::new( 8051, None, Some(&|relay, client_id, subscription_id, _| -> Result<()> { relay.respond_events( client_id, &subscription_id, &vec![ generate_test_key_1_metadata_event("fred"), generate_test_key_1_relay_list_event(), ], )?; Ok(()) }), ), Relay::new(8052, None, None), Relay::new(8053, None, None), Relay::new( 8055, None, Some(&|relay, client_id, subscription_id, _| -> Result<()> { relay.respond_events( client_id, &subscription_id, &vec![generate_repo_ref_event()], )?; Ok(()) }), ), Relay::new(8056, None, None), ); // // check relay had the right number of events let cli_tester_handle = std::thread::spawn(move || -> Result<()> { let mut p = cli_tester_create_proposal(&git_repo, include_cover_letter); p.expect_end_eventually()?; for p in [51, 52, 53, 55, 56] { relay::shutdown_relay(8000 + p)?; } Ok(()) }); // launch relay let _ = join!( r51.listen_until_close(), r52.listen_until_close(), r53.listen_until_close(), r55.listen_until_close(), r56.listen_until_close(), ); cli_tester_handle.join().unwrap()?; Ok((r51, r52, r53, r55, r56)) } mod sends_cover_letter_and_2_patches_to_3_relays { use super::*; #[tokio::test] #[serial] async fn only_1_cover_letter_event_sent_to_each_relay() -> Result<()> { let (_, _, r53, r55, r56) = prep_run_create_proposal(true).await?; for relay in [&r53, &r55, &r56] { assert_eq!( relay.events.iter().filter(|e| is_cover_letter(e)).count(), 1, ); } Ok(()) } #[tokio::test] #[serial] async fn only_1_cover_letter_event_sent_to_user_relays() -> Result<()> { let (_, _, r53, r55, _) = prep_run_create_proposal(true).await?; for relay in [&r53, &r55] { assert_eq!( relay.events.iter().filter(|e| is_cover_letter(e)).count(), 1, ); } Ok(()) } #[tokio::test] #[serial] async fn only_1_cover_letter_event_sent_to_repo_relays() -> Result<()> { let (_, _, _, r55, r56) = prep_run_create_proposal(true).await?; for relay in [&r55, &r56] { assert_eq!( relay.events.iter().filter(|e| is_cover_letter(e)).count(), 1 ); } Ok(()) } #[tokio::test] #[serial] async fn only_1_cover_letter_event_sent_to_fallback_relays() -> Result<()> { let (r51, r52, _, _, _) = prep_run_create_proposal(true).await?; for relay in [&r51, &r52] { assert_eq!( relay.events.iter().filter(|e| is_cover_letter(e)).count(), 1, ); } Ok(()) } #[tokio::test] #[serial] async fn only_2_patch_kind_events_sent_to_each_relay() -> Result<()> { let (r51, r52, r53, r55, r56) = prep_run_create_proposal(true).await?; for relay in [&r51, &r52, &r53, &r55, &r56] { assert_eq!(relay.events.iter().filter(|e| is_patch(e)).count(), 2,); } Ok(()) } #[tokio::test] #[serial] async fn patch_content_contains_patch_in_email_format_with_patch_series_numbers() -> Result<()> { let (_, _, r53, r55, r56) = prep_run_create_proposal(true).await?; for relay in [&r53, &r55, &r56] { let patch_events: Vec<&nostr::Event> = relay.events.iter().filter(|e| is_patch(e)).collect(); assert_eq!( patch_events[1].content, "\ From fe973a840fba2a8ab37dd505c154854a69a6505c Mon Sep 17 00:00:00 2001\n\ From: Joe Bloggs \n\ Date: Thu, 1 Jan 1970 00:00:00 +0000\n\ Subject: [PATCH 2/2] add t4.md\n\ \n\ ---\n \ t4.md | 1 +\n \ 1 file changed, 1 insertion(+)\n \ create mode 100644 t4.md\n\ \n\ diff --git a/t4.md b/t4.md\n\ new file mode 100644\n\ index 0000000..f0eec86\n\ --- /dev/null\n\ +++ b/t4.md\n\ @@ -0,0 +1 @@\n\ +some content\n\\ \ No newline at end of file\n\ --\n\ libgit2 1.7.1\n\ \n\ ", ); assert_eq!( patch_events[0].content, "\ From 232efb37ebc67692c9e9ff58b83c0d3d63971a0a Mon Sep 17 00:00:00 2001\n\ From: Joe Bloggs \n\ Date: Thu, 1 Jan 1970 00:00:00 +0000\n\ Subject: [PATCH 1/2] add t3.md\n\ \n\ ---\n \ t3.md | 1 +\n \ 1 file changed, 1 insertion(+)\n \ create mode 100644 t3.md\n\ \n\ diff --git a/t3.md b/t3.md\n\ new file mode 100644\n\ index 0000000..f0eec86\n\ --- /dev/null\n\ +++ b/t3.md\n\ @@ -0,0 +1 @@\n\ +some content\n\\ \ No newline at end of file\n\ --\n\ libgit2 1.7.1\n\ \n\ ", ); } Ok(()) } mod cover_letter_tags { use super::*; #[tokio::test] #[serial] async fn root_commit_as_r() -> Result<()> { let (_, _, r53, r55, r56) = prep_run_create_proposal(true).await?; for relay in [&r53, &r55, &r56] { let cover_letter_event: &nostr::Event = relay.events.iter().find(|e| is_cover_letter(e)).unwrap(); assert_eq!( cover_letter_event .iter_tags() .find(|t| t.as_vec()[0].eq("r")) .unwrap() .as_vec()[1], "9ee507fc4357d7ee16a5d8901bedcd103f23c17d" ); } Ok(()) } #[tokio::test] #[serial] async fn a_tag_for_repo_event() -> Result<()> { let (_, _, r53, r55, r56) = prep_run_create_proposal(true).await?; for relay in [&r53, &r55, &r56] { let cover_letter_event: &nostr::Event = relay.events.iter().find(|e| is_cover_letter(e)).unwrap(); assert!(cover_letter_event.iter_tags().any(|t| t.as_vec()[0].eq("a") && t.as_vec()[1].eq(&format!( "{REPOSITORY_KIND}:{TEST_KEY_1_PUBKEY_HEX}:{}", generate_repo_ref_event().identifier().unwrap() )))); } Ok(()) } #[tokio::test] #[serial] async fn p_tags_for_maintainers() -> Result<()> { let maintainers = &generate_repo_ref_event() .iter_tags() .find(|t| t.as_vec()[0].eq(&"maintainers")) .unwrap() .as_vec() .clone()[1..]; let (_, _, r53, r55, r56) = prep_run_create_proposal(true).await?; for relay in [&r53, &r55, &r56] { for m in maintainers { let cover_letter_event: &nostr::Event = relay.events.iter().find(|e| is_cover_letter(e)).unwrap(); assert!( cover_letter_event .iter_tags() .any(|t| { t.as_vec()[0].eq("p") && t.as_vec()[1].eq(m) }) ); } } Ok(()) } #[tokio::test] #[serial] async fn t_tag_cover_letter() -> Result<()> { let (_, _, r53, r55, r56) = prep_run_create_proposal(true).await?; for relay in [&r53, &r55, &r56] { let cover_letter_event: &nostr::Event = relay.events.iter().find(|e| is_cover_letter(e)).unwrap(); assert!( cover_letter_event .iter_tags() .any(|t| { t.as_vec()[0].eq("t") && t.as_vec()[1].eq(&"cover-letter") }) ); } Ok(()) } #[tokio::test] #[serial] async fn t_tag_root() -> Result<()> { let (_, _, r53, r55, r56) = prep_run_create_proposal(true).await?; for relay in [&r53, &r55, &r56] { let cover_letter_event: &nostr::Event = relay.events.iter().find(|e| is_cover_letter(e)).unwrap(); assert!( cover_letter_event .iter_tags() .any(|t| { t.as_vec()[0].eq("t") && t.as_vec()[1].eq(&"root") }) ); } Ok(()) } #[tokio::test] #[serial] async fn pr_tags_branch_name() -> Result<()> { let (_, _, r53, r55, r56) = prep_run_create_proposal(true).await?; for relay in [&r53, &r55, &r56] { let cover_letter_event: &nostr::Event = relay.events.iter().find(|e| is_cover_letter(e)).unwrap(); // branch-name tag assert_eq!( cover_letter_event .iter_tags() .find(|t| t.as_vec()[0].eq("branch-name")) .unwrap() .as_vec()[1], "feature" ); } Ok(()) } } mod patch_tags { use super::*; async fn prep() -> Result { let (_, _, r53, _, _) = prep_run_create_proposal(true).await?; Ok(r53.events.iter().find(|e| is_patch(e)).unwrap().clone()) } #[tokio::test] #[serial] async fn commit_and_commit_r() -> Result<()> { static COMMIT_ID: &str = "232efb37ebc67692c9e9ff58b83c0d3d63971a0a"; let most_recent_patch = prep().await?; assert!( most_recent_patch .tags .iter() .any(|t| t.as_vec()[0].eq("r") && t.as_vec()[1].eq(COMMIT_ID)) ); assert!( most_recent_patch .tags .iter() .any(|t| t.as_vec()[0].eq("commit") && t.as_vec()[1].eq(COMMIT_ID)) ); Ok(()) } #[tokio::test] #[serial] async fn parent_commit() -> Result<()> { // commit parent 'r' and 'parent-commit' tag static COMMIT_PARENT_ID: &str = "431b84edc0d2fa118d63faa3c2db9c73d630a5ae"; let most_recent_patch = prep().await?; assert_eq!( most_recent_patch .tags .iter() .find(|t| t.as_vec()[0].eq("parent-commit")) .unwrap() .as_vec()[1], COMMIT_PARENT_ID, ); Ok(()) } #[tokio::test] #[serial] async fn root_commit_as_r() -> Result<()> { assert!(prep().await?.tags.iter().any(|t| t.as_vec()[0].eq("r") && t.as_vec()[1].eq("9ee507fc4357d7ee16a5d8901bedcd103f23c17d"))); Ok(()) } #[tokio::test] #[serial] async fn p_tags_for_maintainers() -> Result<()> { let maintainers = &generate_repo_ref_event() .iter_tags() .find(|t| t.as_vec()[0].eq(&"maintainers")) .unwrap() .as_vec() .clone()[1..]; for m in maintainers { assert!( prep() .await? .iter_tags() .any(|t| { t.as_vec()[0].eq("p") && t.as_vec()[1].eq(m) }) ); } Ok(()) } #[tokio::test] #[serial] async fn a_tag_for_repo_event() -> Result<()> { assert!(prep().await?.tags.iter().any(|t| { t.as_vec()[0].eq("a") && t.as_vec()[1].eq(&format!( "{REPOSITORY_KIND}:{TEST_KEY_1_PUBKEY_HEX}:{}", generate_repo_ref_event().identifier().unwrap() )) })); Ok(()) } #[tokio::test] #[serial] async fn description_with_commit_message() -> Result<()> { assert_eq!( prep() .await? .tags .iter() .find(|t| t.as_vec()[0].eq("description")) .unwrap() .as_vec()[1], "add t3.md" ); Ok(()) } #[tokio::test] #[serial] async fn commit_author() -> Result<()> { assert_eq!( prep() .await? .tags .iter() .find(|t| t.as_vec()[0].eq("author")) .unwrap() .as_vec(), vec!["author", "Joe Bloggs", "joe.bloggs@pm.me", "0", "0"], ); Ok(()) } #[tokio::test] #[serial] async fn commit_committer() -> Result<()> { assert_eq!( prep() .await? .tags .iter() .find(|t| t.as_vec()[0].eq("committer")) .unwrap() .as_vec(), vec!["committer", "Joe Bloggs", "joe.bloggs@pm.me", "0", "0"], ); Ok(()) } #[tokio::test] #[serial] async fn patch_tags_cover_letter_event_as_root() -> Result<()> { let (_, _, r53, r55, r56) = prep_run_create_proposal(true).await?; for relay in [&r53, &r55, &r56] { let patch_events: Vec<&nostr::Event> = relay.events.iter().filter(|e| is_patch(e)).collect(); let most_recent_patch = patch_events[0]; let cover_letter_event = relay.events.iter().find(|e| is_cover_letter(e)).unwrap(); let root_event_tag = most_recent_patch .tags .iter() .find(|t| { t.as_vec()[0].eq("e") && t.as_vec().len().eq(&4) && t.as_vec()[3].eq("root") }) .unwrap(); assert_eq!( root_event_tag.as_vec()[1], cover_letter_event.id.to_string() ); } Ok(()) } #[tokio::test] #[serial] async fn second_patch_tags_first_with_reply() -> Result<()> { let (_, _, r53, r55, r56) = prep_run_create_proposal(true).await?; for relay in [&r53, &r55, &r56] { let patch_events = relay .events .iter() .filter(|e| is_patch(e)) .collect::>(); assert_eq!( patch_events[1] .iter_tags() .find(|t| t.as_vec()[0].eq("e") && t.as_vec().len().eq(&4) && t.as_vec()[3].eq("reply")) .unwrap() .as_vec()[1], patch_events[0].id.to_string(), ); } Ok(()) } #[tokio::test] #[serial] async fn no_t_root_tag() -> Result<()> { assert!( !prep() .await? .tags .iter() .any(|t| t.as_vec()[0].eq("t") && t.as_vec()[1].eq("root")) ); Ok(()) } } mod cli_ouput { use super::*; async fn run_test_async() -> Result<()> { let git_repo = prep_git_repo()?; let (mut r51, mut r52, mut r53, mut r55, mut r56) = ( Relay::new( 8051, None, Some(&|relay, client_id, subscription_id, _| -> Result<()> { relay.respond_events( client_id, &subscription_id, &vec![ generate_test_key_1_metadata_event("fred"), generate_test_key_1_relay_list_event(), ], )?; Ok(()) }), ), Relay::new(8052, None, None), Relay::new(8053, None, None), Relay::new( 8055, None, Some(&|relay, client_id, subscription_id, _| -> Result<()> { relay.respond_events( client_id, &subscription_id, &vec![generate_repo_ref_event()], )?; Ok(()) }), ), Relay::new(8056, None, None), ); // // check relay had the right number of events let cli_tester_handle = std::thread::spawn(move || -> Result<()> { let mut p = cli_tester_create_proposal(&git_repo, true); expect_msgs_first(&mut p, true)?; relay::expect_send_with_progress( &mut p, vec![ (" [my-relay] [repo-relay] ws://localhost:8055", true, ""), (" [my-relay] ws://localhost:8053", true, ""), (" [repo-relay] ws://localhost:8056", true, ""), (" [default] ws://localhost:8051", true, ""), (" [default] ws://localhost:8052", true, ""), ], 3, )?; p.expect_end_with_whitespace()?; for p in [51, 52, 53, 55, 56] { relay::shutdown_relay(8000 + p)?; } Ok(()) }); // launch relay let _ = join!( r51.listen_until_close(), r52.listen_until_close(), r53.listen_until_close(), r55.listen_until_close(), r56.listen_until_close(), ); cli_tester_handle.join().unwrap()?; Ok(()) } #[tokio::test] #[serial] async fn check_cli_output() -> Result<()> { run_test_async().await?; Ok(()) } } mod first_event_rejected_by_1_relay { use super::*; mod only_first_rejected_event_sent_to_relay { use super::*; async fn run_test_async() -> Result<()> { let git_repo = prep_git_repo()?; let (mut r51, mut r52, mut r53, mut r55, mut r56) = ( Relay::new( 8051, None, Some(&|relay, client_id, subscription_id, _| -> Result<()> { relay.respond_events( client_id, &subscription_id, &vec![ generate_test_key_1_metadata_event("fred"), generate_test_key_1_relay_list_event(), ], )?; Ok(()) }), ), Relay::new(8052, None, None), Relay::new(8053, None, None), Relay::new( 8055, None, Some(&|relay, client_id, subscription_id, _| -> Result<()> { relay.respond_events( client_id, &subscription_id, &vec![generate_repo_ref_event()], )?; Ok(()) }), ), Relay::new( 8056, Some(&|relay, client_id, event| -> Result<()> { relay.respond_ok(client_id, event, Some("Payment Required"))?; Ok(()) }), None, ), ); // // check relay had the right number of events let cli_tester_handle = std::thread::spawn(move || -> Result<()> { let mut p = cli_tester_create_proposal(&git_repo, true); p.expect_end_eventually()?; for p in [51, 52, 53, 55, 56] { relay::shutdown_relay(8000 + p)?; } Ok(()) }); // launch relay let _ = join!( r51.listen_until_close(), r52.listen_until_close(), r53.listen_until_close(), r55.listen_until_close(), r56.listen_until_close(), ); cli_tester_handle.join().unwrap()?; assert_eq!(r56.events.len(), 1); Ok(()) } #[tokio::test] #[serial] async fn only_first_rejected_event_sent_to_relay() -> Result<()> { run_test_async().await?; Ok(()) } } mod cli_show_rejection_with_comment { use super::*; async fn run_test_async() -> Result<(Relay<'static>, Relay<'static>, Relay<'static>)> { let git_repo = prep_git_repo()?; let (mut r51, mut r52, mut r53, mut r55, mut r56) = ( Relay::new( 8051, None, Some(&|relay, client_id, subscription_id, _| -> Result<()> { relay.respond_events( client_id, &subscription_id, &vec![ generate_test_key_1_metadata_event("fred"), generate_test_key_1_relay_list_event(), ], )?; Ok(()) }), ), Relay::new(8052, None, None), Relay::new(8053, None, None), Relay::new( 8055, None, Some(&|relay, client_id, subscription_id, _| -> Result<()> { relay.respond_events( client_id, &subscription_id, &vec![generate_repo_ref_event()], )?; Ok(()) }), ), Relay::new( 8056, Some(&|relay, client_id, event| -> Result<()> { relay.respond_ok(client_id, event, Some("Payment Required"))?; Ok(()) }), None, ), ); // // check relay had the right number of events let cli_tester_handle = std::thread::spawn(move || -> Result<()> { let mut p = cli_tester_create_proposal(&git_repo, true); expect_msgs_first(&mut p, true)?; // p.expect_end_with("bla")?; relay::expect_send_with_progress( &mut p, vec![ (" [my-relay] [repo-relay] ws://localhost:8055", true, ""), (" [my-relay] ws://localhost:8053", true, ""), ( " [repo-relay] ws://localhost:8056", false, "error: Payment Required", ), (" [default] ws://localhost:8051", true, ""), (" [default] ws://localhost:8052", true, ""), ], 3, )?; p.expect_end_with_whitespace()?; for p in [51, 52, 53, 55, 56] { relay::shutdown_relay(8000 + p)?; } Ok(()) }); // launch relay let _ = join!( r51.listen_until_close(), r52.listen_until_close(), r53.listen_until_close(), r55.listen_until_close(), r56.listen_until_close(), ); cli_tester_handle.join().unwrap()?; Ok((r51, r52, r53)) } #[tokio::test] #[serial] async fn cli_show_rejection_with_comment() -> Result<()> { run_test_async().await?; Ok(()) } } } } mod sends_2_patches_without_cover_letter { use super::*; mod cli_ouput { use super::*; async fn run_test_async() -> Result<()> { let git_repo = prep_git_repo()?; let (mut r51, mut r52, mut r53, mut r55, mut r56) = ( Relay::new( 8051, None, Some(&|relay, client_id, subscription_id, _| -> Result<()> { relay.respond_events( client_id, &subscription_id, &vec![ generate_test_key_1_metadata_event("fred"), generate_test_key_1_relay_list_event(), ], )?; Ok(()) }), ), Relay::new(8052, None, None), Relay::new(8053, None, None), Relay::new( 8055, None, Some(&|relay, client_id, subscription_id, _| -> Result<()> { relay.respond_events( client_id, &subscription_id, &vec![generate_repo_ref_event()], )?; Ok(()) }), ), Relay::new(8056, None, None), ); // // check relay had the right number of events let cli_tester_handle = std::thread::spawn(move || -> Result<()> { let mut p = cli_tester_create_proposal(&git_repo, false); expect_msgs_first(&mut p, false)?; relay::expect_send_with_progress( &mut p, vec![ (" [my-relay] [repo-relay] ws://localhost:8055", true, ""), (" [my-relay] ws://localhost:8053", true, ""), (" [repo-relay] ws://localhost:8056", true, ""), (" [default] ws://localhost:8051", true, ""), (" [default] ws://localhost:8052", true, ""), ], 2, )?; p.expect_end_with_whitespace()?; for p in [51, 52, 53, 55, 56] { relay::shutdown_relay(8000 + p)?; } Ok(()) }); // launch relay let _ = join!( r51.listen_until_close(), r52.listen_until_close(), r53.listen_until_close(), r55.listen_until_close(), r56.listen_until_close(), ); cli_tester_handle.join().unwrap()?; Ok(()) } #[tokio::test] #[serial] async fn check_cli_output() -> Result<()> { run_test_async().await?; Ok(()) } } #[tokio::test] #[serial] async fn no_cover_letter_event() -> Result<()> { let (_, _, r53, r55, r56) = prep_run_create_proposal(false).await?; for relay in [&r53, &r55, &r56] { assert_eq!( relay.events.iter().filter(|e| is_cover_letter(e)).count(), 0, ); } Ok(()) } #[tokio::test] #[serial] async fn two_patch_events() -> Result<()> { let (_, _, r53, r55, r56) = prep_run_create_proposal(false).await?; for relay in [&r53, &r55, &r56] { assert_eq!(relay.events.iter().filter(|e| is_patch(e)).count(), 2); } Ok(()) } #[tokio::test] #[serial] // TODO check this is the ancestor async fn first_patch_with_root_t_tag() -> Result<()> { let (_, _, r53, r55, r56) = prep_run_create_proposal(false).await?; for relay in [&r53, &r55, &r56] { let patch_events = relay .events .iter() .filter(|e| is_patch(e)) .collect::>(); // first patch tagged as root assert!( patch_events[0] .iter_tags() .any(|t| t.as_vec()[0].eq("t") && t.as_vec()[1].eq("root")) ); // second patch not tagged as root assert!( !patch_events[1] .iter_tags() .any(|t| t.as_vec()[0].eq("t") && t.as_vec()[1].eq("root")) ); } Ok(()) } #[tokio::test] #[serial] async fn root_patch_tags_branch_name() -> Result<()> { let (_, _, r53, r55, r56) = prep_run_create_proposal(false).await?; for relay in [&r53, &r55, &r56] { let patch_events = relay .events .iter() .filter(|e| is_patch(e)) .collect::>(); // branch-name tag assert_eq!( patch_events[0] .iter_tags() .find(|t| t.as_vec()[0].eq("branch-name")) .unwrap() .as_vec()[1], "feature" ); } Ok(()) } #[tokio::test] #[serial] async fn second_patch_lists_first_as_root() -> Result<()> { let (_, _, r53, r55, r56) = prep_run_create_proposal(false).await?; for relay in [&r53, &r55, &r56] { let patch_events = relay .events .iter() .filter(|e| is_patch(e)) .collect::>(); assert_eq!( patch_events[1] .iter_tags() .find(|t| t.as_vec()[0].eq("e") && t.as_vec().len().eq(&4) && t.as_vec()[3].eq("root")) .unwrap() .as_vec()[1], patch_events[0].id.to_string(), ); } Ok(()) } } mod specify_starting_commits_whist_on_main_branch { use super::*; fn prep_git_repo() -> Result { let test_repo = GitTestRepo::default(); test_repo.populate()?; // dont checkout feature branch std::fs::write(test_repo.dir.join("t3.md"), "some content")?; test_repo.stage_and_commit("add t3.md")?; std::fs::write(test_repo.dir.join("t4.md"), "some content")?; test_repo.stage_and_commit("add t4.md")?; Ok(test_repo) } fn cli_tester_create_proposal(git_repo: &GitTestRepo) -> CliTester { let args = vec![ "--nsec", TEST_KEY_1_NSEC, "--password", TEST_PASSWORD, "--disable-cli-spinners", "send", "HEAD~3", "--no-cover-letter", ]; CliTester::new_from_dir(&git_repo.dir, args) } fn expect_msgs_first(p: &mut CliTester) -> Result<()> { p.expect("creating patch for 3 commits\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("posting 3 patches without a covering letter...\r\n")?; Ok(()) } async fn prep_run_create_proposal() -> Result<( Relay<'static>, Relay<'static>, Relay<'static>, Relay<'static>, Relay<'static>, )> { let git_repo = prep_git_repo()?; // fallback (51,52) user write (53, 55) repo (55, 56) let (mut r51, mut r52, mut r53, mut r55, mut r56) = ( Relay::new( 8051, None, Some(&|relay, client_id, subscription_id, _| -> Result<()> { relay.respond_events( client_id, &subscription_id, &vec![ generate_test_key_1_metadata_event("fred"), generate_test_key_1_relay_list_event(), ], )?; Ok(()) }), ), Relay::new(8052, None, None), Relay::new(8053, None, None), Relay::new( 8055, None, Some(&|relay, client_id, subscription_id, _| -> Result<()> { relay.respond_events( client_id, &subscription_id, &vec![generate_repo_ref_event()], )?; Ok(()) }), ), Relay::new(8056, None, None), ); // // check relay had the right number of events let cli_tester_handle = std::thread::spawn(move || -> Result<()> { let mut p = cli_tester_create_proposal(&git_repo); p.expect_end_eventually()?; for p in [51, 52, 53, 55, 56] { relay::shutdown_relay(8000 + p)?; } Ok(()) }); // launch relay let _ = join!( r51.listen_until_close(), r52.listen_until_close(), r53.listen_until_close(), r55.listen_until_close(), r56.listen_until_close(), ); cli_tester_handle.join().unwrap()?; Ok((r51, r52, r53, r55, r56)) } mod cli_ouput { use super::*; async fn run_test_async() -> Result<()> { let git_repo = prep_git_repo()?; let (mut r51, mut r52, mut r53, mut r55, mut r56) = ( Relay::new( 8051, None, Some(&|relay, client_id, subscription_id, _| -> Result<()> { relay.respond_events( client_id, &subscription_id, &vec![ generate_test_key_1_metadata_event("fred"), generate_test_key_1_relay_list_event(), ], )?; Ok(()) }), ), Relay::new(8052, None, None), Relay::new(8053, None, None), Relay::new( 8055, None, Some(&|relay, client_id, subscription_id, _| -> Result<()> { relay.respond_events( client_id, &subscription_id, &vec![generate_repo_ref_event()], )?; Ok(()) }), ), Relay::new(8056, None, None), ); // // check relay had the right number of events let cli_tester_handle = std::thread::spawn(move || -> Result<()> { let mut p = cli_tester_create_proposal(&git_repo); expect_msgs_first(&mut p)?; relay::expect_send_with_progress( &mut p, vec![ (" [my-relay] [repo-relay] ws://localhost:8055", true, ""), (" [my-relay] ws://localhost:8053", true, ""), (" [repo-relay] ws://localhost:8056", true, ""), (" [default] ws://localhost:8051", true, ""), (" [default] ws://localhost:8052", true, ""), ], 3, )?; p.expect_end_with_whitespace()?; for p in [51, 52, 53, 55, 56] { relay::shutdown_relay(8000 + p)?; } Ok(()) }); // launch relay let _ = join!( r51.listen_until_close(), r52.listen_until_close(), r53.listen_until_close(), r55.listen_until_close(), r56.listen_until_close(), ); cli_tester_handle.join().unwrap()?; Ok(()) } #[tokio::test] #[serial] async fn check_cli_output() -> Result<()> { run_test_async().await?; Ok(()) } } #[tokio::test] #[serial] async fn three_patch_events() -> Result<()> { let (_, _, r53, r55, r56) = prep_run_create_proposal().await?; for relay in [&r53, &r55, &r56] { assert_eq!(relay.events.iter().filter(|e| is_patch(e)).count(), 3); } Ok(()) } #[tokio::test] #[serial] async fn root_patch_doesnt_have_a_branch_name_tag() -> Result<()> { let (_, _, r53, r55, r56) = prep_run_create_proposal().await?; for relay in [&r53, &r55, &r56] { let patch_events = relay .events .iter() .filter(|e| is_patch(e)) .collect::>(); assert!( !patch_events[0] .iter_tags() .any(|t| t.as_vec()[0].eq("branch-name")) ); } Ok(()) } #[tokio::test] #[serial] async fn first_patch_is_ancestor_and_root_others_in_correct_order() -> Result<()> { let (_, _, r53, r55, r56) = prep_run_create_proposal().await?; for relay in [&r53, &r55, &r56] { let patch_events = relay .events .iter() .filter(|e| is_patch(e)) .collect::>(); // first patch tagged as root assert!( patch_events[0] .iter_tags() .any(|t| t.as_vec()[0].eq("t") && t.as_vec()[1].eq("root")) ); // first patch is ancestor assert_eq!( patch_events[0] .iter_tags() .find(|t| t.as_vec()[0].eq("commit")) .unwrap() .as_vec()[1], "431b84edc0d2fa118d63faa3c2db9c73d630a5ae" ); // second patch not tagged as root assert_eq!( patch_events[1] .iter_tags() .find(|t| t.as_vec()[0].eq("commit")) .unwrap() .as_vec()[1], "232efb37ebc67692c9e9ff58b83c0d3d63971a0a" ); // second patch not tagged as root assert_eq!( patch_events[2] .iter_tags() .find(|t| t.as_vec()[0].eq("commit")) .unwrap() .as_vec()[1], "fe973a840fba2a8ab37dd505c154854a69a6505c" ); } Ok(()) } } mod specify_in_reply_to { use super::*; fn cli_tester_create_proposal(git_repo: &GitTestRepo) -> CliTester { let args = vec![ "--nsec", TEST_KEY_1_NSEC, "--password", TEST_PASSWORD, "--disable-cli-spinners", "send", "--in-reply-to", "nevent1qqsypm62fzw7qynvlc4gjl3tr0jw4vmh659nvr2cc5qyhdg92a5yy0qzypumuen7l8wthtz45p3ftn58pvrs9xlumvkuu2xet8egzkcklqtesxygzam", "--title", "exampletitle", "--description", "exampledescription", ]; CliTester::new_from_dir(&git_repo.dir, args) } async fn prep_run_create_proposal() -> Result<( Relay<'static>, Relay<'static>, Relay<'static>, Relay<'static>, Relay<'static>, )> { let git_repo = prep_git_repo()?; // fallback (51,52) user write (53, 55) repo (55, 56) let (mut r51, mut r52, mut r53, mut r55, mut r56) = ( Relay::new( 8051, None, Some(&|relay, client_id, subscription_id, _| -> Result<()> { relay.respond_events( client_id, &subscription_id, &vec![ generate_test_key_1_metadata_event("fred"), generate_test_key_1_relay_list_event(), ], )?; Ok(()) }), ), Relay::new(8052, None, None), Relay::new(8053, None, None), Relay::new( 8055, None, Some(&|relay, client_id, subscription_id, _| -> Result<()> { relay.respond_events( client_id, &subscription_id, &vec![generate_repo_ref_event()], )?; Ok(()) }), ), Relay::new(8056, None, None), ); // // check relay had the right number of events let cli_tester_handle = std::thread::spawn(move || -> Result<()> { let mut p = cli_tester_create_proposal(&git_repo); p.expect_end_eventually()?; for p in [51, 52, 53, 55, 56] { relay::shutdown_relay(8000 + p)?; } Ok(()) }); // launch relay let _ = join!( r51.listen_until_close(), r52.listen_until_close(), r53.listen_until_close(), r55.listen_until_close(), r56.listen_until_close(), ); cli_tester_handle.join().unwrap()?; Ok((r51, r52, r53, r55, r56)) } mod cli_ouput { use super::*; async fn run_test_async() -> Result<()> { let git_repo = prep_git_repo()?; let (mut r51, mut r52, mut r53, mut r55, mut r56) = ( Relay::new( 8051, None, Some(&|relay, client_id, subscription_id, _| -> Result<()> { relay.respond_events( client_id, &subscription_id, &vec![ generate_test_key_1_metadata_event("fred"), generate_test_key_1_relay_list_event(), ], )?; Ok(()) }), ), Relay::new(8052, None, None), Relay::new(8053, None, None), Relay::new( 8055, None, Some(&|relay, client_id, subscription_id, _| -> Result<()> { relay.respond_events( client_id, &subscription_id, &vec![generate_repo_ref_event()], )?; Ok(()) }), ), Relay::new(8056, None, None), ); // // check relay had the right number of events let cli_tester_handle = std::thread::spawn(move || -> Result<()> { let mut p = cli_tester_create_proposal(&git_repo); expect_msgs_first(&mut p, true)?; relay::expect_send_with_progress( &mut p, vec![ (" [my-relay] [repo-relay] ws://localhost:8055", true, ""), (" [my-relay] ws://localhost:8053", true, ""), (" [repo-relay] ws://localhost:8056", true, ""), (" [default] ws://localhost:8051", true, ""), (" [default] ws://localhost:8052", true, ""), ], 3, )?; p.expect_end_with_whitespace()?; for p in [51, 52, 53, 55, 56] { relay::shutdown_relay(8000 + p)?; } Ok(()) }); // launch relay let _ = join!( r51.listen_until_close(), r52.listen_until_close(), r53.listen_until_close(), r55.listen_until_close(), r56.listen_until_close(), ); cli_tester_handle.join().unwrap()?; Ok(()) } #[tokio::test] #[serial] async fn check_cli_output() -> Result<()> { run_test_async().await?; Ok(()) } } mod cover_letter_tags { use super::*; #[tokio::test] #[serial] async fn t_tag_root() -> Result<()> { let (_, _, r53, r55, r56) = prep_run_create_proposal().await?; for relay in [&r53, &r55, &r56] { let cover_letter_event: &nostr::Event = relay.events.iter().find(|e| is_cover_letter(e)).unwrap(); assert!( cover_letter_event .iter_tags() .any(|t| { t.as_vec()[0].eq("t") && t.as_vec()[1].eq(&"root") }) ); } Ok(()) } #[tokio::test] #[serial] async fn t_tag_revision_root() -> Result<()> { let (_, _, r53, r55, r56) = prep_run_create_proposal().await?; for relay in [&r53, &r55, &r56] { let cover_letter_event: &nostr::Event = relay.events.iter().find(|e| is_cover_letter(e)).unwrap(); assert!( cover_letter_event .iter_tags() .any(|t| { t.as_vec()[0].eq("t") && t.as_vec()[1].eq(&"revision-root") }) ); } Ok(()) } #[tokio::test] #[serial] async fn e_tag_in_reply_to_event_as_reply() -> Result<()> { let (_, _, r53, r55, r56) = prep_run_create_proposal().await?; for relay in [&r53, &r55, &r56] { let cover_letter_event: &nostr::Event = relay.events.iter().find(|e| is_cover_letter(e)).unwrap(); assert_eq!( cover_letter_event .iter_tags() .find(|t| { t.as_vec()[0].eq("e") && t.as_vec().len().eq(&4) && t.as_vec()[3].eq("reply") }) .unwrap() .as_vec()[1], // id of state nevent "40ef4a489de0126cfe2a897e2b1be4eab377d50b360d58c5004bb5055768423c", ); } Ok(()) } } #[tokio::test] #[serial] async fn patch_tags_cover_letter_event_as_root() -> Result<()> { let (_, _, r53, r55, r56) = prep_run_create_proposal().await?; for relay in [&r53, &r55, &r56] { let patch_events: Vec<&nostr::Event> = relay.events.iter().filter(|e| is_patch(e)).collect(); let cover_letter_event = relay.events.iter().find(|e| is_cover_letter(e)).unwrap(); for patch in patch_events { assert_eq!( patch .tags .iter() .find(|t| { t.as_vec()[0].eq("e") && t.as_vec().len().eq(&4) && t.as_vec()[3].eq("root") }) .unwrap() .as_vec()[1], cover_letter_event.id.to_string() ); } } Ok(()) } }