Add selection assertions to tests involving conflicts

This doesn't change anything, we just pin down the selection behavior
around conflicts; we are going to change that behavior, and these tests
will make it obvious how when they change in the next commit.

pkg/integration/tests/commit/amend_when_there_are_conflicts_and_amend.go

@@ -30,7 +30,7 @@ var AmendWhenThereAreConflictsAndAmend = NewIntegrationTest(NewIntegrationTestAr
 			Focus().
 			Lines(
 				Contains("─── Pending rebase todos"),
-				Contains("pick").Contains("commit three"),
+				Contains("pick").Contains("commit three").IsSelected(),
 				Contains("pick").Contains("<-- CONFLICT --- file1 changed in branch"),
 				Contains("─── Commits"),
 				Contains("commit two"),

pkg/integration/tests/commit/amend_when_there_are_conflicts_and_cancel.go

@@ -34,7 +34,7 @@ var AmendWhenThereAreConflictsAndCancel = NewIntegrationTest(NewIntegrationTestA
 			Focus().
 			Lines(
 				Contains("─── Pending rebase todos"),
-				Contains("pick").Contains("commit three"),
+				Contains("pick").Contains("commit three").IsSelected(),
 				Contains("pick").Contains("<-- CONFLICT --- file1 changed in branch"),
 				Contains("─── Commits"),
 				Contains("commit two"),

pkg/integration/tests/commit/revert_with_conflict_multiple_commits.go

@@ -49,8 +49,8 @@ var RevertWithConflictMultipleCommits = NewIntegrationTest(NewIntegrationTestArg
 				Contains("revert").Contains("CI <-- CONFLICT --- add first line"),
 				Contains("─── Commits"),
 				Contains("CI ○ add second line"),
-				Contains("CI ○ add first line"),
-				Contains("CI ○ unrelated change"),
+				Contains("CI ○ add first line").IsSelected(),
+				Contains("CI ○ unrelated change").IsSelected(),
 				Contains("CI ○ add empty file"),
 			)
 

pkg/integration/tests/commit/revert_with_conflict_single_commit.go

@@ -43,7 +43,7 @@ var RevertWithConflictSingleCommit = NewIntegrationTest(NewIntegrationTestArgs{
 				Contains("revert").Contains("CI <-- CONFLICT --- add first line"),
 				Contains("─── Commits"),
 				Contains("CI ○ add second line"),
-				Contains("CI ○ add first line"),
+				Contains("CI ○ add first line").IsSelected(),
 				Contains("CI ○ add empty file"),
 			)
 

pkg/integration/tests/commit/shared.go

@@ -44,7 +44,7 @@ func doTheRebaseForAmendTests(t *TestDriver, keys config.KeybindingConfig) {
 	t.Views().Commits().
 		Lines(
 			Contains("─── Pending rebase todos"),
-			Contains("pick").Contains("commit three"),
+			Contains("pick").Contains("commit three").IsSelected(),
 			Contains("pick").Contains("<-- CONFLICT --- file1 changed in branch"),
 			Contains("─── Commits"),
 			Contains("commit two"),

pkg/integration/tests/interactive_rebase/amend_commit_with_conflict.go

@@ -38,7 +38,7 @@ var AmendCommitWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
 				Contains("pick").Contains("three"),
 				Contains("fixup").Contains("<-- CONFLICT --- fixup! two"),
 				Contains("─── Commits"),
-				Contains("two"),
+				Contains("two").IsSelected(),
 				Contains("one"),
 			)
 
@@ -72,7 +72,7 @@ var AmendCommitWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
 				Contains("<-- CONFLICT --- three"),
 				Contains("─── Commits"),
 				Contains("two"),
-				Contains("one"),
+				Contains("one").IsSelected(),
 			)
 	},
 })

pkg/integration/tests/interactive_rebase/edit_the_confl_commit.go

@@ -33,7 +33,7 @@ var EditTheConflCommit = NewIntegrationTest(NewIntegrationTestArgs{
 			Focus().
 			Lines(
 				Contains("─── Pending rebase todos"),
-				Contains("pick").Contains("commit two"),
+				Contains("pick").Contains("commit two").IsSelected(),
 				Contains("pick").Contains("<-- CONFLICT --- commit three"),
 				Contains("─── Commits"),
 				Contains("commit one"),

pkg/integration/tests/interactive_rebase/revert_multiple_commits_in_interactive_rebase.go

@@ -58,8 +58,8 @@ var RevertMultipleCommitsInInteractiveRebase = NewIntegrationTest(NewIntegration
 				Contains("revert").Contains("CI <-- CONFLICT --- add first line"),
 				Contains("─── Commits"),
 				Contains("CI ○ add second line"),
-				Contains("CI ○ add first line"),
-				Contains("CI ○ unrelated change 1"),
+				Contains("CI ○ add first line").IsSelected(),
+				Contains("CI ○ unrelated change 1").IsSelected(),
 				Contains("CI ○ add empty file"),
 			)
 

pkg/integration/tests/interactive_rebase/shared.go

@@ -10,7 +10,7 @@ func handleConflictsFromSwap(t *TestDriver, expectedCommand string) {
 	t.Views().Commits().
 		Lines(
 			Contains("─── Pending rebase todos"),
-			Contains("pick").Contains("commit two"),
+			Contains("pick").Contains("commit two").IsSelected(),
 			Contains(expectedCommand).Contains("<-- CONFLICT --- commit three"),
 			Contains("─── Commits"),
 			Contains("commit one"),