1 files changed, 93 insertions, 0 deletions

diff --git a/tests/git_remote_helper.rs b/tests/git_remote_helper.rs
index ab29726..fced270 100644
--- a/tests/git_remote_helper.rs
+++ b/tests/git_remote_helper.rs
@@ -248,3 +248,96 @@ mod fetch {
         async_run_test().await
     }
 }
+
+mod push {
+
+    use super::*;
+
+    mod two_branches_in_batch {
+
+        use super::*;
+
+        mod git_server_updated {
+
+            use super::*;
+
+            async fn async_run_test() -> Result<()> {
+                let git_repo = prep_git_repo()?;
+                let source_git_repo = GitTestRepo::recreate_as_bare(&git_repo)?;
+
+                std::fs::write(git_repo.dir.join("commit.md"), "some content")?;
+                let main_commit_id = git_repo.stage_and_commit("commit.md")?;
+
+                git_repo.create_branch("vnext")?;
+                git_repo.checkout("vnext")?;
+                std::fs::write(git_repo.dir.join("vnext.md"), "some content")?;
+                let vnext_commit_id = git_repo.stage_and_commit("vnext.md")?;
+
+                let events = vec![
+                    generate_test_key_1_metadata_event("fred"),
+                    generate_test_key_1_relay_list_event(),
+                    generate_repo_ref_event_with_git_server(source_git_repo.dir.to_str().unwrap()),
+                ];
+                // fallback (51,52) user write (53, 55) repo (55, 56) blaster (57)
+                let (mut r51, mut r52, mut r53, mut r55, mut r56, mut r57) = (
+                    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),
+                    Relay::new(8057, None, None),
+                );
+                r51.events = events.clone();
+                r55.events = events;
+
+                let cli_tester_handle = std::thread::spawn(move || -> Result<()> {
+                    assert_ne!(
+                        source_git_repo.get_tip_of_local_branch("main")?,
+                        main_commit_id
+                    );
+
+                    let mut p = cli_tester_after_fetch(&git_repo)?;
+                    p.send_line("push refs/heads/main:refs/heads/main")?;
+                    p.send_line("push refs/heads/vnext:refs/heads/vnext")?;
+                    p.send_line("")?;
+                    p.expect("ok refs/heads/main\r\n")?;
+                    p.expect("ok refs/heads/vnext\r\n")?;
+                    p.expect("\r\n")?;
+
+                    assert_eq!(
+                        source_git_repo.get_tip_of_local_branch("main")?,
+                        main_commit_id
+                    );
+
+                    assert_eq!(
+                        source_git_repo.get_tip_of_local_branch("vnext")?,
+                        vnext_commit_id
+                    );
+
+                    p.exit()?;
+                    for p in [51, 52, 53, 55, 56, 57] {
+                        relay::shutdown_relay(8000 + p)?;
+                    }
+                    Ok(())
+                });
+                // launch relays
+                let _ = join!(
+                    r51.listen_until_close(),
+                    r52.listen_until_close(),
+                    r53.listen_until_close(),
+                    r55.listen_until_close(),
+                    r56.listen_until_close(),
+                    r57.listen_until_close(),
+                );
+                cli_tester_handle.join().unwrap()?;
+                Ok(())
+            }
+
+            #[tokio::test]
+            #[serial]
+            async fn push_updates_ref_on_git_server() -> Result<()> {
+                async_run_test().await
+            }
+        }
+    }
+}