test: fix `pull` tests

it was so much clearer what the problem was after
abstracting reused test code

3 files changed, 16 insertions, 13 deletions

diff --git a/test_utils/src/lib.rs b/test_utils/src/lib.rs
index 087f849..866eafb 100644
--- a/test_utils/src/lib.rs
+++ b/test_utils/src/lib.rs
@@ -1196,14 +1196,13 @@ pub fn remove_latest_commit_so_proposal_branch_is_behind_and_checkout_main(
     Ok(branch_name)
 }
 
-pub fn ammend_last_commit_and_checkout_main(test_repo: &GitTestRepo) -> Result<String> {
+pub fn amend_last_commit(test_repo: &GitTestRepo) -> Result<String> {
     let branch_name =
         remove_latest_commit_so_proposal_branch_is_behind_and_checkout_main(test_repo)?;
     // add another commit (so we have an ammened local branch)
     test_repo.checkout(&branch_name)?;
     std::fs::write(test_repo.dir.join("ammended-commit.md"), "some content")?;
     test_repo.stage_and_commit("add ammended-commit.md")?;
-    test_repo.checkout("main")?;
     Ok(branch_name)
 }
 
diff --git a/tests/list.rs b/tests/list.rs
index c92390b..9ffc26a 100644
--- a/tests/list.rs
+++ b/tests/list.rs
@@ -1105,7 +1105,8 @@ mod when_main_branch_is_uptodate {
                             let (_, test_repo) =
                                 create_proposals_and_repo_with_proposal_pulled_and_checkedout(1)?;
 
-                            ammend_last_commit_and_checkout_main(&test_repo)?;
+                            amend_last_commit(&test_repo)?;
+                            test_repo.checkout("main")?;
 
                             // run test
                             let mut p = CliTester::new_from_dir(&test_repo.dir, ["list"]);
diff --git a/tests/pull.rs b/tests/pull.rs
index 89b28c3..0b0c3ba 100644
--- a/tests/pull.rs
+++ b/tests/pull.rs
@@ -203,9 +203,11 @@ mod when_branch_is_checked_out {
                     let (originating_repo, test_repo) =
                         create_proposals_and_repo_with_proposal_pulled_and_checkedout(1)?;
 
-                    remove_latest_commit_so_proposal_branch_is_behind_and_checkout_main(
-                        &test_repo,
-                    )?;
+                    let branch_name =
+                        remove_latest_commit_so_proposal_branch_is_behind_and_checkout_main(
+                            &test_repo,
+                        )?;
+                    test_repo.checkout(&branch_name)?;
 
                     let mut p = CliTester::new_from_dir(&test_repo.dir, ["pull"]);
                     p.expect_end_eventually()?;
@@ -257,9 +259,11 @@ mod when_branch_is_checked_out {
                         let (originating_repo, test_repo) =
                             create_proposals_and_repo_with_proposal_pulled_and_checkedout(1)?;
 
-                        remove_latest_commit_so_proposal_branch_is_behind_and_checkout_main(
-                            &test_repo,
-                        )?;
+                        let branch_name =
+                            remove_latest_commit_so_proposal_branch_is_behind_and_checkout_main(
+                                &test_repo,
+                            )?;
+                        test_repo.checkout(&branch_name)?;
 
                         let mut p = CliTester::new_from_dir(&test_repo.dir, ["pull"]);
                         p.expect("fetching updates...\r\n")?;
@@ -330,10 +334,11 @@ mod when_branch_is_checked_out {
                     let (originating_repo, test_repo) =
                         create_proposals_and_repo_with_proposal_pulled_and_checkedout(1)?;
 
-                    let branch_name = ammend_last_commit_and_checkout_main(&test_repo)?;
+                    let branch_name = amend_last_commit(&test_repo)?;
 
                     // create and send a revision from another repository
                     originating_repo.checkout("main")?;
+                    test_repo.checkout("main")?;
                     test_repo.git_repo.branch(
                         &branch_name,
                         &test_repo
@@ -414,7 +419,7 @@ mod when_branch_is_checked_out {
                     let (_, test_repo) =
                         create_proposals_and_repo_with_proposal_pulled_and_checkedout(1)?;
 
-                    ammend_last_commit_and_checkout_main(&test_repo)?;
+                    amend_last_commit(&test_repo)?;
 
                     // run test
                     let mut p = CliTester::new_from_dir(&test_repo.dir, ["pull"]);
@@ -479,7 +484,6 @@ mod when_branch_is_checked_out {
                     // add another commit (so we have a local branch 1 ahead)
                     std::fs::write(test_repo.dir.join("ammended-commit.md"), "some content")?;
                     test_repo.stage_and_commit("add ammended-commit.md")?;
-                    test_repo.checkout("main")?;
 
                     // run test
                     let mut p = CliTester::new_from_dir(&test_repo.dir, ["pull"]);
@@ -537,7 +541,6 @@ mod when_branch_is_checked_out {
                     // add another commit (so we have a local branch 1 ahead)
                     std::fs::write(test_repo.dir.join("ammended-commit.md"), "some content")?;
                     test_repo.stage_and_commit("add ammended-commit.md")?;
-                    test_repo.checkout("main")?;
 
                     // run test
                     let mut p = CliTester::new_from_dir(&test_repo.dir, ["pull"]);