diff options
Diffstat (limited to 'tests/git_remote_helper.rs')
| -rw-r--r-- | tests/git_remote_helper.rs | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/tests/git_remote_helper.rs b/tests/git_remote_helper.rs index 05ef442..d473214 100644 --- a/tests/git_remote_helper.rs +++ b/tests/git_remote_helper.rs | |||
| @@ -1,3 +1,5 @@ | |||
| 1 | use std::collections::HashSet; | ||
| 2 | |||
| 1 | use anyhow::{Context, Result}; | 3 | use anyhow::{Context, Result}; |
| 2 | use futures::join; | 4 | use futures::join; |
| 3 | use nostr::nips::nip01::Coordinate; | 5 | use nostr::nips::nip01::Coordinate; |
| @@ -110,6 +112,13 @@ mod list { | |||
| 110 | std::fs::write(source_git_repo.dir.join("commit.md"), "some content")?; | 112 | std::fs::write(source_git_repo.dir.join("commit.md"), "some content")?; |
| 111 | let main_commit_id = source_git_repo.stage_and_commit("commit.md")?; | 113 | let main_commit_id = source_git_repo.stage_and_commit("commit.md")?; |
| 112 | 114 | ||
| 115 | source_git_repo.create_branch("vnext")?; | ||
| 116 | source_git_repo.checkout("vnext")?; | ||
| 117 | std::fs::write(source_git_repo.dir.join("vnext.md"), "some content")?; | ||
| 118 | let vnext_commit_id = source_git_repo.stage_and_commit("vnext.md")?; | ||
| 119 | |||
| 120 | let head_commit_id = source_git_repo.checkout("main")?; | ||
| 121 | |||
| 113 | let git_repo = prep_git_repo()?; | 122 | let git_repo = prep_git_repo()?; |
| 114 | let events = vec![ | 123 | let events = vec![ |
| 115 | generate_test_key_1_metadata_event("fred"), | 124 | generate_test_key_1_metadata_event("fred"), |
| @@ -131,14 +140,17 @@ mod list { | |||
| 131 | let cli_tester_handle = std::thread::spawn(move || -> Result<()> { | 140 | let cli_tester_handle = std::thread::spawn(move || -> Result<()> { |
| 132 | let mut p = cli_tester_after_fetch(&git_repo)?; | 141 | let mut p = cli_tester_after_fetch(&git_repo)?; |
| 133 | p.send_line("list")?; | 142 | p.send_line("list")?; |
| 143 | // println!("{}", p.expect_eventually("\r\n\r\n")?); | ||
| 134 | assert_eq!( | 144 | assert_eq!( |
| 135 | p.expect_eventually("\r\n\r\n")? | 145 | p.expect_eventually("\r\n\r\n")? |
| 136 | .split("\r\n") | 146 | .split("\r\n") |
| 137 | .collect::<Vec<&str>>(), | 147 | .map(|e| e.to_string()) |
| 138 | vec![ | 148 | .collect::<HashSet<String>>(), |
| 139 | &format!("{} HEAD", main_commit_id), | 149 | HashSet::from([ |
| 140 | &format!("{} refs/heads/main", main_commit_id), | 150 | format!("{} HEAD", head_commit_id), |
| 141 | ], | 151 | format!("{} refs/heads/main", main_commit_id), |
| 152 | format!("{} refs/heads/vnext", vnext_commit_id), | ||
| 153 | ]), | ||
| 142 | ); | 154 | ); |
| 143 | p.exit()?; | 155 | p.exit()?; |
| 144 | for p in [51, 52, 53, 55, 56, 57] { | 156 | for p in [51, 52, 53, 55, 56, 57] { |
| @@ -161,7 +173,7 @@ mod list { | |||
| 161 | 173 | ||
| 162 | #[tokio::test] | 174 | #[tokio::test] |
| 163 | #[serial] | 175 | #[serial] |
| 164 | async fn lists_head_and_main_heads() -> Result<()> { | 176 | async fn lists_head_and_2_branches_and_commit_ids_from_git_server() -> Result<()> { |
| 165 | async_run_test().await | 177 | async_run_test().await |
| 166 | } | 178 | } |
| 167 | } | 179 | } |