2 files changed, 74 insertions, 14 deletions

diff --git a/test_utils/src/lib.rs b/test_utils/src/lib.rs
index 7697e6f..7a2bf35 100644
--- a/test_utils/src/lib.rs
+++ b/test_utils/src/lib.rs
@@ -150,10 +150,10 @@ pub fn make_event_old_or_change_user(
 }
 
 pub fn generate_repo_ref_event() -> nostr::Event {
-    generate_repo_ref_event_with_git_server("git:://123.gitexample.com/test".to_string())
+    generate_repo_ref_event_with_git_server("git:://123.gitexample.com/test")
 }
 
-pub fn generate_repo_ref_event_with_git_server(git_server: String) -> nostr::Event {
+pub fn generate_repo_ref_event_with_git_server(git_server: &str) -> nostr::Event {
     // taken from test git_repo
     // TODO - this may not be consistant across computers as it might take the
     // author and committer from global git config
@@ -171,7 +171,7 @@ pub fn generate_repo_ref_event_with_git_server(git_server: String) -> nostr::Eve
             Tag::from_standardized(TagStandard::Description("example description".into())),
             Tag::custom(
                 nostr::TagKind::Custom(std::borrow::Cow::Borrowed("clone")),
-                vec![git_server],
+                vec![git_server.to_string()],
             ),
             Tag::custom(
                 nostr::TagKind::Custom(std::borrow::Cow::Borrowed("web")),
@@ -887,7 +887,7 @@ impl CliTester {
         self.expect_end()
     }
 
-    fn send_line(&mut self, line: &str) -> Result<()> {
+    pub fn send_line(&mut self, line: &str) -> Result<()> {
         self.rexpect_session
             .send_line(line)
             .context("send_line failed")?;
diff --git a/tests/git_remote_helper.rs b/tests/git_remote_helper.rs
index 9bbd10f..05ef442 100644
--- a/tests/git_remote_helper.rs
+++ b/tests/git_remote_helper.rs
@@ -50,31 +50,26 @@ fn cli_tester_after_fetch(git_repo: &GitTestRepo) -> Result<CliTester> {
 
 mod initially_runs_fetch {
 
-    use relay::ListenerReqFunc;
-
     use super::*;
     async fn async_run_test() -> Result<()> {
         let source_git_repo = prep_git_repo()?;
-        let source_git_url = format!("git://{}", source_git_repo.dir.to_str().unwrap());
         let git_repo = prep_git_repo()?;
         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_url),
+            generate_repo_ref_event_with_git_server(source_git_repo.dir.to_str().unwrap()),
         ];
-        let responder: ListenerReqFunc = &|relay, client_id, subscription_id, _| -> Result<()> {
-            relay.respond_events(client_id, &subscription_id, &events)?;
-            Ok(())
-        };
         // 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, Some(&responder)),
+            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;
 
         // // check relay had the right number of events
         let cli_tester_handle = std::thread::spawn(move || -> Result<()> {
@@ -86,7 +81,7 @@ mod initially_runs_fetch {
             Ok(())
         });
 
-        // launch relay
+        // launch relays
         let _ = join!(
             r51.listen_until_close(),
             r52.listen_until_close(),
@@ -105,3 +100,68 @@ mod initially_runs_fetch {
         async_run_test().await
     }
 }
+
+mod list {
+
+    use super::*;
+
+    async fn async_run_test() -> Result<()> {
+        let source_git_repo = prep_git_repo()?;
+        std::fs::write(source_git_repo.dir.join("commit.md"), "some content")?;
+        let main_commit_id = source_git_repo.stage_and_commit("commit.md")?;
+
+        let git_repo = prep_git_repo()?;
+        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<()> {
+            let mut p = cli_tester_after_fetch(&git_repo)?;
+            p.send_line("list")?;
+            assert_eq!(
+                p.expect_eventually("\r\n\r\n")?
+                    .split("\r\n")
+                    .collect::<Vec<&str>>(),
+                vec![
+                    &format!("{} HEAD", main_commit_id),
+                    &format!("{} refs/heads/main", main_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 lists_head_and_main_heads() -> Result<()> {
+        async_run_test().await
+    }
+}