diff options
Diffstat (limited to 'tests/ngit_send.rs')
| -rw-r--r-- | tests/ngit_send.rs | 246 |
1 files changed, 90 insertions, 156 deletions
diff --git a/tests/ngit_send.rs b/tests/ngit_send.rs index 1ffb515..d728d9c 100644 --- a/tests/ngit_send.rs +++ b/tests/ngit_send.rs | |||
| @@ -181,14 +181,10 @@ async fn prep_run_create_proposal( | |||
| 181 | 8051, | 181 | 8051, |
| 182 | None, | 182 | None, |
| 183 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { | 183 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { |
| 184 | relay.respond_events( | 184 | relay.respond_events(client_id, &subscription_id, &vec![ |
| 185 | client_id, | 185 | generate_test_key_1_metadata_event("fred"), |
| 186 | &subscription_id, | 186 | generate_test_key_1_relay_list_event(), |
| 187 | &vec![ | 187 | ])?; |
| 188 | generate_test_key_1_metadata_event("fred"), | ||
| 189 | generate_test_key_1_relay_list_event(), | ||
| 190 | ], | ||
| 191 | )?; | ||
| 192 | Ok(()) | 188 | Ok(()) |
| 193 | }), | 189 | }), |
| 194 | ), | 190 | ), |
| @@ -198,11 +194,9 @@ async fn prep_run_create_proposal( | |||
| 198 | 8055, | 194 | 8055, |
| 199 | None, | 195 | None, |
| 200 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { | 196 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { |
| 201 | relay.respond_events( | 197 | relay.respond_events(client_id, &subscription_id, &vec![ |
| 202 | client_id, | 198 | generate_repo_ref_event(), |
| 203 | &subscription_id, | 199 | ])?; |
| 204 | &vec![generate_repo_ref_event()], | ||
| 205 | )?; | ||
| 206 | Ok(()) | 200 | Ok(()) |
| 207 | }), | 201 | }), |
| 208 | ), | 202 | ), |
| @@ -764,14 +758,10 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ | |||
| 764 | 8051, | 758 | 8051, |
| 765 | None, | 759 | None, |
| 766 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { | 760 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { |
| 767 | relay.respond_events( | 761 | relay.respond_events(client_id, &subscription_id, &vec![ |
| 768 | client_id, | 762 | generate_test_key_1_metadata_event("fred"), |
| 769 | &subscription_id, | 763 | generate_test_key_1_relay_list_event(), |
| 770 | &vec![ | 764 | ])?; |
| 771 | generate_test_key_1_metadata_event("fred"), | ||
| 772 | generate_test_key_1_relay_list_event(), | ||
| 773 | ], | ||
| 774 | )?; | ||
| 775 | Ok(()) | 765 | Ok(()) |
| 776 | }), | 766 | }), |
| 777 | ), | 767 | ), |
| @@ -781,11 +771,9 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ | |||
| 781 | 8055, | 771 | 8055, |
| 782 | None, | 772 | None, |
| 783 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { | 773 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { |
| 784 | relay.respond_events( | 774 | relay.respond_events(client_id, &subscription_id, &vec![ |
| 785 | client_id, | 775 | generate_repo_ref_event(), |
| 786 | &subscription_id, | 776 | ])?; |
| 787 | &vec![generate_repo_ref_event()], | ||
| 788 | )?; | ||
| 789 | Ok(()) | 777 | Ok(()) |
| 790 | }), | 778 | }), |
| 791 | ), | 779 | ), |
| @@ -844,14 +832,10 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ | |||
| 844 | 8051, | 832 | 8051, |
| 845 | None, | 833 | None, |
| 846 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { | 834 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { |
| 847 | relay.respond_events( | 835 | relay.respond_events(client_id, &subscription_id, &vec![ |
| 848 | client_id, | 836 | generate_test_key_1_metadata_event("fred"), |
| 849 | &subscription_id, | 837 | generate_test_key_1_relay_list_event(), |
| 850 | &vec![ | 838 | ])?; |
| 851 | generate_test_key_1_metadata_event("fred"), | ||
| 852 | generate_test_key_1_relay_list_event(), | ||
| 853 | ], | ||
| 854 | )?; | ||
| 855 | Ok(()) | 839 | Ok(()) |
| 856 | }), | 840 | }), |
| 857 | ), | 841 | ), |
| @@ -861,11 +845,9 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ | |||
| 861 | 8055, | 845 | 8055, |
| 862 | None, | 846 | None, |
| 863 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { | 847 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { |
| 864 | relay.respond_events( | 848 | relay.respond_events(client_id, &subscription_id, &vec![ |
| 865 | client_id, | 849 | generate_repo_ref_event(), |
| 866 | &subscription_id, | 850 | ])?; |
| 867 | &vec![generate_repo_ref_event()], | ||
| 868 | )?; | ||
| 869 | Ok(()) | 851 | Ok(()) |
| 870 | }), | 852 | }), |
| 871 | ), | 853 | ), |
| @@ -918,14 +900,10 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ | |||
| 918 | 8051, | 900 | 8051, |
| 919 | None, | 901 | None, |
| 920 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { | 902 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { |
| 921 | relay.respond_events( | 903 | relay.respond_events(client_id, &subscription_id, &vec![ |
| 922 | client_id, | 904 | generate_test_key_1_metadata_event("fred"), |
| 923 | &subscription_id, | 905 | generate_test_key_1_relay_list_event(), |
| 924 | &vec![ | 906 | ])?; |
| 925 | generate_test_key_1_metadata_event("fred"), | ||
| 926 | generate_test_key_1_relay_list_event(), | ||
| 927 | ], | ||
| 928 | )?; | ||
| 929 | Ok(()) | 907 | Ok(()) |
| 930 | }), | 908 | }), |
| 931 | ), | 909 | ), |
| @@ -935,11 +913,9 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ | |||
| 935 | 8055, | 913 | 8055, |
| 936 | None, | 914 | None, |
| 937 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { | 915 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { |
| 938 | relay.respond_events( | 916 | relay.respond_events(client_id, &subscription_id, &vec![ |
| 939 | client_id, | 917 | generate_repo_ref_event(), |
| 940 | &subscription_id, | 918 | ])?; |
| 941 | &vec![generate_repo_ref_event()], | ||
| 942 | )?; | ||
| 943 | Ok(()) | 919 | Ok(()) |
| 944 | }), | 920 | }), |
| 945 | ), | 921 | ), |
| @@ -1012,14 +988,10 @@ mod when_no_cover_letter_flag_set_with_range_of_head_2_sends_2_patches_without_c | |||
| 1012 | 8051, | 988 | 8051, |
| 1013 | None, | 989 | None, |
| 1014 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { | 990 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { |
| 1015 | relay.respond_events( | 991 | relay.respond_events(client_id, &subscription_id, &vec![ |
| 1016 | client_id, | 992 | generate_test_key_1_metadata_event("fred"), |
| 1017 | &subscription_id, | 993 | generate_test_key_1_relay_list_event(), |
| 1018 | &vec![ | 994 | ])?; |
| 1019 | generate_test_key_1_metadata_event("fred"), | ||
| 1020 | generate_test_key_1_relay_list_event(), | ||
| 1021 | ], | ||
| 1022 | )?; | ||
| 1023 | Ok(()) | 995 | Ok(()) |
| 1024 | }), | 996 | }), |
| 1025 | ), | 997 | ), |
| @@ -1029,11 +1001,9 @@ mod when_no_cover_letter_flag_set_with_range_of_head_2_sends_2_patches_without_c | |||
| 1029 | 8055, | 1001 | 8055, |
| 1030 | None, | 1002 | None, |
| 1031 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { | 1003 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { |
| 1032 | relay.respond_events( | 1004 | relay.respond_events(client_id, &subscription_id, &vec![ |
| 1033 | client_id, | 1005 | generate_repo_ref_event(), |
| 1034 | &subscription_id, | 1006 | ])?; |
| 1035 | &vec![generate_repo_ref_event()], | ||
| 1036 | )?; | ||
| 1037 | Ok(()) | 1007 | Ok(()) |
| 1038 | }), | 1008 | }), |
| 1039 | ), | 1009 | ), |
| @@ -1200,16 +1170,13 @@ mod when_range_ommited_prompts_for_selection_defaulting_ahead_of_main { | |||
| 1200 | fn expect_msgs_first(p: &mut CliTester) -> Result<()> { | 1170 | fn expect_msgs_first(p: &mut CliTester) -> Result<()> { |
| 1201 | p.expect("fetching updates...\r\n")?; | 1171 | p.expect("fetching updates...\r\n")?; |
| 1202 | p.expect_eventually("\r\n")?; // may be 'no updates' or some updates | 1172 | p.expect_eventually("\r\n")?; // may be 'no updates' or some updates |
| 1203 | let mut selector = p.expect_multi_select( | 1173 | let mut selector = p.expect_multi_select("select commits for proposal", vec![ |
| 1204 | "select commits for proposal", | 1174 | "(Joe Bloggs) add t4.md [feature] fe973a8".to_string(), |
| 1205 | vec![ | 1175 | "(Joe Bloggs) add t3.md 232efb3".to_string(), |
| 1206 | "(Joe Bloggs) add t4.md [feature] fe973a8".to_string(), | 1176 | "(Joe Bloggs) add t2.md [main] 431b84e".to_string(), |
| 1207 | "(Joe Bloggs) add t3.md 232efb3".to_string(), | 1177 | "(Joe Bloggs) add t1.md af474d8".to_string(), |
| 1208 | "(Joe Bloggs) add t2.md [main] 431b84e".to_string(), | 1178 | "(Joe Bloggs) Initial commit 9ee507f".to_string(), |
| 1209 | "(Joe Bloggs) add t1.md af474d8".to_string(), | 1179 | ])?; |
| 1210 | "(Joe Bloggs) Initial commit 9ee507f".to_string(), | ||
| 1211 | ], | ||
| 1212 | )?; | ||
| 1213 | selector.succeeds_with(vec![0, 1], false, vec![0, 1])?; | 1180 | selector.succeeds_with(vec![0, 1], false, vec![0, 1])?; |
| 1214 | p.expect("creating proposal from 2 commits:\r\n")?; | 1181 | p.expect("creating proposal from 2 commits:\r\n")?; |
| 1215 | p.expect("fe973a8 add t4.md\r\n")?; | 1182 | p.expect("fe973a8 add t4.md\r\n")?; |
| @@ -1234,14 +1201,10 @@ mod when_range_ommited_prompts_for_selection_defaulting_ahead_of_main { | |||
| 1234 | 8051, | 1201 | 8051, |
| 1235 | None, | 1202 | None, |
| 1236 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { | 1203 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { |
| 1237 | relay.respond_events( | 1204 | relay.respond_events(client_id, &subscription_id, &vec![ |
| 1238 | client_id, | 1205 | generate_test_key_1_metadata_event("fred"), |
| 1239 | &subscription_id, | 1206 | generate_test_key_1_relay_list_event(), |
| 1240 | &vec![ | 1207 | ])?; |
| 1241 | generate_test_key_1_metadata_event("fred"), | ||
| 1242 | generate_test_key_1_relay_list_event(), | ||
| 1243 | ], | ||
| 1244 | )?; | ||
| 1245 | Ok(()) | 1208 | Ok(()) |
| 1246 | }), | 1209 | }), |
| 1247 | ), | 1210 | ), |
| @@ -1251,11 +1214,9 @@ mod when_range_ommited_prompts_for_selection_defaulting_ahead_of_main { | |||
| 1251 | 8055, | 1214 | 8055, |
| 1252 | None, | 1215 | None, |
| 1253 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { | 1216 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { |
| 1254 | relay.respond_events( | 1217 | relay.respond_events(client_id, &subscription_id, &vec![ |
| 1255 | client_id, | 1218 | generate_repo_ref_event(), |
| 1256 | &subscription_id, | 1219 | ])?; |
| 1257 | &vec![generate_repo_ref_event()], | ||
| 1258 | )?; | ||
| 1259 | Ok(()) | 1220 | Ok(()) |
| 1260 | }), | 1221 | }), |
| 1261 | ), | 1222 | ), |
| @@ -1297,14 +1258,10 @@ mod when_range_ommited_prompts_for_selection_defaulting_ahead_of_main { | |||
| 1297 | 8051, | 1258 | 8051, |
| 1298 | None, | 1259 | None, |
| 1299 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { | 1260 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { |
| 1300 | relay.respond_events( | 1261 | relay.respond_events(client_id, &subscription_id, &vec![ |
| 1301 | client_id, | 1262 | generate_test_key_1_metadata_event("fred"), |
| 1302 | &subscription_id, | 1263 | generate_test_key_1_relay_list_event(), |
| 1303 | &vec![ | 1264 | ])?; |
| 1304 | generate_test_key_1_metadata_event("fred"), | ||
| 1305 | generate_test_key_1_relay_list_event(), | ||
| 1306 | ], | ||
| 1307 | )?; | ||
| 1308 | Ok(()) | 1265 | Ok(()) |
| 1309 | }), | 1266 | }), |
| 1310 | ), | 1267 | ), |
| @@ -1314,11 +1271,9 @@ mod when_range_ommited_prompts_for_selection_defaulting_ahead_of_main { | |||
| 1314 | 8055, | 1271 | 8055, |
| 1315 | None, | 1272 | None, |
| 1316 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { | 1273 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { |
| 1317 | relay.respond_events( | 1274 | relay.respond_events(client_id, &subscription_id, &vec![ |
| 1318 | client_id, | 1275 | generate_repo_ref_event(), |
| 1319 | &subscription_id, | 1276 | ])?; |
| 1320 | &vec![generate_repo_ref_event()], | ||
| 1321 | )?; | ||
| 1322 | Ok(()) | 1277 | Ok(()) |
| 1323 | }), | 1278 | }), |
| 1324 | ), | 1279 | ), |
| @@ -1435,15 +1390,11 @@ mod root_proposal_specified_using_in_reply_to_with_range_of_head_2_and_cover_let | |||
| 1435 | 8051, | 1390 | 8051, |
| 1436 | None, | 1391 | None, |
| 1437 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { | 1392 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { |
| 1438 | relay.respond_events( | 1393 | relay.respond_events(client_id, &subscription_id, &vec![ |
| 1439 | client_id, | 1394 | generate_test_key_1_metadata_event("fred"), |
| 1440 | &subscription_id, | 1395 | generate_test_key_1_relay_list_event(), |
| 1441 | &vec![ | 1396 | get_pretend_proposal_root_event(), |
| 1442 | generate_test_key_1_metadata_event("fred"), | 1397 | ])?; |
| 1443 | generate_test_key_1_relay_list_event(), | ||
| 1444 | get_pretend_proposal_root_event(), | ||
| 1445 | ], | ||
| 1446 | )?; | ||
| 1447 | Ok(()) | 1398 | Ok(()) |
| 1448 | }), | 1399 | }), |
| 1449 | ), | 1400 | ), |
| @@ -1453,11 +1404,10 @@ mod root_proposal_specified_using_in_reply_to_with_range_of_head_2_and_cover_let | |||
| 1453 | 8055, | 1404 | 8055, |
| 1454 | None, | 1405 | None, |
| 1455 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { | 1406 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { |
| 1456 | relay.respond_events( | 1407 | relay.respond_events(client_id, &subscription_id, &vec![ |
| 1457 | client_id, | 1408 | generate_repo_ref_event(), |
| 1458 | &subscription_id, | 1409 | get_pretend_proposal_root_event(), |
| 1459 | &vec![generate_repo_ref_event(), get_pretend_proposal_root_event()], | 1410 | ])?; |
| 1460 | )?; | ||
| 1461 | Ok(()) | 1411 | Ok(()) |
| 1462 | }), | 1412 | }), |
| 1463 | ), | 1413 | ), |
| @@ -1498,15 +1448,11 @@ mod root_proposal_specified_using_in_reply_to_with_range_of_head_2_and_cover_let | |||
| 1498 | 8051, | 1448 | 8051, |
| 1499 | None, | 1449 | None, |
| 1500 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { | 1450 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { |
| 1501 | relay.respond_events( | 1451 | relay.respond_events(client_id, &subscription_id, &vec![ |
| 1502 | client_id, | 1452 | generate_test_key_1_metadata_event("fred"), |
| 1503 | &subscription_id, | 1453 | generate_test_key_1_relay_list_event(), |
| 1504 | &vec![ | 1454 | get_pretend_proposal_root_event(), |
| 1505 | generate_test_key_1_metadata_event("fred"), | 1455 | ])?; |
| 1506 | generate_test_key_1_relay_list_event(), | ||
| 1507 | get_pretend_proposal_root_event(), | ||
| 1508 | ], | ||
| 1509 | )?; | ||
| 1510 | Ok(()) | 1456 | Ok(()) |
| 1511 | }), | 1457 | }), |
| 1512 | ), | 1458 | ), |
| @@ -1516,11 +1462,10 @@ mod root_proposal_specified_using_in_reply_to_with_range_of_head_2_and_cover_let | |||
| 1516 | 8055, | 1462 | 8055, |
| 1517 | None, | 1463 | None, |
| 1518 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { | 1464 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { |
| 1519 | relay.respond_events( | 1465 | relay.respond_events(client_id, &subscription_id, &vec![ |
| 1520 | client_id, | 1466 | generate_repo_ref_event(), |
| 1521 | &subscription_id, | 1467 | get_pretend_proposal_root_event(), |
| 1522 | &vec![generate_repo_ref_event(), get_pretend_proposal_root_event()], | 1468 | ])?; |
| 1523 | )?; | ||
| 1524 | Ok(()) | 1469 | Ok(()) |
| 1525 | }), | 1470 | }), |
| 1526 | ), | 1471 | ), |
| @@ -1697,15 +1642,11 @@ mod in_reply_to_mentions_issue { | |||
| 1697 | 8051, | 1642 | 8051, |
| 1698 | None, | 1643 | None, |
| 1699 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { | 1644 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { |
| 1700 | relay.respond_events( | 1645 | relay.respond_events(client_id, &subscription_id, &vec![ |
| 1701 | client_id, | 1646 | generate_test_key_1_metadata_event("fred"), |
| 1702 | &subscription_id, | 1647 | generate_test_key_1_relay_list_event(), |
| 1703 | &vec![ | 1648 | get_pretend_issue_event(), |
| 1704 | generate_test_key_1_metadata_event("fred"), | 1649 | ])?; |
| 1705 | generate_test_key_1_relay_list_event(), | ||
| 1706 | get_pretend_issue_event(), | ||
| 1707 | ], | ||
| 1708 | )?; | ||
| 1709 | Ok(()) | 1650 | Ok(()) |
| 1710 | }), | 1651 | }), |
| 1711 | ), | 1652 | ), |
| @@ -1715,11 +1656,10 @@ mod in_reply_to_mentions_issue { | |||
| 1715 | 8055, | 1656 | 8055, |
| 1716 | None, | 1657 | None, |
| 1717 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { | 1658 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { |
| 1718 | relay.respond_events( | 1659 | relay.respond_events(client_id, &subscription_id, &vec![ |
| 1719 | client_id, | 1660 | generate_repo_ref_event(), |
| 1720 | &subscription_id, | 1661 | get_pretend_issue_event(), |
| 1721 | &vec![generate_repo_ref_event(), get_pretend_issue_event()], | 1662 | ])?; |
| 1722 | )?; | ||
| 1723 | Ok(()) | 1663 | Ok(()) |
| 1724 | }), | 1664 | }), |
| 1725 | ), | 1665 | ), |
| @@ -1821,14 +1761,10 @@ mod in_reply_to_mentions_npub_and_nprofile_which_get_mentioned_in_proposal_root | |||
| 1821 | 8051, | 1761 | 8051, |
| 1822 | None, | 1762 | None, |
| 1823 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { | 1763 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { |
| 1824 | relay.respond_events( | 1764 | relay.respond_events(client_id, &subscription_id, &vec![ |
| 1825 | client_id, | 1765 | generate_test_key_1_metadata_event("fred"), |
| 1826 | &subscription_id, | 1766 | generate_test_key_1_relay_list_event(), |
| 1827 | &vec![ | 1767 | ])?; |
| 1828 | generate_test_key_1_metadata_event("fred"), | ||
| 1829 | generate_test_key_1_relay_list_event(), | ||
| 1830 | ], | ||
| 1831 | )?; | ||
| 1832 | Ok(()) | 1768 | Ok(()) |
| 1833 | }), | 1769 | }), |
| 1834 | ), | 1770 | ), |
| @@ -1838,11 +1774,9 @@ mod in_reply_to_mentions_npub_and_nprofile_which_get_mentioned_in_proposal_root | |||
| 1838 | 8055, | 1774 | 8055, |
| 1839 | None, | 1775 | None, |
| 1840 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { | 1776 | Some(&|relay, client_id, subscription_id, _| -> Result<()> { |
| 1841 | relay.respond_events( | 1777 | relay.respond_events(client_id, &subscription_id, &vec![ |
| 1842 | client_id, | 1778 | generate_repo_ref_event(), |
| 1843 | &subscription_id, | 1779 | ])?; |
| 1844 | &vec![generate_repo_ref_event()], | ||
| 1845 | )?; | ||
| 1846 | Ok(()) | 1780 | Ok(()) |
| 1847 | }), | 1781 | }), |
| 1848 | ), | 1782 | ), |