upleb.uk

Public git repos — served from a NIP-34 GRASP relay at git.upleb.uk

summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/init.rs30
-rw-r--r--tests/list.rs2
-rw-r--r--tests/send.rs19
3 files changed, 28 insertions, 23 deletions
diff --git a/tests/init.rs b/tests/init.rs
index 7e2e080..afd3848 100644
--- a/tests/init.rs
+++ b/tests/init.rs
@@ -1,4 +1,5 @@
1use anyhow::Result; 1use anyhow::Result;
2use nostr_sdk::Kind;
2use serial_test::serial; 3use serial_test::serial;
3use test_utils::{git::GitTestRepo, *}; 4use test_utils::{git::GitTestRepo, *};
4 5
@@ -124,6 +125,7 @@ mod when_repo_not_previously_claimed {
124 } 125 }
125 126
126 mod sent_to_correct_relays { 127 mod sent_to_correct_relays {
128
127 use super::*; 129 use super::*;
128 130
129 #[tokio::test] 131 #[tokio::test]
@@ -135,7 +137,7 @@ mod when_repo_not_previously_claimed {
135 relay 137 relay
136 .events 138 .events
137 .iter() 139 .iter()
138 .filter(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) 140 .filter(|e| e.kind.eq(&Kind::GitRepoAnnouncement))
139 .count(), 141 .count(),
140 1, 142 1,
141 ); 143 );
@@ -152,7 +154,7 @@ mod when_repo_not_previously_claimed {
152 relay 154 relay
153 .events 155 .events
154 .iter() 156 .iter()
155 .filter(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) 157 .filter(|e| e.kind.eq(&Kind::GitRepoAnnouncement))
156 .count(), 158 .count(),
157 1, 159 1,
158 ); 160 );
@@ -169,7 +171,7 @@ mod when_repo_not_previously_claimed {
169 relay 171 relay
170 .events 172 .events
171 .iter() 173 .iter()
172 .filter(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) 174 .filter(|e| e.kind.eq(&Kind::GitRepoAnnouncement))
173 .count(), 175 .count(),
174 1, 176 1,
175 ); 177 );
@@ -184,7 +186,7 @@ mod when_repo_not_previously_claimed {
184 assert_eq!( 186 assert_eq!(
185 r57.events 187 r57.events
186 .iter() 188 .iter()
187 .filter(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) 189 .filter(|e| e.kind.eq(&Kind::GitRepoAnnouncement))
188 .count(), 190 .count(),
189 1, 191 1,
190 ); 192 );
@@ -324,7 +326,7 @@ mod when_repo_not_previously_claimed {
324 .value() 326 .value()
325 .unwrap(), 327 .unwrap(),
326 Coordinate { 328 Coordinate {
327 kind: nostr_sdk::Kind::Custom(REPOSITORY_KIND), 329 kind: nostr_sdk::Kind::GitRepoAnnouncement,
328 identifier: "example-identifier".to_string(), 330 identifier: "example-identifier".to_string(),
329 public_key: TEST_KEY_1_KEYS.public_key(), 331 public_key: TEST_KEY_1_KEYS.public_key(),
330 relays: vec![], 332 relays: vec![],
@@ -367,7 +369,7 @@ mod when_repo_not_previously_claimed {
367 let event: &nostr::Event = relay 369 let event: &nostr::Event = relay
368 .events 370 .events
369 .iter() 371 .iter()
370 .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) 372 .find(|e| e.kind.eq(&Kind::GitRepoAnnouncement))
371 .unwrap(); 373 .unwrap();
372 374
373 assert!( 375 assert!(
@@ -387,7 +389,7 @@ mod when_repo_not_previously_claimed {
387 let event: &nostr::Event = relay 389 let event: &nostr::Event = relay
388 .events 390 .events
389 .iter() 391 .iter()
390 .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) 392 .find(|e| e.kind.eq(&Kind::GitRepoAnnouncement))
391 .unwrap(); 393 .unwrap();
392 394
393 assert!(event.tags.iter().any(|t| t.as_vec()[0].eq("r") 395 assert!(event.tags.iter().any(|t| t.as_vec()[0].eq("r")
@@ -405,7 +407,7 @@ mod when_repo_not_previously_claimed {
405 let event: &nostr::Event = relay 407 let event: &nostr::Event = relay
406 .events 408 .events
407 .iter() 409 .iter()
408 .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) 410 .find(|e| e.kind.eq(&Kind::GitRepoAnnouncement))
409 .unwrap(); 411 .unwrap();
410 412
411 assert!( 413 assert!(
@@ -426,7 +428,7 @@ mod when_repo_not_previously_claimed {
426 let event: &nostr::Event = relay 428 let event: &nostr::Event = relay
427 .events 429 .events
428 .iter() 430 .iter()
429 .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) 431 .find(|e| e.kind.eq(&Kind::GitRepoAnnouncement))
430 .unwrap(); 432 .unwrap();
431 433
432 assert!(event.tags.iter().any(|t| t.as_vec()[0].eq("alt") 434 assert!(event.tags.iter().any(|t| t.as_vec()[0].eq("alt")
@@ -443,7 +445,7 @@ mod when_repo_not_previously_claimed {
443 let event: &nostr::Event = relay 445 let event: &nostr::Event = relay
444 .events 446 .events
445 .iter() 447 .iter()
446 .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) 448 .find(|e| e.kind.eq(&Kind::GitRepoAnnouncement))
447 .unwrap(); 449 .unwrap();
448 450
449 assert!(event.tags.iter().any(|t| t.as_vec()[0].eq("description") 451 assert!(event.tags.iter().any(|t| t.as_vec()[0].eq("description")
@@ -460,7 +462,7 @@ mod when_repo_not_previously_claimed {
460 let event: &nostr::Event = relay 462 let event: &nostr::Event = relay
461 .events 463 .events
462 .iter() 464 .iter()
463 .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) 465 .find(|e| e.kind.eq(&Kind::GitRepoAnnouncement))
464 .unwrap(); 466 .unwrap();
465 467
466 assert!( 468 assert!(
@@ -479,7 +481,7 @@ mod when_repo_not_previously_claimed {
479 let event: &nostr::Event = relay 481 let event: &nostr::Event = relay
480 .events 482 .events
481 .iter() 483 .iter()
482 .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) 484 .find(|e| e.kind.eq(&Kind::GitRepoAnnouncement))
483 .unwrap(); 485 .unwrap();
484 let relays_tag = event 486 let relays_tag = event
485 .tags 487 .tags
@@ -501,7 +503,7 @@ mod when_repo_not_previously_claimed {
501 let event: &nostr::Event = relay 503 let event: &nostr::Event = relay
502 .events 504 .events
503 .iter() 505 .iter()
504 .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) 506 .find(|e| e.kind.eq(&Kind::GitRepoAnnouncement))
505 .unwrap(); 507 .unwrap();
506 let web_tag = event 508 let web_tag = event
507 .tags 509 .tags
@@ -523,7 +525,7 @@ mod when_repo_not_previously_claimed {
523 let event: &nostr::Event = relay 525 let event: &nostr::Event = relay
524 .events 526 .events
525 .iter() 527 .iter()
526 .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) 528 .find(|e| e.kind.eq(&Kind::GitRepoAnnouncement))
527 .unwrap(); 529 .unwrap();
528 let maintainers_tag = event 530 let maintainers_tag = event
529 .tags 531 .tags
diff --git a/tests/list.rs b/tests/list.rs
index 6e509ac..ce90ee4 100644
--- a/tests/list.rs
+++ b/tests/list.rs
@@ -88,7 +88,7 @@ mod cannot_find_repo_event {
88 let mut input = p.expect_input("repository naddr")?; 88 let mut input = p.expect_input("repository naddr")?;
89 input.succeeds_with( 89 input.succeeds_with(
90 &Coordinate { 90 &Coordinate {
91 kind: nostr::Kind::Custom(REPOSITORY_KIND), 91 kind: nostr::Kind::GitRepoAnnouncement,
92 public_key: TEST_KEY_1_KEYS.public_key(), 92 public_key: TEST_KEY_1_KEYS.public_key(),
93 identifier: repo_event.identifier().unwrap().to_string(), 93 identifier: repo_event.identifier().unwrap().to_string(),
94 relays: vec!["ws://localhost:8056".to_string()], 94 relays: vec!["ws://localhost:8056".to_string()],
diff --git a/tests/send.rs b/tests/send.rs
index 0f18bd1..57987e3 100644
--- a/tests/send.rs
+++ b/tests/send.rs
@@ -1,5 +1,6 @@
1use anyhow::Result; 1use anyhow::Result;
2use futures::join; 2use futures::join;
3use nostr_sdk::Kind;
3use serial_test::serial; 4use serial_test::serial;
4use test_utils::{git::GitTestRepo, relay::Relay, *}; 5use test_utils::{git::GitTestRepo, relay::Relay, *};
5 6
@@ -84,13 +85,11 @@ mod when_commits_behind_ask_to_proceed {
84} 85}
85 86
86fn is_cover_letter(event: &nostr::Event) -> bool { 87fn is_cover_letter(event: &nostr::Event) -> bool {
87 event.kind.as_u16().eq(&PATCH_KIND) 88 event.kind.eq(&Kind::GitPatch) && event.iter_tags().any(|t| t.as_vec()[1].eq("cover-letter"))
88 && event.iter_tags().any(|t| t.as_vec()[1].eq("cover-letter"))
89} 89}
90 90
91fn is_patch(event: &nostr::Event) -> bool { 91fn is_patch(event: &nostr::Event) -> bool {
92 event.kind.as_u16().eq(&PATCH_KIND) 92 event.kind.eq(&Kind::GitPatch) && !event.iter_tags().any(|t| t.as_vec()[1].eq("cover-letter"))
93 && !event.iter_tags().any(|t| t.as_vec()[1].eq("cover-letter"))
94} 93}
95 94
96fn prep_git_repo() -> Result<GitTestRepo> { 95fn prep_git_repo() -> Result<GitTestRepo> {
@@ -386,12 +385,14 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_
386 relay.events.iter().find(|e| is_cover_letter(e)).unwrap(); 385 relay.events.iter().find(|e| is_cover_letter(e)).unwrap();
387 assert!(cover_letter_event.iter_tags().any(|t| t.as_vec()[0].eq("a") 386 assert!(cover_letter_event.iter_tags().any(|t| t.as_vec()[0].eq("a")
388 && t.as_vec()[1].eq(&format!( 387 && t.as_vec()[1].eq(&format!(
389 "{REPOSITORY_KIND}:{TEST_KEY_1_PUBKEY_HEX}:{}", 388 "{}:{TEST_KEY_1_PUBKEY_HEX}:{}",
389 Kind::GitRepoAnnouncement,
390 generate_repo_ref_event().identifier().unwrap() 390 generate_repo_ref_event().identifier().unwrap()
391 )))); 391 ))));
392 assert!(cover_letter_event.iter_tags().any(|t| t.as_vec()[0].eq("a") 392 assert!(cover_letter_event.iter_tags().any(|t| t.as_vec()[0].eq("a")
393 && t.as_vec()[1].eq(&format!( 393 && t.as_vec()[1].eq(&format!(
394 "{REPOSITORY_KIND}:{TEST_KEY_2_PUBKEY_HEX}:{}", 394 "{}:{TEST_KEY_2_PUBKEY_HEX}:{}",
395 Kind::GitRepoAnnouncement,
395 generate_repo_ref_event().identifier().unwrap() 396 generate_repo_ref_event().identifier().unwrap()
396 )))); 397 ))));
397 } 398 }
@@ -577,14 +578,16 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_
577 assert!(prep().await?.tags.iter().any(|t| { 578 assert!(prep().await?.tags.iter().any(|t| {
578 t.as_vec()[0].eq("a") 579 t.as_vec()[0].eq("a")
579 && t.as_vec()[1].eq(&format!( 580 && t.as_vec()[1].eq(&format!(
580 "{REPOSITORY_KIND}:{TEST_KEY_1_PUBKEY_HEX}:{}", 581 "{}:{TEST_KEY_1_PUBKEY_HEX}:{}",
582 Kind::GitRepoAnnouncement,
581 generate_repo_ref_event().identifier().unwrap() 583 generate_repo_ref_event().identifier().unwrap()
582 )) 584 ))
583 })); 585 }));
584 assert!(prep().await?.tags.iter().any(|t| { 586 assert!(prep().await?.tags.iter().any(|t| {
585 t.as_vec()[0].eq("a") 587 t.as_vec()[0].eq("a")
586 && t.as_vec()[1].eq(&format!( 588 && t.as_vec()[1].eq(&format!(
587 "{REPOSITORY_KIND}:{TEST_KEY_2_PUBKEY_HEX}:{}", 589 "{}:{TEST_KEY_2_PUBKEY_HEX}:{}",
590 Kind::GitRepoAnnouncement,
588 generate_repo_ref_event().identifier().unwrap() 591 generate_repo_ref_event().identifier().unwrap()
589 )) 592 ))
590 })); 593 }));
generated by cgit v1.2.3 (git 2.39.1) at 2026-06-05 17:01:45 +0000