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/git_remote_nostr/push.rs37
1 files changed, 25 insertions, 12 deletions
diff --git a/tests/git_remote_nostr/push.rs b/tests/git_remote_nostr/push.rs
index 2e9642f..e5d1b13 100644
--- a/tests/git_remote_nostr/push.rs
+++ b/tests/git_remote_nostr/push.rs
@@ -1174,22 +1174,35 @@ async fn proposal_fast_forward_merge_commits_pushed_to_main_leads_to_status_even
1174 .to_string() 1174 .to_string()
1175 }) 1175 })
1176 .collect::<Vec<String>>(); 1176 .collect::<Vec<String>>();
1177
1177 assert_eq!( 1178 assert_eq!(
1178 [ 1179 // HashSet::<String>::from_iter(vec![
1179 vec!["merge-commit-id".to_string()], 1180 // "merge-commit-id".to_string(),
1180 patch_commit_ids_parents_first 1181 // "6bd4f54bdf6a9ef2ec09e88e7a8d05376b0c1ff4".to_string(),
1181 ] 1182 // "eb5d67886abad23c259ebd684c2bba233f9ed3d1".to_string(),
1182 .concat(), 1183 // ]),
1183 merge_status 1184 HashSet::from_iter(
1184 .tags 1185 [
1186 vec!["merge-commit-id".to_string()],
1187 patch_commit_ids_parents_first
1188 ]
1189 .concat()
1185 .iter() 1190 .iter()
1186 .find(|t| t.as_slice()[0].eq("merge-commit-id")) 1191 .cloned()
1187 .unwrap() 1192 ),
1188 .clone() 1193 HashSet::<String>::from_iter(
1189 .to_vec(), 1194 merge_status
1195 .tags
1196 .iter()
1197 .find(|t| t.as_slice()[0].eq("merge-commit-id"))
1198 .unwrap()
1199 .clone()
1200 .to_vec()
1201 .iter()
1202 .cloned()
1203 ),
1190 "status sets correct merge-commit-id tag {merge_status:?}" 1204 "status sets correct merge-commit-id tag {merge_status:?}"
1191 ); 1205 );
1192
1193 for patch_id in proposal_patches 1206 for patch_id in proposal_patches
1194 .iter() 1207 .iter()
1195 .map(|e| e.id.to_string()) 1208 .map(|e| e.id.to_string())