diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/list.rs | 10 | ||||
| -rw-r--r-- | tests/pull.rs | 16 |
2 files changed, 13 insertions, 13 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")?; |
diff --git a/tests/pull.rs b/tests/pull.rs index 102d9e2..ee8cad1 100644 --- a/tests/pull.rs +++ b/tests/pull.rs | |||
| @@ -439,7 +439,7 @@ mod when_branch_is_checked_out { | |||
| 439 | } | 439 | } |
| 440 | } | 440 | } |
| 441 | 441 | ||
| 442 | mod when_old_proposal_revision_ammended_locally { | 442 | mod when_old_proposal_revision_amended_locally { |
| 443 | use super::*; | 443 | use super::*; |
| 444 | 444 | ||
| 445 | mod cli_prompts { | 445 | mod cli_prompts { |
| @@ -467,7 +467,7 @@ mod when_branch_is_checked_out { | |||
| 467 | let test_repo = GitTestRepo::default(); | 467 | let test_repo = GitTestRepo::default(); |
| 468 | test_repo.populate()?; | 468 | test_repo.populate()?; |
| 469 | 469 | ||
| 470 | // simulating ammending an older version of the proposal commits on the current | 470 | // simulating amending an older version of the proposal commits on the current |
| 471 | // branch | 471 | // branch |
| 472 | create_and_populate_branch( | 472 | create_and_populate_branch( |
| 473 | &test_repo, | 473 | &test_repo, |
| @@ -480,10 +480,10 @@ mod when_branch_is_checked_out { | |||
| 480 | p.expect("finding proposal root event...\r\n")?; | 480 | p.expect("finding proposal root event...\r\n")?; |
| 481 | p.expect("found proposal root event. finding commits...\r\n")?; | 481 | p.expect("found proposal root event. finding commits...\r\n")?; |
| 482 | p.expect( | 482 | p.expect( |
| 483 | "you have an ammended/rebase version the proposal that is unpublished\r\n", | 483 | "you have an amended/rebase version the proposal that is unpublished\r\n", |
| 484 | )?; | 484 | )?; |
| 485 | p.expect("your local proposal branch (2 ahead 0 behind 'main') has conflicting changes with the latest published proposal (2 ahead 0 behind 'main')\r\n")?; | 485 | p.expect("your local proposal branch (2 ahead 0 behind 'main') has conflicting changes with the latest published proposal (2 ahead 0 behind 'main')\r\n")?; |
| 486 | p.expect("its likely that you have rebased / ammended an old proposal version because git has no record of the latest proposal commit.\r\n")?; | 486 | p.expect("its likely that you have rebased / amended an old proposal version because git has no record of the latest proposal commit.\r\n")?; |
| 487 | p.expect("it is possible that you have been working off the latest version and git has delete this commit as part of a clean up\r\n")?; | 487 | p.expect("it is possible that you have been working off the latest version and git has delete this commit as part of a clean up\r\n")?; |
| 488 | p.expect("to view the latest proposal but retain your changes:\r\n")?; | 488 | p.expect("to view the latest proposal but retain your changes:\r\n")?; |
| 489 | p.expect(" 1) create a new branch off the tip commit of this one to store your changes\r\n")?; | 489 | p.expect(" 1) create a new branch off the tip commit of this one to store your changes\r\n")?; |
| @@ -519,7 +519,7 @@ mod when_branch_is_checked_out { | |||
| 519 | } | 519 | } |
| 520 | } | 520 | } |
| 521 | 521 | ||
| 522 | mod when_latest_proposal_ammended_locally { | 522 | mod when_latest_proposal_amended_locally { |
| 523 | use super::*; | 523 | use super::*; |
| 524 | 524 | ||
| 525 | mod cli_prompts { | 525 | mod cli_prompts { |
| @@ -550,7 +550,7 @@ mod when_branch_is_checked_out { | |||
| 550 | // simulating checking out the proposal (the commits_ids will match) | 550 | // simulating checking out the proposal (the commits_ids will match) |
| 551 | create_and_populate_branch(&test_repo, "different-branch-name", "a", false)?; | 551 | create_and_populate_branch(&test_repo, "different-branch-name", "a", false)?; |
| 552 | test_repo.checkout("main")?; | 552 | test_repo.checkout("main")?; |
| 553 | // simulating ammending the proposal | 553 | // simulating amending the proposal |
| 554 | create_and_populate_branch( | 554 | create_and_populate_branch( |
| 555 | &test_repo, | 555 | &test_repo, |
| 556 | FEATURE_BRANCH_NAME_1, | 556 | FEATURE_BRANCH_NAME_1, |
| @@ -562,9 +562,9 @@ mod when_branch_is_checked_out { | |||
| 562 | p.expect("finding proposal root event...\r\n")?; | 562 | p.expect("finding proposal root event...\r\n")?; |
| 563 | p.expect("found proposal root event. finding commits...\r\n")?; | 563 | p.expect("found proposal root event. finding commits...\r\n")?; |
| 564 | p.expect( | 564 | p.expect( |
| 565 | "you have an ammended/rebase version the proposal that is unpublished\r\n", | 565 | "you have an amended/rebase version the proposal that is unpublished\r\n", |
| 566 | )?; | 566 | )?; |
| 567 | 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")?; | 567 | 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")?; |
| 568 | p.expect("to view the latest proposal but retain your changes:\r\n")?; | 568 | p.expect("to view the latest proposal but retain your changes:\r\n")?; |
| 569 | p.expect(" 1) create a new branch off the tip commit of this one to store your changes\r\n")?; | 569 | p.expect(" 1) create a new branch off the tip commit of this one to store your changes\r\n")?; |
| 570 | p.expect(" 2) run `ngit list` and checkout the latest published version of this proposal\r\n")?; | 570 | p.expect(" 2) run `ngit list` and checkout the latest published version of this proposal\r\n")?; |