upleb.uk

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

summaryrefslogtreecommitdiff
path: root/tests/list.rs
diff options
context:
space:
mode:
Diffstat (limited to 'tests/list.rs')
-rw-r--r--tests/list.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/list.rs b/tests/list.rs
index 08c2e93..ff54586 100644
--- a/tests/list.rs
+++ b/tests/list.rs
@@ -1208,7 +1208,7 @@ mod when_main_branch_is_uptodate {
1208 } 1208 }
1209 } 1209 }
1210 1210
1211 mod when_latest_proposal_ammended_locally { 1211 mod when_latest_proposal_amended_locally {
1212 // other rebase scenarios should work if this test passes 1212 // other rebase scenarios should work if this test passes
1213 use super::*; 1213 use super::*;
1214 async fn prep_and_run() -> Result<(GitTestRepo, GitTestRepo)> { 1214 async fn prep_and_run() -> Result<(GitTestRepo, GitTestRepo)> {
@@ -1244,7 +1244,7 @@ mod when_main_branch_is_uptodate {
1244 "a", 1244 "a",
1245 false, 1245 false,
1246 )?; 1246 )?;
1247 // simulating ammending the proposal 1247 // simulating amending the proposal
1248 create_and_populate_branch( 1248 create_and_populate_branch(
1249 &test_repo, 1249 &test_repo,
1250 FEATURE_BRANCH_NAME_1, 1250 FEATURE_BRANCH_NAME_1,
@@ -1333,7 +1333,7 @@ mod when_main_branch_is_uptodate {
1333 "a", 1333 "a",
1334 false, 1334 false,
1335 )?; 1335 )?;
1336 // simulating ammending the proposal 1336 // simulating amending the proposal
1337 create_and_populate_branch( 1337 create_and_populate_branch(
1338 &test_repo, 1338 &test_repo,
1339 FEATURE_BRANCH_NAME_1, 1339 FEATURE_BRANCH_NAME_1,
@@ -1353,8 +1353,8 @@ mod when_main_branch_is_uptodate {
1353 )?; 1353 )?;
1354 c.succeeds_with(0, true, None)?; 1354 c.succeeds_with(0, true, None)?;
1355 p.expect("finding commits...\r\n")?; 1355 p.expect("finding commits...\r\n")?;
1356 p.expect("you have an ammended/rebase version the proposal that is unpublished\r\n")?; 1356 p.expect("you have an amended/rebase version the proposal that is unpublished\r\n")?;
1357 p.expect("you have previously applied the latest version of the proposal (2 ahead 0 behind 'main') but your local proposal branch has ammended or rebased it (2 ahead 0 behind 'main')\r\n")?; 1357 p.expect("you have previously applied the latest version of the proposal (2 ahead 0 behind 'main') but your local proposal branch has amended or rebased it (2 ahead 0 behind 'main')\r\n")?;
1358 p.expect("to view the latest proposal but retain your changes:\r\n")?; 1358 p.expect("to view the latest proposal but retain your changes:\r\n")?;
1359 p.expect(" 1) create a new branch off the tip commit of this one to store your changes\r\n")?; 1359 p.expect(" 1) create a new branch off the tip commit of this one to store your changes\r\n")?;
1360 p.expect(" 2) run `ngit list` and checkout the latest published version of this proposal\r\n")?; 1360 p.expect(" 2) run `ngit list` and checkout the latest published version of this proposal\r\n")?;