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:
authorDanConwayDev <DanConwayDev@protonmail.com>2024-02-14 08:41:02 +0000
committerDanConwayDev <DanConwayDev@protonmail.com>2024-02-14 08:47:27 +0000
commitc0847f928c32adb0b4dfc3b73ee77fa3cdb5ec21 (patch)
tree07d89b9a5cb6770b25c22d35a13579df1278db0b /tests
parent1022344a0529b5f6b50f35d3030a528a1a5c6f91 (diff)
feat!: move `prs create`>`send`, `prs list`>`list`
remove unnecessary hierachy of `prs` which is also a troublesome term replace the concept of `create` which aligns more to the PR github model to `send` which aligns more with the git patch model
Diffstat (limited to 'tests')
-rw-r--r--tests/list.rs (renamed from tests/prs_list.rs)26
-rw-r--r--tests/pull.rs3
-rw-r--r--tests/push.rs3
-rw-r--r--tests/send.rs (renamed from tests/prs_create.rs)25
4 files changed, 23 insertions, 34 deletions
diff --git a/tests/prs_list.rs b/tests/list.rs
index 7c0d8ec..0d1d4e9 100644
--- a/tests/prs_list.rs
+++ b/tests/list.rs
@@ -77,8 +77,7 @@ fn cli_tester_create_pr(
77 "--password", 77 "--password",
78 TEST_PASSWORD, 78 TEST_PASSWORD,
79 "--disable-cli-spinners", 79 "--disable-cli-spinners",
80 "prs", 80 "send",
81 "create",
82 "--title", 81 "--title",
83 format!("\"{title}\"").as_str(), 82 format!("\"{title}\"").as_str(),
84 "--description", 83 "--description",
@@ -95,8 +94,7 @@ fn cli_tester_create_pr(
95 "--password", 94 "--password",
96 TEST_PASSWORD, 95 TEST_PASSWORD,
97 "--disable-cli-spinners", 96 "--disable-cli-spinners",
98 "prs", 97 "send",
99 "create",
100 "--no-cover-letter", 98 "--no-cover-letter",
101 ], 99 ],
102 ); 100 );
@@ -143,7 +141,7 @@ mod when_main_branch_is_uptodate {
143 141
144 let test_repo = GitTestRepo::default(); 142 let test_repo = GitTestRepo::default();
145 test_repo.populate()?; 143 test_repo.populate()?;
146 let mut p = CliTester::new_from_dir(&test_repo.dir, ["prs", "list"]); 144 let mut p = CliTester::new_from_dir(&test_repo.dir, ["list"]);
147 145
148 p.expect("finding PRs...\r\n")?; 146 p.expect("finding PRs...\r\n")?;
149 let mut c = p.expect_choice( 147 let mut c = p.expect_choice(
@@ -203,7 +201,7 @@ mod when_main_branch_is_uptodate {
203 201
204 let test_repo = GitTestRepo::default(); 202 let test_repo = GitTestRepo::default();
205 test_repo.populate()?; 203 test_repo.populate()?;
206 let mut p = CliTester::new_from_dir(&test_repo.dir, ["prs", "list"]); 204 let mut p = CliTester::new_from_dir(&test_repo.dir, ["list"]);
207 205
208 p.expect("finding PRs...\r\n")?; 206 p.expect("finding PRs...\r\n")?;
209 let mut c = p.expect_choice( 207 let mut c = p.expect_choice(
@@ -308,7 +306,7 @@ mod when_main_branch_is_uptodate {
308 306
309 let test_repo = GitTestRepo::default(); 307 let test_repo = GitTestRepo::default();
310 test_repo.populate()?; 308 test_repo.populate()?;
311 let mut p = CliTester::new_from_dir(&test_repo.dir, ["prs", "list"]); 309 let mut p = CliTester::new_from_dir(&test_repo.dir, ["list"]);
312 310
313 p.expect("finding PRs...\r\n")?; 311 p.expect("finding PRs...\r\n")?;
314 let mut c = p.expect_choice( 312 let mut c = p.expect_choice(
@@ -368,7 +366,7 @@ mod when_main_branch_is_uptodate {
368 366
369 let test_repo = GitTestRepo::default(); 367 let test_repo = GitTestRepo::default();
370 test_repo.populate()?; 368 test_repo.populate()?;
371 let mut p = CliTester::new_from_dir(&test_repo.dir, ["prs", "list"]); 369 let mut p = CliTester::new_from_dir(&test_repo.dir, ["list"]);
372 370
373 p.expect("finding PRs...\r\n")?; 371 p.expect("finding PRs...\r\n")?;
374 let mut c = p.expect_choice( 372 let mut c = p.expect_choice(
@@ -478,7 +476,7 @@ mod when_main_branch_is_uptodate {
478 )?; 476 )?;
479 let test_repo = GitTestRepo::default(); 477 let test_repo = GitTestRepo::default();
480 test_repo.populate()?; 478 test_repo.populate()?;
481 let mut p = CliTester::new_from_dir(&test_repo.dir, ["prs", "list"]); 479 let mut p = CliTester::new_from_dir(&test_repo.dir, ["list"]);
482 480
483 p.expect("finding PRs...\r\n")?; 481 p.expect("finding PRs...\r\n")?;
484 let mut c = p.expect_choice( 482 let mut c = p.expect_choice(
@@ -544,7 +542,7 @@ mod when_main_branch_is_uptodate {
544 )?; 542 )?;
545 let test_repo = GitTestRepo::default(); 543 let test_repo = GitTestRepo::default();
546 test_repo.populate()?; 544 test_repo.populate()?;
547 let mut p = CliTester::new_from_dir(&test_repo.dir, ["prs", "list"]); 545 let mut p = CliTester::new_from_dir(&test_repo.dir, ["list"]);
548 546
549 p.expect("finding PRs...\r\n")?; 547 p.expect("finding PRs...\r\n")?;
550 let mut c = p.expect_choice( 548 let mut c = p.expect_choice(
@@ -658,7 +656,7 @@ mod when_main_branch_is_uptodate {
658 656
659 let test_repo = GitTestRepo::default(); 657 let test_repo = GitTestRepo::default();
660 test_repo.populate()?; 658 test_repo.populate()?;
661 let mut p = CliTester::new_from_dir(&test_repo.dir, ["prs", "list"]); 659 let mut p = CliTester::new_from_dir(&test_repo.dir, ["list"]);
662 660
663 create_and_populate_branch( 661 create_and_populate_branch(
664 &test_repo, 662 &test_repo,
@@ -725,7 +723,7 @@ mod when_main_branch_is_uptodate {
725 723
726 let test_repo = GitTestRepo::default(); 724 let test_repo = GitTestRepo::default();
727 test_repo.populate()?; 725 test_repo.populate()?;
728 let mut p = CliTester::new_from_dir(&test_repo.dir, ["prs", "list"]); 726 let mut p = CliTester::new_from_dir(&test_repo.dir, ["list"]);
729 727
730 create_and_populate_branch( 728 create_and_populate_branch(
731 &test_repo, 729 &test_repo,
@@ -817,7 +815,7 @@ mod when_main_branch_is_uptodate {
817 815
818 let test_repo = GitTestRepo::default(); 816 let test_repo = GitTestRepo::default();
819 test_repo.populate()?; 817 test_repo.populate()?;
820 let mut p = CliTester::new_from_dir(&test_repo.dir, ["prs", "list"]); 818 let mut p = CliTester::new_from_dir(&test_repo.dir, ["list"]);
821 819
822 create_and_populate_branch( 820 create_and_populate_branch(
823 &test_repo, 821 &test_repo,
@@ -885,7 +883,7 @@ mod when_main_branch_is_uptodate {
885 883
886 let test_repo = GitTestRepo::default(); 884 let test_repo = GitTestRepo::default();
887 test_repo.populate()?; 885 test_repo.populate()?;
888 let mut p = CliTester::new_from_dir(&test_repo.dir, ["prs", "list"]); 886 let mut p = CliTester::new_from_dir(&test_repo.dir, ["list"]);
889 887
890 create_and_populate_branch( 888 create_and_populate_branch(
891 &test_repo, 889 &test_repo,
diff --git a/tests/pull.rs b/tests/pull.rs
index 92d0ba9..d3064a3 100644
--- a/tests/pull.rs
+++ b/tests/pull.rs
@@ -79,8 +79,7 @@ fn cli_tester_create_pr(
79 "--password", 79 "--password",
80 TEST_PASSWORD, 80 TEST_PASSWORD,
81 "--disable-cli-spinners", 81 "--disable-cli-spinners",
82 "prs", 82 "send",
83 "create",
84 "--title", 83 "--title",
85 format!("\"{title}\"").as_str(), 84 format!("\"{title}\"").as_str(),
86 "--description", 85 "--description",
diff --git a/tests/push.rs b/tests/push.rs
index 4af5bd4..9791d9d 100644
--- a/tests/push.rs
+++ b/tests/push.rs
@@ -79,8 +79,7 @@ fn cli_tester_create_pr(
79 "--password", 79 "--password",
80 TEST_PASSWORD, 80 TEST_PASSWORD,
81 "--disable-cli-spinners", 81 "--disable-cli-spinners",
82 "prs", 82 "send",
83 "create",
84 "--title", 83 "--title",
85 format!("\"{title}\"").as_str(), 84 format!("\"{title}\"").as_str(),
86 "--description", 85 "--description",
diff --git a/tests/prs_create.rs b/tests/send.rs
index 5d55ab9..a109918 100644
--- a/tests/prs_create.rs
+++ b/tests/send.rs
@@ -7,10 +7,7 @@ use test_utils::{git::GitTestRepo, relay::Relay, *};
7fn when_to_branch_doesnt_exist_return_error() -> Result<()> { 7fn when_to_branch_doesnt_exist_return_error() -> Result<()> {
8 let test_repo = GitTestRepo::default(); 8 let test_repo = GitTestRepo::default();
9 test_repo.populate()?; 9 test_repo.populate()?;
10 let mut p = CliTester::new_from_dir( 10 let mut p = CliTester::new_from_dir(&test_repo.dir, ["send", "--to-branch", "nonexistant"]);
11 &test_repo.dir,
12 ["prs", "create", "--to-branch", "nonexistant"],
13 );
14 p.expect("Error: cannot find to_branch 'nonexistant'")?; 11 p.expect("Error: cannot find to_branch 'nonexistant'")?;
15 Ok(()) 12 Ok(())
16} 13}
@@ -19,7 +16,7 @@ fn when_to_branch_doesnt_exist_return_error() -> Result<()> {
19fn when_no_to_branch_specified_and_no_main_or_master_branch_return_error() -> Result<()> { 16fn when_no_to_branch_specified_and_no_main_or_master_branch_return_error() -> Result<()> {
20 let test_repo = GitTestRepo::new("notmain")?; 17 let test_repo = GitTestRepo::new("notmain")?;
21 test_repo.populate()?; 18 test_repo.populate()?;
22 let mut p = CliTester::new_from_dir(&test_repo.dir, ["prs", "create"]); 19 let mut p = CliTester::new_from_dir(&test_repo.dir, ["send"]);
23 p.expect("Error: a destination branch (to_branch) is not specified and the defaults (main or master) do not exist")?; 20 p.expect("Error: a destination branch (to_branch) is not specified and the defaults (main or master) do not exist")?;
24 Ok(()) 21 Ok(())
25} 22}
@@ -28,10 +25,7 @@ fn when_no_to_branch_specified_and_no_main_or_master_branch_return_error() -> Re
28fn when_from_branch_doesnt_exist_return_error() -> Result<()> { 25fn when_from_branch_doesnt_exist_return_error() -> Result<()> {
29 let test_repo = GitTestRepo::default(); 26 let test_repo = GitTestRepo::default();
30 test_repo.populate()?; 27 test_repo.populate()?;
31 let mut p = CliTester::new_from_dir( 28 let mut p = CliTester::new_from_dir(&test_repo.dir, ["send", "--from-branch", "nonexistant"]);
32 &test_repo.dir,
33 ["prs", "create", "--from-branch", "nonexistant"],
34 );
35 p.expect("Error: cannot find from_branch 'nonexistant'")?; 29 p.expect("Error: cannot find from_branch 'nonexistant'")?;
36 Ok(()) 30 Ok(())
37} 31}
@@ -44,7 +38,7 @@ fn when_no_commits_ahead_of_main_return_error() -> Result<()> {
44 test_repo.create_branch("feature")?; 38 test_repo.create_branch("feature")?;
45 test_repo.checkout("feature")?; 39 test_repo.checkout("feature")?;
46 40
47 let mut p = CliTester::new_from_dir(&test_repo.dir, ["prs", "create"]); 41 let mut p = CliTester::new_from_dir(&test_repo.dir, ["send"]);
48 p.expect("Error: 'head' is 0 commits ahead of 'main' so no patches were created")?; 42 p.expect("Error: 'head' is 0 commits ahead of 'main' so no patches were created")?;
49 Ok(()) 43 Ok(())
50} 44}
@@ -88,7 +82,7 @@ mod when_commits_behind_ask_to_proceed {
88 fn asked_with_default_no() -> Result<()> { 82 fn asked_with_default_no() -> Result<()> {
89 let test_repo = prep_test_repo()?; 83 let test_repo = prep_test_repo()?;
90 84
91 let mut p = CliTester::new_from_dir(&test_repo.dir, ["prs", "create"]); 85 let mut p = CliTester::new_from_dir(&test_repo.dir, ["send"]);
92 expect_confirm_prompt(&mut p, BEHIND_LEN, AHEAD_LEN)?; 86 expect_confirm_prompt(&mut p, BEHIND_LEN, AHEAD_LEN)?;
93 p.exit()?; 87 p.exit()?;
94 Ok(()) 88 Ok(())
@@ -98,7 +92,7 @@ mod when_commits_behind_ask_to_proceed {
98 fn when_response_is_false_aborts() -> Result<()> { 92 fn when_response_is_false_aborts() -> Result<()> {
99 let test_repo = prep_test_repo()?; 93 let test_repo = prep_test_repo()?;
100 94
101 let mut p = CliTester::new_from_dir(&test_repo.dir, ["prs", "create"]); 95 let mut p = CliTester::new_from_dir(&test_repo.dir, ["send"]);
102 96
103 expect_confirm_prompt(&mut p, BEHIND_LEN, AHEAD_LEN)?.succeeds_with(Some(false))?; 97 expect_confirm_prompt(&mut p, BEHIND_LEN, AHEAD_LEN)?.succeeds_with(Some(false))?;
104 98
@@ -111,7 +105,7 @@ mod when_commits_behind_ask_to_proceed {
111 fn when_response_is_true_proceeds() -> Result<()> { 105 fn when_response_is_true_proceeds() -> Result<()> {
112 let test_repo = prep_test_repo()?; 106 let test_repo = prep_test_repo()?;
113 107
114 let mut p = CliTester::new_from_dir(&test_repo.dir, ["prs", "create"]); 108 let mut p = CliTester::new_from_dir(&test_repo.dir, ["send"]);
115 expect_confirm_prompt(&mut p, BEHIND_LEN, AHEAD_LEN)?.succeeds_with(Some(true))?; 109 expect_confirm_prompt(&mut p, BEHIND_LEN, AHEAD_LEN)?.succeeds_with(Some(true))?;
116 p.expect( 110 p.expect(
117 format!("creating patch for {AHEAD_LEN} commits from 'head' that are {BEHIND_LEN} behind 'main'",) 111 format!("creating patch for {AHEAD_LEN} commits from 'head' that are {BEHIND_LEN} behind 'main'",)
@@ -135,7 +129,7 @@ fn cli_message_creating_patches() -> Result<()> {
135 std::fs::write(test_repo.dir.join("t4.md"), "some content")?; 129 std::fs::write(test_repo.dir.join("t4.md"), "some content")?;
136 test_repo.stage_and_commit("add t4.md")?; 130 test_repo.stage_and_commit("add t4.md")?;
137 131
138 let mut p = CliTester::new_from_dir(&test_repo.dir, ["prs", "create"]); 132 let mut p = CliTester::new_from_dir(&test_repo.dir, ["send"]);
139 133
140 p.expect("creating patch for 2 commits from 'head' that can be merged into 'main'")?; 134 p.expect("creating patch for 2 commits from 'head' that can be merged into 'main'")?;
141 p.exit()?; 135 p.exit()?;
@@ -172,8 +166,7 @@ fn cli_tester_create_pr(git_repo: &GitTestRepo, include_cover_letter: bool) -> C
172 "--password", 166 "--password",
173 TEST_PASSWORD, 167 TEST_PASSWORD,
174 "--disable-cli-spinners", 168 "--disable-cli-spinners",
175 "prs", 169 "send",
176 "create",
177 ]; 170 ];
178 if include_cover_letter { 171 if include_cover_letter {
179 for arg in [ 172 for arg in [
generated by cgit v1.2.3 (git 2.39.1) at 2026-06-05 11:20:48 +0000