From cabbdea4ae39a57cbff10d24084a888ca9948083 Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Thu, 5 Dec 2024 12:47:32 +0000
Subject: test(ngit): no nostr remote, search for repo

update the tests to reflect the changes in the previous 4 commits
---
 src/lib/repo_ref.rs |  4 ++--
 tests/ngit_list.rs  | 51 +++++++++++++++++++++++++++++++++++----------------
 2 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/src/lib/repo_ref.rs b/src/lib/repo_ref.rs
index b21a4e9..1b25ccf 100644
--- a/src/lib/repo_ref.rs
+++ b/src/lib/repo_ref.rs
@@ -438,15 +438,15 @@ fn set_or_create_git_remote_with_nostr_url(
     repo_ref: &RepoRef,
     git_repo: &Repo,
 ) -> Result<()> {
+    let url = repo_ref.to_nostr_git_url();
     if git_repo
         .git_repo
         .remote_set_url(name, &repo_ref.to_nostr_git_url())
         .is_err()
     {
-        let url = repo_ref.to_nostr_git_url();
         git_repo.git_repo.remote(name, &url)?;
-        eprintln!("set git remote \"{name}\" to {url}");
     }
+    eprintln!("set git remote \"{name}\" to {url}");
     Ok(())
 }
 
diff --git a/tests/ngit_list.rs b/tests/ngit_list.rs
index ab6ba22..1d297b6 100644
--- a/tests/ngit_list.rs
+++ b/tests/ngit_list.rs
@@ -76,29 +76,48 @@ mod cannot_find_repo_event {
                 test_repo.populate()?;
                 let mut p = CliTester::new_from_dir(&test_repo.dir, ["list"]);
                 p.expect(
-                    "hint: https://gitworkshop.dev/repos lists repositories and their naddr\r\n",
+                    "hint: https://gitworkshop.dev/repos lists repositories and their nostr address\r\n",
                 )?;
                 if invalid_input {
-                    let mut input = p.expect_input("repository naddr")?;
+                    let mut input = p.expect_input("nostr repository")?;
                     input.succeeds_with("dfgvfvfzadvd")?;
-                    p.expect("not a valid naddr\r\n")?;
-                    let _ = p.expect_input("repository naddr")?;
+                    p.expect("not a valid naddr or git nostr remote URL starting nostr://\r\n")?;
+                    let _ = p.expect_input("nostr repository")?;
                     p.exit()?;
                 }
                 if naddr {
-                    let mut input = p.expect_input("repository naddr")?;
-                    input.succeeds_with(
-                        &Coordinate {
-                            kind: nostr::Kind::GitRepoAnnouncement,
-                            public_key: TEST_KEY_1_KEYS.public_key(),
-                            identifier: repo_event.tags.identifier().unwrap().to_string(),
-                            relays: vec![RelayUrl::parse("ws://localhost:8056").unwrap()],
-                        }
-                        .to_bech32()?,
-                    )?;
+                    let mut input = p.expect_input("nostr repository")?;
+                    let coordinate = Coordinate {
+                        kind: nostr::Kind::GitRepoAnnouncement,
+                        public_key: TEST_KEY_1_KEYS.public_key(),
+                        identifier: repo_event.tags.identifier().unwrap().to_string(),
+                        relays: vec![RelayUrl::parse("ws://localhost:8056").unwrap()],
+                    };
+                    input.succeeds_with(&coordinate.to_bech32()?)?;
+                    p.expect("searching for repository...\r\n")?;
+                    p.expect_eventually("repository found\r\n")?;
+                    p.expect_confirm(
+                        "set git remote \"origin\" to nostr repository url?",
+                        Some(true),
+                    )?
+                    .succeeds_with(None)?;
+                    let nostr_url = format!(
+                        "nostr://{}/{}/{}",
+                        TEST_KEY_1_NPUB,
+                        // first relay in repo ann event
+                        urlencoding::encode("ws://localhost:8055"),
+                        coordinate.identifier,
+                    );
+                    p.expect(format!("set git remote \"origin\" to {}\r\n", &nostr_url))?;
                     p.expect("fetching updates...\r\n")?;
-                    p.expect_eventually("\r\n")?; // some updates listed here
+                    // no updates as they were fetched when searching for repo
+                    p.expect("no updates\r\n")?;
                     p.expect_end_with("no proposals found... create one? try `ngit send`\r\n")?;
+
+                    assert_eq!(
+                        test_repo.git_repo.find_remote("origin")?.url().unwrap(),
+                        nostr_url
+                    );
                 }
 
                 for p in [51, 52, 53, 55, 56] {
@@ -127,7 +146,7 @@ mod cannot_find_repo_event {
 
         #[tokio::test]
         #[serial]
-        async fn finds_based_on_naddr_on_embeded_relay() -> Result<()> {
+        async fn finds_based_on_naddr_on_embeded_relay_and_added_as_origin_remote() -> Result<()> {
             run_async_repo_event_ref_needed(false, true).await
         }
     }
-- 
cgit v1.2.3