upleb.uk

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

summaryrefslogtreecommitdiff
path: root/tests/pull.rs
diff options
context:
space:
mode:
authorDanConwayDev <DanConwayDev@protonmail.com>2024-02-22 16:27:18 +0000
committerDanConwayDev <DanConwayDev@protonmail.com>2024-02-22 16:27:18 +0000
commit89c51886afd54afd901995916909ba98e764b23e (patch)
tree35e61b0984e24fca404b7cb7671402226859784c /tests/pull.rs
parentb6f68cf782ee242f9390c6601a76a18367e2ab4d (diff)
refactor: fix spelling
ammended should read amended
Diffstat (limited to 'tests/pull.rs')
-rw-r--r--tests/pull.rs16
1 files changed, 8 insertions, 8 deletions
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")?;