From 06be0bc44011411b78217459f505ed12281b32c4 Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Fri, 1 Dec 2023 00:00:00 +0000 Subject: feat(prs-list) list and pull selected as branch - fetch prs and present as a selectable list - create and / or checkout branch for selected pr - apply latest patches as commits --- tests/prs_create.rs | 163 ++++++++--- tests/prs_list.rs | 768 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 889 insertions(+), 42 deletions(-) create mode 100644 tests/prs_list.rs (limited to 'tests') diff --git a/tests/prs_create.rs b/tests/prs_create.rs index dc6eec0..d00bb9f 100644 --- a/tests/prs_create.rs +++ b/tests/prs_create.rs @@ -147,9 +147,6 @@ mod sends_pr_and_2_patches_to_3_relays { use super::*; - static PR_KIND: u64 = 318; - static PATCH_KIND: u64 = 317; - fn prep_git_repo() -> Result { let test_repo = GitTestRepo::default(); test_repo.populate()?; @@ -409,10 +406,33 @@ mod sends_pr_and_2_patches_to_3_relays { mod pr_tags { use super::*; + #[test] + #[serial] + fn pr_tags_repo_commit_as_identifier() -> Result<()> { + let (_, _, r53, r55, r56) = futures::executor::block_on(prep_run_create_pr())?; + let root_commit = GitTestRepo::default().initial_commit()?; + + for relay in [&r53, &r55, &r56] { + let pr_event: &nostr::Event = relay + .events + .iter() + .find(|e| e.kind.as_u64().eq(&PR_KIND)) + .unwrap(); + + // root commit identifier tag + assert!(pr_event.tags.iter().any( + |t| t.as_vec()[0].eq("d") && t.as_vec()[1].eq(&format!("{}", root_commit)) + )); + } + Ok(()) + } + #[test] #[serial] fn pr_tags_repo_commit() -> Result<()> { let (_, _, r53, r55, r56) = futures::executor::block_on(prep_run_create_pr())?; + let root_commit = GitTestRepo::default().initial_commit()?; + for relay in [&r53, &r55, &r56] { let pr_event: &nostr::Event = relay .events @@ -421,8 +441,10 @@ mod sends_pr_and_2_patches_to_3_relays { .unwrap(); // root commit 'r' tag - assert!(pr_event.tags.iter().any(|t| t.as_vec()[0].eq("r") - && t.as_vec()[1].eq("r-9ee507fc4357d7ee16a5d8901bedcd103f23c17d"))); + assert!( + pr_event.tags.iter().any(|t| t.as_vec()[0].eq("r") + && t.as_vec()[1].eq(&format!("r-{}", root_commit))) + ); } Ok(()) } @@ -503,50 +525,107 @@ mod sends_pr_and_2_patches_to_3_relays { mod patch_tags { use super::*; + + fn prep() -> Result { + let (_, _, r53, _, _) = futures::executor::block_on(prep_run_create_pr())?; + Ok(r53 + .events + .iter() + .find(|e| e.kind.as_u64().eq(&PATCH_KIND)) + .unwrap() + .clone()) + } + #[test] #[serial] - fn patch_tags_correctly_formatted() -> Result<()> { - let (_, _, r53, r55, r56) = futures::executor::block_on(prep_run_create_pr())?; - for relay in [&r53, &r55, &r56] { - let patch_events: Vec<&nostr::Event> = relay - .events + fn commit_and_commit_r() -> Result<()> { + static COMMIT_ID: &str = "fe973a840fba2a8ab37dd505c154854a69a6505c"; + let most_recent_patch = prep()?; + assert!( + most_recent_patch + .tags .iter() - .filter(|e| e.kind.as_u64().eq(&PATCH_KIND)) - .collect(); + .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(()) + } - static COMMIT_ID: &str = "fe973a840fba2a8ab37dd505c154854a69a6505c"; - let most_recent_patch = patch_events[0]; + #[test] + #[serial] + fn parent_commit_and_parent_commit_r() -> Result<()> { + // commit parent 'r' and 'parent-commit' tag + static COMMIT_PARENT_ID: &str = "232efb37ebc67692c9e9ff58b83c0d3d63971a0a"; + let most_recent_patch = prep()?; + assert!( + most_recent_patch + .tags + .iter() + .any(|t| t.as_vec()[0].eq("r") && t.as_vec()[1].eq(COMMIT_PARENT_ID)) + ); + assert!( + most_recent_patch.tags.iter().any( + |t| t.as_vec()[0].eq("parent-commit") && t.as_vec()[1].eq(COMMIT_PARENT_ID) + ) + ); + Ok(()) + } - // commit 'r' and 'commit' tag - 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)) - ); + #[test] + #[serial] + fn root_commit_as_r_with_r_hypen_prefix() -> Result<()> { + assert!(prep()?.tags.iter().any(|t| t.as_vec()[0].eq("r") + && t.as_vec()[1].eq("r-9ee507fc4357d7ee16a5d8901bedcd103f23c17d"))); + Ok(()) + } - // commit parent 't' and 'parent-commit' tag - static COMMIT_PARENT_ID: &str = "232efb37ebc67692c9e9ff58b83c0d3d63971a0a"; - assert!( - most_recent_patch - .tags - .iter() - .any(|t| t.as_vec()[0].eq("r") && t.as_vec()[1].eq(COMMIT_PARENT_ID)) - ); - assert!(most_recent_patch.tags.iter().any( - |t| t.as_vec()[0].eq("parent-commit") && t.as_vec()[1].eq(COMMIT_PARENT_ID) - )); + #[test] + #[serial] + fn description_with_commit_message() -> Result<()> { + assert_eq!( + prep()? + .tags + .iter() + .find(|t| t.as_vec()[0].eq("description")) + .unwrap() + .as_vec()[1], + "add t4.md" + ); + Ok(()) + } - // root commit 't' tag - assert!(most_recent_patch.tags.iter().any(|t| t.as_vec()[0].eq("r") - && t.as_vec()[1].eq("r-9ee507fc4357d7ee16a5d8901bedcd103f23c17d"))); - } + #[test] + #[serial] + fn commit_author() -> Result<()> { + assert_eq!( + prep()? + .tags + .iter() + .find(|t| t.as_vec()[0].eq("author")) + .unwrap() + .as_vec(), + vec!["author", "Joe Bloggs", "joe.bloggs@pm.me", "0,0"], + ); + Ok(()) + } + + #[test] + #[serial] + fn commit_committer() -> Result<()> { + assert_eq!( + prep()? + .tags + .iter() + .find(|t| t.as_vec()[0].eq("committer")) + .unwrap() + .as_vec(), + vec!["committer", "Joe Bloggs", "joe.bloggs@pm.me", "0,0"], + ); Ok(()) } diff --git a/tests/prs_list.rs b/tests/prs_list.rs new file mode 100644 index 0000000..7bc3935 --- /dev/null +++ b/tests/prs_list.rs @@ -0,0 +1,768 @@ +use anyhow::Result; +use futures::join; +use serial_test::serial; +use test_utils::{git::GitTestRepo, relay::Relay, *}; + +static FEATURE_BRANCH_NAME_1: &str = "feature-example-t"; +static FEATURE_BRANCH_NAME_2: &str = "feature-example-f"; +static FEATURE_BRANCH_NAME_3: &str = "feature-example-c"; + +static PR_TITLE_1: &str = "pr a"; +static PR_TITLE_2: &str = "pr b"; +static PR_TITLE_3: &str = "pr c"; + +fn cli_tester_create_prs() -> Result { + let git_repo = GitTestRepo::default(); + git_repo.populate()?; + cli_tester_create_pr( + &git_repo, + FEATURE_BRANCH_NAME_1, + "a", + PR_TITLE_1, + "pr a description", + )?; + cli_tester_create_pr( + &git_repo, + FEATURE_BRANCH_NAME_2, + "b", + PR_TITLE_2, + "pr b description", + )?; + cli_tester_create_pr( + &git_repo, + FEATURE_BRANCH_NAME_3, + "c", + PR_TITLE_3, + "pr c description", + )?; + Ok(git_repo) +} + +fn create_and_populate_branch( + test_repo: &GitTestRepo, + branch_name: &str, + prefix: &str, + only_one_commit: bool, +) -> Result<()> { + test_repo.checkout("main")?; + test_repo.create_branch(branch_name)?; + test_repo.checkout(branch_name)?; + std::fs::write( + test_repo.dir.join(format!("{}3.md", prefix)), + "some content", + )?; + test_repo.stage_and_commit(format!("add {}3.md", prefix).as_str())?; + if !only_one_commit { + std::fs::write( + test_repo.dir.join(format!("{}4.md", prefix)), + "some content", + )?; + test_repo.stage_and_commit(format!("add {}4.md", prefix).as_str())?; + } + Ok(()) +} + +fn cli_tester_create_pr( + test_repo: &GitTestRepo, + branch_name: &str, + prefix: &str, + title: &str, + description: &str, +) -> Result<()> { + create_and_populate_branch(test_repo, branch_name, prefix, false)?; + + let mut p = CliTester::new_from_dir( + &test_repo.dir, + [ + "--nsec", + TEST_KEY_1_NSEC, + "--password", + TEST_PASSWORD, + "--disable-cli-spinners", + "prs", + "create", + "--title", + format!("\"{title}\"").as_str(), + "--description", + format!("\"{description}\"").as_str(), + ], + ); + p.expect_end_eventually()?; + Ok(()) +} + +mod when_main_branch_is_uptodate { + use super::*; + + mod when_pr_branch_doesnt_exist { + use super::*; + + mod when_main_is_checked_out { + use super::*; + + mod when_first_pr_selected { + use super::*; + + // TODO: test when other prs with the same name but from other repositories are + // present on relays + async fn prep_and_run() -> Result<(GitTestRepo, GitTestRepo)> { + // 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, None), + Relay::new(8052, None, None), + Relay::new(8053, None, None), + Relay::new(8055, None, None), + Relay::new(8056, None, None), + ); + + r51.events.push(generate_test_key_1_relay_list_event()); + r51.events.push(generate_test_key_1_metadata_event("fred")); + r51.events.push(generate_repo_ref_event()); + + r55.events.push(generate_repo_ref_event()); + r55.events.push(generate_test_key_1_metadata_event("fred")); + r55.events.push(generate_test_key_1_relay_list_event()); + + let cli_tester_handle = + std::thread::spawn(move || -> Result<(GitTestRepo, GitTestRepo)> { + let originating_repo = cli_tester_create_prs()?; + + let test_repo = GitTestRepo::default(); + test_repo.populate()?; + let mut p = CliTester::new_from_dir(&test_repo.dir, ["prs", "list"]); + + p.expect("finding PRs...\r\n")?; + let mut c = p.expect_choice( + "All PRs", + vec![ + format!("\"{PR_TITLE_1}\""), + format!("\"{PR_TITLE_2}\""), + format!("\"{PR_TITLE_3}\""), + ], + )?; + c.succeeds_with(0, true)?; + + p.expect_end_eventually_and_print()?; + + for p in [51, 52, 53, 55, 56] { + relay::shutdown_relay(8000 + p)?; + } + Ok((originating_repo, test_repo)) + }); + + // launch relay + let _ = join!( + r51.listen_until_close(), + r52.listen_until_close(), + r53.listen_until_close(), + r55.listen_until_close(), + r56.listen_until_close(), + ); + let res = cli_tester_handle.join().unwrap()?; + + Ok(res) + } + + mod cli_prompts { + use super::*; + async fn run_async_prompts_to_choose_from_pr_titles() -> Result<()> { + let (mut r51, mut r52, mut r53, mut r55, mut r56) = ( + Relay::new(8051, None, None), + Relay::new(8052, None, None), + Relay::new(8053, None, None), + Relay::new(8055, None, None), + Relay::new(8056, None, None), + ); + + r51.events.push(generate_test_key_1_relay_list_event()); + r51.events.push(generate_test_key_1_metadata_event("fred")); + r51.events.push(generate_repo_ref_event()); + + r55.events.push(generate_repo_ref_event()); + r55.events.push(generate_test_key_1_metadata_event("fred")); + r55.events.push(generate_test_key_1_relay_list_event()); + + let cli_tester_handle = std::thread::spawn(move || -> Result<()> { + cli_tester_create_prs()?; + + let test_repo = GitTestRepo::default(); + test_repo.populate()?; + let mut p = CliTester::new_from_dir(&test_repo.dir, ["prs", "list"]); + + p.expect("finding PRs...\r\n")?; + let mut c = p.expect_choice( + "All PRs", + vec![ + format!("\"{PR_TITLE_1}\""), + format!("\"{PR_TITLE_2}\""), + format!("\"{PR_TITLE_3}\""), + ], + )?; + c.succeeds_with(0, true)?; + p.expect("finding commits...\r\n")?; + p.expect("checked out PR branch. pulled 2 new commits\r\n")?; + p.expect_end()?; + + 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()?; + println!("{:?}", r55.events); + Ok(()) + } + + #[test] + #[serial] + fn prompts_to_choose_from_pr_titles() -> Result<()> { + futures::executor::block_on(run_async_prompts_to_choose_from_pr_titles()) + } + } + + #[test] + #[serial] + fn pr_branch_created_with_correct_name() -> Result<()> { + let (_, test_repo) = futures::executor::block_on(prep_and_run())?; + assert_eq!( + vec![FEATURE_BRANCH_NAME_1, "main"], + test_repo.get_local_branch_names()? + ); + Ok(()) + } + + #[test] + #[serial] + fn pr_branch_checked_out() -> Result<()> { + let (_, test_repo) = futures::executor::block_on(prep_and_run())?; + assert_eq!( + FEATURE_BRANCH_NAME_1, + test_repo.get_checked_out_branch_name()?, + ); + Ok(()) + } + + #[test] + #[serial] + fn pr_branch_tip_is_most_recent_patch() -> Result<()> { + let (originating_repo, test_repo) = + futures::executor::block_on(prep_and_run())?; + assert_eq!( + originating_repo.get_tip_of_local_branch(FEATURE_BRANCH_NAME_1)?, + test_repo.get_tip_of_local_branch(FEATURE_BRANCH_NAME_1)?, + ); + Ok(()) + } + } + mod when_third_pr_selected { + use super::*; + + async fn prep_and_run() -> Result<(GitTestRepo, GitTestRepo)> { + // 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, None), + Relay::new(8052, None, None), + Relay::new(8053, None, None), + Relay::new(8055, None, None), + Relay::new(8056, None, None), + ); + + r51.events.push(generate_test_key_1_relay_list_event()); + r51.events.push(generate_test_key_1_metadata_event("fred")); + r51.events.push(generate_repo_ref_event()); + + r55.events.push(generate_repo_ref_event()); + r55.events.push(generate_test_key_1_metadata_event("fred")); + r55.events.push(generate_test_key_1_relay_list_event()); + + let cli_tester_handle = + std::thread::spawn(move || -> Result<(GitTestRepo, GitTestRepo)> { + let originating_repo = cli_tester_create_prs()?; + + let test_repo = GitTestRepo::default(); + test_repo.populate()?; + let mut p = CliTester::new_from_dir(&test_repo.dir, ["prs", "list"]); + + p.expect("finding PRs...\r\n")?; + let mut c = p.expect_choice( + "All PRs", + vec![ + format!("\"{PR_TITLE_1}\""), + format!("\"{PR_TITLE_2}\""), + format!("\"{PR_TITLE_3}\""), + ], + )?; + c.succeeds_with(2, true)?; + + p.expect_end_eventually_and_print()?; + + for p in [51, 52, 53, 55, 56] { + relay::shutdown_relay(8000 + p)?; + } + Ok((originating_repo, test_repo)) + }); + + // launch relay + let _ = join!( + r51.listen_until_close(), + r52.listen_until_close(), + r53.listen_until_close(), + r55.listen_until_close(), + r56.listen_until_close(), + ); + let res = cli_tester_handle.join().unwrap()?; + + Ok(res) + } + + mod cli_prompts { + use super::*; + async fn run_async_prompts_to_choose_from_pr_titles() -> Result<()> { + let (mut r51, mut r52, mut r53, mut r55, mut r56) = ( + Relay::new(8051, None, None), + Relay::new(8052, None, None), + Relay::new(8053, None, None), + Relay::new(8055, None, None), + Relay::new(8056, None, None), + ); + + r51.events.push(generate_test_key_1_relay_list_event()); + r51.events.push(generate_test_key_1_metadata_event("fred")); + r51.events.push(generate_repo_ref_event()); + + r55.events.push(generate_repo_ref_event()); + r55.events.push(generate_test_key_1_metadata_event("fred")); + r55.events.push(generate_test_key_1_relay_list_event()); + + let cli_tester_handle = std::thread::spawn(move || -> Result<()> { + cli_tester_create_prs()?; + + let test_repo = GitTestRepo::default(); + test_repo.populate()?; + let mut p = CliTester::new_from_dir(&test_repo.dir, ["prs", "list"]); + + p.expect("finding PRs...\r\n")?; + let mut c = p.expect_choice( + "All PRs", + vec![ + format!("\"{PR_TITLE_1}\""), + format!("\"{PR_TITLE_2}\""), + format!("\"{PR_TITLE_3}\""), + ], + )?; + c.succeeds_with(2, true)?; + p.expect("finding commits...\r\n")?; + p.expect("checked out PR branch. pulled 2 new commits\r\n")?; + p.expect_end()?; + + 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()?; + println!("{:?}", r55.events); + Ok(()) + } + + #[test] + #[serial] + fn prompts_to_choose_from_pr_titles() -> Result<()> { + futures::executor::block_on(run_async_prompts_to_choose_from_pr_titles()) + } + } + + #[test] + #[serial] + fn pr_branch_created_with_correct_name() -> Result<()> { + let (_, test_repo) = futures::executor::block_on(prep_and_run())?; + assert_eq!( + vec![FEATURE_BRANCH_NAME_3, "main"], + test_repo.get_local_branch_names()? + ); + Ok(()) + } + + #[test] + #[serial] + fn pr_branch_checked_out() -> Result<()> { + let (_, test_repo) = futures::executor::block_on(prep_and_run())?; + assert_eq!( + FEATURE_BRANCH_NAME_3, + test_repo.get_checked_out_branch_name()?, + ); + Ok(()) + } + + #[test] + #[serial] + fn pr_branch_tip_is_most_recent_patch() -> Result<()> { + let (originating_repo, test_repo) = + futures::executor::block_on(prep_and_run())?; + assert_eq!( + originating_repo.get_tip_of_local_branch(FEATURE_BRANCH_NAME_3)?, + test_repo.get_tip_of_local_branch(FEATURE_BRANCH_NAME_3)?, + ); + Ok(()) + } + } + } + } + + mod when_pr_branch_exists { + use super::*; + + mod when_main_is_checked_out { + use super::*; + + mod when_branch_is_up_to_date { + use super::*; + async fn prep_and_run() -> Result<(GitTestRepo, GitTestRepo)> { + // 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, None), + Relay::new(8052, None, None), + Relay::new(8053, None, None), + Relay::new(8055, None, None), + Relay::new(8056, None, None), + ); + + r51.events.push(generate_test_key_1_relay_list_event()); + r51.events.push(generate_test_key_1_metadata_event("fred")); + r51.events.push(generate_repo_ref_event()); + + r55.events.push(generate_repo_ref_event()); + r55.events.push(generate_test_key_1_metadata_event("fred")); + r55.events.push(generate_test_key_1_relay_list_event()); + + let cli_tester_handle = + std::thread::spawn(move || -> Result<(GitTestRepo, GitTestRepo)> { + let originating_repo = cli_tester_create_prs()?; + + let test_repo = GitTestRepo::default(); + test_repo.populate()?; + let mut p = CliTester::new_from_dir(&test_repo.dir, ["prs", "list"]); + + create_and_populate_branch( + &test_repo, + FEATURE_BRANCH_NAME_1, + "a", + false, + )?; + test_repo.checkout("main")?; + p.expect("finding PRs...\r\n")?; + let mut c = p.expect_choice( + "All PRs", + vec![ + format!("\"{PR_TITLE_1}\""), + format!("\"{PR_TITLE_2}\""), + format!("\"{PR_TITLE_3}\""), + ], + )?; + c.succeeds_with(0, true)?; + p.expect_end_eventually_and_print()?; + + for p in [51, 52, 53, 55, 56] { + relay::shutdown_relay(8000 + p)?; + } + Ok((originating_repo, test_repo)) + }); + + // launch relay + let _ = join!( + r51.listen_until_close(), + r52.listen_until_close(), + r53.listen_until_close(), + r55.listen_until_close(), + r56.listen_until_close(), + ); + let res = cli_tester_handle.join().unwrap()?; + + Ok(res) + } + + mod cli_prompts { + use super::*; + async fn run_async_prompts_to_choose_from_pr_titles() -> Result<()> { + let (mut r51, mut r52, mut r53, mut r55, mut r56) = ( + Relay::new(8051, None, None), + Relay::new(8052, None, None), + Relay::new(8053, None, None), + Relay::new(8055, None, None), + Relay::new(8056, None, None), + ); + + r51.events.push(generate_test_key_1_relay_list_event()); + r51.events.push(generate_test_key_1_metadata_event("fred")); + r51.events.push(generate_repo_ref_event()); + + r55.events.push(generate_repo_ref_event()); + r55.events.push(generate_test_key_1_metadata_event("fred")); + r55.events.push(generate_test_key_1_relay_list_event()); + + let cli_tester_handle = std::thread::spawn(move || -> Result<()> { + cli_tester_create_prs()?; + + let test_repo = GitTestRepo::default(); + test_repo.populate()?; + let mut p = CliTester::new_from_dir(&test_repo.dir, ["prs", "list"]); + + create_and_populate_branch( + &test_repo, + FEATURE_BRANCH_NAME_1, + "a", + false, + )?; + test_repo.checkout("main")?; + + p.expect("finding PRs...\r\n")?; + let mut c = p.expect_choice( + "All PRs", + vec![ + format!("\"{PR_TITLE_1}\""), + format!("\"{PR_TITLE_2}\""), + format!("\"{PR_TITLE_3}\""), + ], + )?; + c.succeeds_with(0, true)?; + p.expect("finding commits...\r\n")?; + p.expect("checked out PR branch. no new commits to pull\r\n")?; + p.expect_end()?; + + 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()?; + println!("{:?}", r55.events); + Ok(()) + } + + #[test] + #[serial] + fn prompts_to_choose_from_pr_titles() -> Result<()> { + futures::executor::block_on(run_async_prompts_to_choose_from_pr_titles()) + } + } + + #[test] + #[serial] + fn pr_branch_checked_out() -> Result<()> { + let (_, test_repo) = futures::executor::block_on(prep_and_run())?; + assert_eq!( + FEATURE_BRANCH_NAME_1, + test_repo.get_checked_out_branch_name()?, + ); + Ok(()) + } + } + + mod when_branch_is_behind { + use super::*; + + async fn prep_and_run() -> Result<(GitTestRepo, GitTestRepo)> { + // 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, None), + Relay::new(8052, None, None), + Relay::new(8053, None, None), + Relay::new(8055, None, None), + Relay::new(8056, None, None), + ); + + r51.events.push(generate_test_key_1_relay_list_event()); + r51.events.push(generate_test_key_1_metadata_event("fred")); + r51.events.push(generate_repo_ref_event()); + + r55.events.push(generate_repo_ref_event()); + r55.events.push(generate_test_key_1_metadata_event("fred")); + r55.events.push(generate_test_key_1_relay_list_event()); + + let cli_tester_handle = + std::thread::spawn(move || -> Result<(GitTestRepo, GitTestRepo)> { + let originating_repo = cli_tester_create_prs()?; + + let test_repo = GitTestRepo::default(); + test_repo.populate()?; + let mut p = CliTester::new_from_dir(&test_repo.dir, ["prs", "list"]); + + create_and_populate_branch( + &test_repo, + FEATURE_BRANCH_NAME_1, + "a", + true, + )?; + test_repo.checkout("main")?; + + p.expect("finding PRs...\r\n")?; + let mut c = p.expect_choice( + "All PRs", + vec![ + format!("\"{PR_TITLE_1}\""), + format!("\"{PR_TITLE_2}\""), + format!("\"{PR_TITLE_3}\""), + ], + )?; + c.succeeds_with(0, true)?; + + p.expect_end_eventually_and_print()?; + + for p in [51, 52, 53, 55, 56] { + relay::shutdown_relay(8000 + p)?; + } + Ok((originating_repo, test_repo)) + }); + + // launch relay + let _ = join!( + r51.listen_until_close(), + r52.listen_until_close(), + r53.listen_until_close(), + r55.listen_until_close(), + r56.listen_until_close(), + ); + let res = cli_tester_handle.join().unwrap()?; + + Ok(res) + } + + mod cli_prompts { + use super::*; + async fn run_async_prompts_to_choose_from_pr_titles() -> Result<()> { + let (mut r51, mut r52, mut r53, mut r55, mut r56) = ( + Relay::new(8051, None, None), + Relay::new(8052, None, None), + Relay::new(8053, None, None), + Relay::new(8055, None, None), + Relay::new(8056, None, None), + ); + + r51.events.push(generate_test_key_1_relay_list_event()); + r51.events.push(generate_test_key_1_metadata_event("fred")); + r51.events.push(generate_repo_ref_event()); + + r55.events.push(generate_repo_ref_event()); + r55.events.push(generate_test_key_1_metadata_event("fred")); + r55.events.push(generate_test_key_1_relay_list_event()); + + let cli_tester_handle = std::thread::spawn(move || -> Result<()> { + cli_tester_create_prs()?; + + let test_repo = GitTestRepo::default(); + test_repo.populate()?; + let mut p = CliTester::new_from_dir(&test_repo.dir, ["prs", "list"]); + + create_and_populate_branch( + &test_repo, + FEATURE_BRANCH_NAME_1, + "a", + true, + )?; + test_repo.checkout("main")?; + + p.expect("finding PRs...\r\n")?; + let mut c = p.expect_choice( + "All PRs", + vec![ + format!("\"{PR_TITLE_1}\""), + format!("\"{PR_TITLE_2}\""), + format!("\"{PR_TITLE_3}\""), + ], + )?; + c.succeeds_with(0, true)?; + p.expect("finding commits...\r\n")?; + p.expect("checked out PR branch. pulled 1 new commits\r\n")?; + p.expect_end()?; + + 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()?; + println!("{:?}", r55.events); + Ok(()) + } + + #[test] + #[serial] + fn prompts_to_choose_from_pr_titles() -> Result<()> { + futures::executor::block_on(run_async_prompts_to_choose_from_pr_titles()) + } + } + + #[test] + #[serial] + fn pr_branch_checked_out() -> Result<()> { + let (_, test_repo) = futures::executor::block_on(prep_and_run())?; + assert_eq!( + FEATURE_BRANCH_NAME_1, + test_repo.get_checked_out_branch_name()?, + ); + Ok(()) + } + + #[test] + #[serial] + fn pr_branch_tip_is_most_recent_patch() -> Result<()> { + let (originating_repo, test_repo) = + futures::executor::block_on(prep_and_run())?; + assert_eq!( + originating_repo.get_tip_of_local_branch(FEATURE_BRANCH_NAME_1)?, + test_repo.get_tip_of_local_branch(FEATURE_BRANCH_NAME_1)?, + ); + Ok(()) + } + } + + mod when_branch_is_ahead { + // use super::*; + // TODO latest commit in pr builds off an older commit in pr + // instead of previous. + // TODO current git user created commit on branch + } + + mod when_latest_event_rebases_branch { + // use super::*; + // TODO + } + } + } +} -- cgit v1.2.3