diff --git a/pkg/gui/context/local_commits_context.go b/pkg/gui/context/local_commits_context.go index 6e69046c1..241450184 100644 --- a/pkg/gui/context/local_commits_context.go +++ b/pkg/gui/context/local_commits_context.go @@ -41,7 +41,6 @@ func NewLocalCommitsContext(c *ContextCommon) *LocalCommitsContext { } } - showYouAreHereLabel := c.Model().WorkingTreeStateAtLastCommitRefresh.CanShowTodos() hasRebaseUpdateRefsConfig := c.Git().Config.GetRebaseUpdateRefs() return presentation.GetCommitListDisplayStrings( @@ -63,7 +62,6 @@ func NewLocalCommitsContext(c *ContextCommon) *LocalCommitsContext { endIdx, shouldShowGraph(c), c.Model().BisectInfo, - showYouAreHereLabel, ) } diff --git a/pkg/gui/context/sub_commits_context.go b/pkg/gui/context/sub_commits_context.go index b3b3fd1b4..1eed352eb 100644 --- a/pkg/gui/context/sub_commits_context.go +++ b/pkg/gui/context/sub_commits_context.go @@ -77,7 +77,6 @@ func NewSubCommitsContext( endIdx, shouldShowGraph(c), git_commands.NewNullBisectInfo(), - false, ) } diff --git a/pkg/gui/presentation/commits.go b/pkg/gui/presentation/commits.go index 8296198fc..f265979da 100644 --- a/pkg/gui/presentation/commits.go +++ b/pkg/gui/presentation/commits.go @@ -56,7 +56,6 @@ func GetCommitListDisplayStrings( endIdx int, showGraph bool, bisectInfo *git_commands.BisectInfo, - showYouAreHereLabel bool, ) [][]string { mutex.Lock() defer mutex.Unlock() @@ -185,11 +184,6 @@ func GetCommitListDisplayStrings( for i, commit := range filteredCommits { unfilteredIdx := i + startIdx bisectStatus = getBisectStatus(unfilteredIdx, commit.Hash, bisectInfo, bisectBounds) - isYouAreHereCommit := false - if showYouAreHereLabel && (commit.Status == models.StatusConflicted || unfilteredIdx == rebaseOffset) { - isYouAreHereCommit = true - showYouAreHereLabel = false - } isMarkedBaseCommit := commit.Hash != "" && commit.Hash == markedBaseCommit if isMarkedBaseCommit { willBeRebased = true @@ -211,7 +205,6 @@ func GetCommitListDisplayStrings( fullDescription, bisectStatus, bisectInfo, - isYouAreHereCommit, )) } return lines @@ -364,7 +357,6 @@ func displayCommit( fullDescription bool, bisectStatus BisectStatus, bisectInfo *git_commands.BisectInfo, - isYouAreHereCommit bool, ) []string { bisectString := getBisectStatusText(bisectStatus, bisectInfo) @@ -427,14 +419,8 @@ func displayCommit( } mark := "" - if isYouAreHereCommit { - color := style.FgYellow - text := common.Tr.YouAreHere - if commit.Status == models.StatusConflicted { - color = style.FgRed - text = common.Tr.ConflictLabel - } - youAreHere := color.Sprintf("<-- %s ---", text) + if commit.Status == models.StatusConflicted { + youAreHere := style.FgRed.Sprintf("<-- %s ---", common.Tr.ConflictLabel) mark = fmt.Sprintf("%s ", youAreHere) } else if isMarkedBaseCommit { rebaseFromHere := style.FgYellow.Sprint(common.Tr.MarkedCommitMarker) diff --git a/pkg/gui/presentation/commits_test.go b/pkg/gui/presentation/commits_test.go index edf147b92..58a2c2032 100644 --- a/pkg/gui/presentation/commits_test.go +++ b/pkg/gui/presentation/commits_test.go @@ -40,7 +40,6 @@ func TestGetCommitListDisplayStrings(t *testing.T) { endIdx int showGraph bool bisectInfo *git_commands.BisectInfo - showYouAreHereLabel bool expected string focus bool }{ @@ -223,12 +222,11 @@ func TestGetCommitListDisplayStrings(t *testing.T) { showGraph: true, bisectInfo: git_commands.NewNullBisectInfo(), cherryPickedCommitHashSet: set.New[string](), - showYouAreHereLabel: true, now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC), expected: formatExpected(` hash1 pick commit1 hash2 pick commit2 - hash3 ◯ <-- YOU ARE HERE --- commit3 + hash3 ◯ commit3 hash4 ◯ commit4 hash5 ◯ commit5 `), @@ -247,11 +245,10 @@ func TestGetCommitListDisplayStrings(t *testing.T) { showGraph: true, bisectInfo: git_commands.NewNullBisectInfo(), cherryPickedCommitHashSet: set.New[string](), - showYouAreHereLabel: true, now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC), expected: formatExpected(` hash2 pick commit2 - hash3 ◯ <-- YOU ARE HERE --- commit3 + hash3 ◯ commit3 hash4 ◯ commit4 hash5 ◯ commit5 `), @@ -270,7 +267,6 @@ func TestGetCommitListDisplayStrings(t *testing.T) { showGraph: true, bisectInfo: git_commands.NewNullBisectInfo(), cherryPickedCommitHashSet: set.New[string](), - showYouAreHereLabel: true, now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC), expected: formatExpected(` hash4 ◯ commit4 @@ -291,7 +287,6 @@ func TestGetCommitListDisplayStrings(t *testing.T) { showGraph: true, bisectInfo: git_commands.NewNullBisectInfo(), cherryPickedCommitHashSet: set.New[string](), - showYouAreHereLabel: true, now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC), expected: formatExpected(` hash1 pick commit1 @@ -312,7 +307,6 @@ func TestGetCommitListDisplayStrings(t *testing.T) { showGraph: true, bisectInfo: git_commands.NewNullBisectInfo(), cherryPickedCommitHashSet: set.New[string](), - showYouAreHereLabel: true, now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC), expected: formatExpected(` hash5 ◯ commit5 @@ -332,33 +326,12 @@ func TestGetCommitListDisplayStrings(t *testing.T) { showGraph: true, bisectInfo: git_commands.NewNullBisectInfo(), cherryPickedCommitHashSet: set.New[string](), - showYouAreHereLabel: true, now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC), expected: formatExpected(` hash1 pick commit1 hash2 pick commit2 `), }, - { - testName: "don't show YOU ARE HERE label when not asked for (e.g. in branches panel)", - commits: []*models.Commit{ - {Name: "commit1", Hash: "hash1", Parents: []string{"hash2"}, Action: todo.Pick}, - {Name: "commit2", Hash: "hash2", Parents: []string{"hash3"}}, - {Name: "commit3", Hash: "hash3", Parents: []string{"hash4"}}, - }, - startIdx: 0, - endIdx: 3, - showGraph: true, - bisectInfo: git_commands.NewNullBisectInfo(), - cherryPickedCommitHashSet: set.New[string](), - showYouAreHereLabel: false, - now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC), - expected: formatExpected(` - hash1 pick commit1 - hash2 ◯ commit2 - hash3 ◯ commit3 - `), - }, { testName: "graph in divergence view - all commits visible", commits: []*models.Commit{ @@ -376,7 +349,6 @@ func TestGetCommitListDisplayStrings(t *testing.T) { showGraph: true, bisectInfo: git_commands.NewNullBisectInfo(), cherryPickedCommitHashSet: set.New[string](), - showYouAreHereLabel: false, now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC), expected: formatExpected(` ↓ hash1r ◯ commit1 @@ -406,7 +378,6 @@ func TestGetCommitListDisplayStrings(t *testing.T) { showGraph: true, bisectInfo: git_commands.NewNullBisectInfo(), cherryPickedCommitHashSet: set.New[string](), - showYouAreHereLabel: false, now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC), expected: formatExpected(` ↓ hash3r ◯ │ commit3 @@ -434,7 +405,6 @@ func TestGetCommitListDisplayStrings(t *testing.T) { showGraph: true, bisectInfo: git_commands.NewNullBisectInfo(), cherryPickedCommitHashSet: set.New[string](), - showYouAreHereLabel: false, now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC), expected: formatExpected(` ↓ hash1r ◯ commit1 @@ -461,7 +431,6 @@ func TestGetCommitListDisplayStrings(t *testing.T) { showGraph: true, bisectInfo: git_commands.NewNullBisectInfo(), cherryPickedCommitHashSet: set.New[string](), - showYouAreHereLabel: false, now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC), expected: formatExpected(` ↑ hash2l ⏣─╮ commit2 @@ -487,7 +456,6 @@ func TestGetCommitListDisplayStrings(t *testing.T) { showGraph: true, bisectInfo: git_commands.NewNullBisectInfo(), cherryPickedCommitHashSet: set.New[string](), - showYouAreHereLabel: false, now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC), expected: formatExpected(` ↓ hash1r ◯ commit1 @@ -508,7 +476,6 @@ func TestGetCommitListDisplayStrings(t *testing.T) { showGraph: true, bisectInfo: git_commands.NewNullBisectInfo(), cherryPickedCommitHashSet: set.New[string](), - showYouAreHereLabel: false, now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC), expected: formatExpected(` ↑ hash1l ◯ commit1 @@ -530,7 +497,6 @@ func TestGetCommitListDisplayStrings(t *testing.T) { showGraph: true, bisectInfo: git_commands.NewNullBisectInfo(), cherryPickedCommitHashSet: set.New[string](), - showYouAreHereLabel: false, now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC), expected: formatExpected(` ↓ hash1r ◯ commit1 @@ -596,7 +562,6 @@ func TestGetCommitListDisplayStrings(t *testing.T) { s.endIdx, s.showGraph, s.bisectInfo, - s.showYouAreHereLabel, ) renderedLines, _ := utils.RenderDisplayStrings(result, nil) diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index e25bde0e4..ab9f7cdf4 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -348,7 +348,6 @@ type TranslationSet struct { PullRequestNoUpstream string ErrorOccurred string NoRoom string - YouAreHere string ConflictLabel string PendingRebaseTodosSectionHeader string PendingCherryPicksSectionHeader string @@ -1421,7 +1420,6 @@ func EnglishTranslationSet() *TranslationSet { PullRequestNoUpstream: "Cannot open a pull request for a branch with no upstream", ErrorOccurred: "An error occurred! Please create an issue at", NoRoom: "Not enough room", - YouAreHere: "YOU ARE HERE", ConflictLabel: "CONFLICT", PendingRebaseTodosSectionHeader: "Pending rebase todos", PendingCherryPicksSectionHeader: "Pending cherry-picks", diff --git a/pkg/integration/tests/cherry_pick/cherry_pick_during_rebase.go b/pkg/integration/tests/cherry_pick/cherry_pick_during_rebase.go index e6dfb3ef0..bd64a7469 100644 --- a/pkg/integration/tests/cherry_pick/cherry_pick_during_rebase.go +++ b/pkg/integration/tests/cherry_pick/cherry_pick_during_rebase.go @@ -62,7 +62,7 @@ var CherryPickDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{ Contains("--- Pending rebase todos ---"), Contains("pick CI two"), Contains("--- Commits ---"), - Contains(" CI <-- YOU ARE HERE --- one").IsSelected(), + Contains(" CI one").IsSelected(), Contains(" CI base"), ). Press(keys.Commits.PasteCommits). @@ -79,7 +79,7 @@ var CherryPickDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{ Contains("--- Pending rebase todos ---"), Contains("pick CI two"), Contains("--- Commits ---"), - Contains(" CI <-- YOU ARE HERE --- three"), + Contains(" CI three"), Contains(" CI one"), Contains(" CI base"), ). diff --git a/pkg/integration/tests/interactive_rebase/advanced_interactive_rebase.go b/pkg/integration/tests/interactive_rebase/advanced_interactive_rebase.go index bcf84e59c..1162a20c7 100644 --- a/pkg/integration/tests/interactive_rebase/advanced_interactive_rebase.go +++ b/pkg/integration/tests/interactive_rebase/advanced_interactive_rebase.go @@ -48,7 +48,7 @@ var AdvancedInteractiveRebase = NewIntegrationTest(NewIntegrationTestArgs{ Contains("--- Pending rebase todos ---"), Contains(TOP_COMMIT), Contains("--- Commits ---"), - Contains(BASE_COMMIT).Contains("YOU ARE HERE"), + Contains(BASE_COMMIT), ). NavigateToLine(Contains(TOP_COMMIT)). Press(keys.Universal.Edit). @@ -56,7 +56,7 @@ var AdvancedInteractiveRebase = NewIntegrationTest(NewIntegrationTestArgs{ Contains("--- Pending rebase todos ---"), Contains(TOP_COMMIT).Contains("edit"), Contains("--- Commits ---"), - Contains(BASE_COMMIT).Contains("YOU ARE HERE"), + Contains(BASE_COMMIT), ). Tap(func() { t.Common().ContinueRebase() @@ -64,7 +64,7 @@ var AdvancedInteractiveRebase = NewIntegrationTest(NewIntegrationTestArgs{ Lines( Contains("--- Pending rebase todos ---"), Contains("--- Commits ---"), - Contains(TOP_COMMIT).Contains("YOU ARE HERE"), + Contains(TOP_COMMIT), Contains(BASE_COMMIT), ) }, diff --git a/pkg/integration/tests/interactive_rebase/amend_head_commit_during_rebase.go b/pkg/integration/tests/interactive_rebase/amend_head_commit_during_rebase.go index 5d24d2a08..66be297f0 100644 --- a/pkg/integration/tests/interactive_rebase/amend_head_commit_during_rebase.go +++ b/pkg/integration/tests/interactive_rebase/amend_head_commit_during_rebase.go @@ -27,7 +27,7 @@ var AmendHeadCommitDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{ Contains("--- Pending rebase todos ---"), Contains("commit 03"), Contains("--- Commits ---"), - Contains("<-- YOU ARE HERE --- commit 02").IsSelected(), + Contains("commit 02").IsSelected(), Contains("commit 01"), ) @@ -53,7 +53,7 @@ var AmendHeadCommitDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{ Contains("--- Pending rebase todos ---"), Contains("commit 03"), Contains("--- Commits ---"), - Contains("<-- YOU ARE HERE --- commit 02").IsSelected(), + Contains("commit 02").IsSelected(), Contains("commit 01"), ) diff --git a/pkg/integration/tests/interactive_rebase/amend_non_head_commit_during_rebase.go b/pkg/integration/tests/interactive_rebase/amend_non_head_commit_during_rebase.go index fca17bfb4..1216655e8 100644 --- a/pkg/integration/tests/interactive_rebase/amend_non_head_commit_during_rebase.go +++ b/pkg/integration/tests/interactive_rebase/amend_non_head_commit_during_rebase.go @@ -27,7 +27,7 @@ var AmendNonHeadCommitDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{ Contains("--- Pending rebase todos ---"), Contains("commit 03"), Contains("--- Commits ---"), - Contains("<-- YOU ARE HERE --- commit 02"), + Contains("commit 02"), Contains("commit 01"), ) diff --git a/pkg/integration/tests/interactive_rebase/delete_update_ref_todo.go b/pkg/integration/tests/interactive_rebase/delete_update_ref_todo.go index 28000bdb0..4ae20160f 100644 --- a/pkg/integration/tests/interactive_rebase/delete_update_ref_todo.go +++ b/pkg/integration/tests/interactive_rebase/delete_update_ref_todo.go @@ -34,7 +34,7 @@ var DeleteUpdateRefTodo = NewIntegrationTest(NewIntegrationTestArgs{ Contains("pick").Contains("CI commit 03"), Contains("pick").Contains("CI commit 02"), Contains("--- Commits ---"), - Contains("CI ◯ <-- YOU ARE HERE --- commit 01"), + Contains("CI ◯ commit 01"), ). NavigateToLine(Contains("update-ref")). Press(keys.Universal.Remove). @@ -52,7 +52,7 @@ var DeleteUpdateRefTodo = NewIntegrationTest(NewIntegrationTestArgs{ Contains("pick").Contains("CI commit 03").IsSelected(), Contains("pick").Contains("CI commit 02"), Contains("--- Commits ---"), - Contains("CI ◯ <-- YOU ARE HERE --- commit 01"), + Contains("CI ◯ commit 01"), ). NavigateToLine(Contains("commit 02")). Press(keys.Universal.Remove). diff --git a/pkg/integration/tests/interactive_rebase/dont_show_branch_heads_for_todo_items.go b/pkg/integration/tests/interactive_rebase/dont_show_branch_heads_for_todo_items.go index 8f26e6803..b0192c59f 100644 --- a/pkg/integration/tests/interactive_rebase/dont_show_branch_heads_for_todo_items.go +++ b/pkg/integration/tests/interactive_rebase/dont_show_branch_heads_for_todo_items.go @@ -49,7 +49,7 @@ var DontShowBranchHeadsForTodoItems = NewIntegrationTest(NewIntegrationTestArgs{ Contains("pick").Contains("CI commit 06"), // no star on this entry, even though branch2 points to it Contains("pick").Contains("CI commit 05"), Contains("--- Commits ---"), - Contains("CI <-- YOU ARE HERE --- commit 04"), + Contains("CI commit 04"), Contains("CI commit 03"), Contains("CI * commit 02"), // this star is fine though Contains("CI commit 01"), diff --git a/pkg/integration/tests/interactive_rebase/drop_todo_commit_with_update_ref.go b/pkg/integration/tests/interactive_rebase/drop_todo_commit_with_update_ref.go index 8e596733d..3dd44baaf 100644 --- a/pkg/integration/tests/interactive_rebase/drop_todo_commit_with_update_ref.go +++ b/pkg/integration/tests/interactive_rebase/drop_todo_commit_with_update_ref.go @@ -47,7 +47,7 @@ var DropTodoCommitWithUpdateRef = NewIntegrationTest(NewIntegrationTestArgs{ Contains("pick").Contains("CI commit 04"), Contains("pick").Contains("CI commit 03"), Contains("--- Commits ---"), - Contains("<-- YOU ARE HERE --- commit 02").IsSelected(), + Contains("CI commit 02").IsSelected(), Contains("CI commit 01"), ). Tap(func() { diff --git a/pkg/integration/tests/interactive_rebase/edit_and_auto_amend.go b/pkg/integration/tests/interactive_rebase/edit_and_auto_amend.go index e07146a06..2107c8a58 100644 --- a/pkg/integration/tests/interactive_rebase/edit_and_auto_amend.go +++ b/pkg/integration/tests/interactive_rebase/edit_and_auto_amend.go @@ -28,7 +28,7 @@ var EditAndAutoAmend = NewIntegrationTest(NewIntegrationTestArgs{ Contains("--- Pending rebase todos ---"), Contains("commit 03"), Contains("--- Commits ---"), - MatchesRegexp("YOU ARE HERE.*commit 02").IsSelected(), + Contains("commit 02").IsSelected(), Contains("commit 01"), ) diff --git a/pkg/integration/tests/interactive_rebase/edit_first_commit.go b/pkg/integration/tests/interactive_rebase/edit_first_commit.go index c30a1cfb1..f09b7f27d 100644 --- a/pkg/integration/tests/interactive_rebase/edit_first_commit.go +++ b/pkg/integration/tests/interactive_rebase/edit_first_commit.go @@ -27,7 +27,7 @@ var EditFirstCommit = NewIntegrationTest(NewIntegrationTestArgs{ Contains("--- Pending rebase todos ---"), Contains("commit 02"), Contains("--- Commits ---"), - MatchesRegexp("YOU ARE HERE.*commit 01").IsSelected(), + Contains("commit 01").IsSelected(), ). Tap(func() { t.Common().ContinueRebase() diff --git a/pkg/integration/tests/interactive_rebase/edit_last_commit_of_stacked_branch.go b/pkg/integration/tests/interactive_rebase/edit_last_commit_of_stacked_branch.go index a4d7558fe..71c66799a 100644 --- a/pkg/integration/tests/interactive_rebase/edit_last_commit_of_stacked_branch.go +++ b/pkg/integration/tests/interactive_rebase/edit_last_commit_of_stacked_branch.go @@ -42,7 +42,7 @@ var EditLastCommitOfStackedBranch = NewIntegrationTest(NewIntegrationTestArgs{ Contains("pick").Contains("CI commit 04"), Contains("update-ref").Contains("branch1"), Contains("--- Commits ---"), - Contains("<-- YOU ARE HERE --- * commit 03").IsSelected(), + Contains("CI * commit 03").IsSelected(), Contains("CI commit 02"), Contains("CI commit 01"), ) diff --git a/pkg/integration/tests/interactive_rebase/edit_non_todo_commit_during_rebase.go b/pkg/integration/tests/interactive_rebase/edit_non_todo_commit_during_rebase.go index f1665157a..6a21412de 100644 --- a/pkg/integration/tests/interactive_rebase/edit_non_todo_commit_during_rebase.go +++ b/pkg/integration/tests/interactive_rebase/edit_non_todo_commit_during_rebase.go @@ -25,7 +25,7 @@ var EditNonTodoCommitDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{ Lines( Contains("--- Pending rebase todos ---"), Contains("--- Commits ---"), - Contains("<-- YOU ARE HERE --- commit 02"), + Contains("commit 02"), Contains("commit 01"), ). NavigateToLine(Contains("commit 01")). diff --git a/pkg/integration/tests/interactive_rebase/edit_range_select_down_to_merge_outside_rebase.go b/pkg/integration/tests/interactive_rebase/edit_range_select_down_to_merge_outside_rebase.go index 9182c21c8..ffb92a4c5 100644 --- a/pkg/integration/tests/interactive_rebase/edit_range_select_down_to_merge_outside_rebase.go +++ b/pkg/integration/tests/interactive_rebase/edit_range_select_down_to_merge_outside_rebase.go @@ -31,7 +31,7 @@ var EditRangeSelectDownToMergeOutsideRebase = NewIntegrationTest(NewIntegrationT Contains("edit CI commit 02").IsSelected(), Contains("edit CI commit 01").IsSelected(), Contains("--- Commits ---").IsSelected(), - Contains(" CI ⏣─╮ <-- YOU ARE HERE --- Merge branch 'second-change-branch' into first-change-branch").IsSelected(), + Contains(" CI ⏣─╮ Merge branch 'second-change-branch' into first-change-branch").IsSelected(), Contains(" CI │ ◯ * second-change-branch unrelated change"), Contains(" CI │ ◯ second change"), Contains(" CI ◯ │ first change"), diff --git a/pkg/integration/tests/interactive_rebase/edit_range_select_outside_rebase.go b/pkg/integration/tests/interactive_rebase/edit_range_select_outside_rebase.go index 464024184..93baafbab 100644 --- a/pkg/integration/tests/interactive_rebase/edit_range_select_outside_rebase.go +++ b/pkg/integration/tests/interactive_rebase/edit_range_select_outside_rebase.go @@ -44,7 +44,7 @@ var EditRangeSelectOutsideRebase = NewIntegrationTest(NewIntegrationTestArgs{ Contains("edit CI second change").IsSelected(), Contains("edit CI * original").IsSelected(), Contains("--- Commits ---").IsSelected(), - Contains(" CI ◯ <-- YOU ARE HERE --- three").IsSelected(), + Contains(" CI ◯ three").IsSelected(), Contains(" CI ◯ two"), Contains(" CI ◯ one"), ) diff --git a/pkg/integration/tests/interactive_rebase/interactive_rebase_of_copied_branch.go b/pkg/integration/tests/interactive_rebase/interactive_rebase_of_copied_branch.go index 78e4e9cd9..8f98e999b 100644 --- a/pkg/integration/tests/interactive_rebase/interactive_rebase_of_copied_branch.go +++ b/pkg/integration/tests/interactive_rebase/interactive_rebase_of_copied_branch.go @@ -37,7 +37,7 @@ var InteractiveRebaseOfCopiedBranch = NewIntegrationTest(NewIntegrationTestArgs{ Contains("pick").Contains("CI commit 03"), Contains("pick").Contains("CI commit 02"), Contains("--- Commits ---"), - Contains("CI <-- YOU ARE HERE --- commit 01"), + Contains("CI commit 01"), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/mid_rebase_range_select.go b/pkg/integration/tests/interactive_rebase/mid_rebase_range_select.go index c5574748e..cb96b8308 100644 --- a/pkg/integration/tests/interactive_rebase/mid_rebase_range_select.go +++ b/pkg/integration/tests/interactive_rebase/mid_rebase_range_select.go @@ -31,7 +31,7 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{ Contains("pick").Contains("commit 07"), Contains("pick").Contains("commit 06"), Contains("--- Commits ---"), - Contains("<-- YOU ARE HERE --- commit 05").IsSelected(), + Contains("commit 05").IsSelected(), Contains("commit 04"), ). SelectPreviousItem(). @@ -45,7 +45,7 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{ Contains("pick").Contains("commit 07").IsSelected(), Contains("pick").Contains("commit 06").IsSelected(), Contains("--- Commits ---"), - Contains("<-- YOU ARE HERE --- commit 05"), + Contains("commit 05"), Contains("commit 04"), ). Press(keys.Commits.MarkCommitAsFixup). @@ -57,7 +57,7 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{ Contains("fixup").Contains("commit 07").IsSelected(), Contains("fixup").Contains("commit 06").IsSelected(), Contains("--- Commits ---"), - Contains("<-- YOU ARE HERE --- commit 05"), + Contains("commit 05"), Contains("commit 04"), ). Press(keys.Commits.PickCommit). @@ -69,7 +69,7 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{ Contains("pick").Contains("commit 07").IsSelected(), Contains("pick").Contains("commit 06").IsSelected(), Contains("--- Commits ---"), - Contains("<-- YOU ARE HERE --- commit 05"), + Contains("commit 05"), Contains("commit 04"), ). Press(keys.Universal.Edit). @@ -81,7 +81,7 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{ Contains("edit").Contains("commit 07").IsSelected(), Contains("edit").Contains("commit 06").IsSelected(), Contains("--- Commits ---"), - Contains("<-- YOU ARE HERE --- commit 05"), + Contains("commit 05"), Contains("commit 04"), ). Press(keys.Commits.SquashDown). @@ -93,7 +93,7 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{ Contains("squash").Contains("commit 07").IsSelected(), Contains("squash").Contains("commit 06").IsSelected(), Contains("--- Commits ---"), - Contains("<-- YOU ARE HERE --- commit 05"), + Contains("commit 05"), Contains("commit 04"), ). Press(keys.Commits.MoveDownCommit). @@ -105,7 +105,7 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{ Contains("squash").Contains("commit 07").IsSelected(), Contains("squash").Contains("commit 06").IsSelected(), Contains("--- Commits ---"), - Contains("<-- YOU ARE HERE --- commit 05"), + Contains("commit 05"), Contains("commit 04"), ). Tap(func() { @@ -120,7 +120,7 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{ Contains("squash").Contains("commit 06").IsSelected(), Contains("pick").Contains("commit 08"), Contains("--- Commits ---"), - Contains("<-- YOU ARE HERE --- commit 05"), + Contains("commit 05"), Contains("commit 04"), ). Press(keys.Commits.MoveUpCommit). @@ -132,7 +132,7 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{ Contains("pick").Contains("commit 09"), Contains("pick").Contains("commit 08"), Contains("--- Commits ---"), - Contains("<-- YOU ARE HERE --- commit 05"), + Contains("commit 05"), Contains("commit 04"), ). Press(keys.Commits.MoveUpCommit). @@ -144,7 +144,7 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{ Contains("pick").Contains("commit 09"), Contains("pick").Contains("commit 08"), Contains("--- Commits ---"), - Contains("<-- YOU ARE HERE --- commit 05"), + Contains("commit 05"), Contains("commit 04"), ). Press(keys.Commits.MoveUpCommit). @@ -159,7 +159,7 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{ Contains("pick").Contains("commit 09"), Contains("pick").Contains("commit 08"), Contains("--- Commits ---"), - Contains("<-- YOU ARE HERE --- commit 05"), + Contains("commit 05"), Contains("commit 04"), ). // Verify we can't perform an action on a range that includes both @@ -174,7 +174,7 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{ Contains("pick").Contains("commit 09"), Contains("pick").Contains("commit 08").IsSelected(), Contains("--- Commits ---").IsSelected(), - Contains("<-- YOU ARE HERE --- commit 05").IsSelected(), + Contains("commit 05").IsSelected(), Contains("commit 04"), ). Press(keys.Commits.MarkCommitAsFixup). @@ -189,7 +189,7 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{ Contains("pick").Contains("commit 09"), Contains("pick").Contains("commit 08").IsSelected(), Contains("--- Commits ---").IsSelected(), - Contains("<-- YOU ARE HERE --- commit 05").IsSelected(), + Contains("commit 05").IsSelected(), Contains("commit 04"), ). // continue the rebase diff --git a/pkg/integration/tests/interactive_rebase/move_in_rebase.go b/pkg/integration/tests/interactive_rebase/move_in_rebase.go index 56f34e489..1cc9dd785 100644 --- a/pkg/integration/tests/interactive_rebase/move_in_rebase.go +++ b/pkg/integration/tests/interactive_rebase/move_in_rebase.go @@ -30,7 +30,7 @@ var MoveInRebase = NewIntegrationTest(NewIntegrationTestArgs{ Contains("commit 03"), Contains("commit 02"), Contains("--- Commits ---"), - Contains("YOU ARE HERE").Contains("commit 01").IsSelected(), + Contains("commit 01").IsSelected(), ). SelectPreviousItem(). Press(keys.Commits.MoveUpCommit). @@ -40,7 +40,7 @@ var MoveInRebase = NewIntegrationTest(NewIntegrationTestArgs{ Contains("commit 02").IsSelected(), Contains("commit 03"), Contains("--- Commits ---"), - Contains("YOU ARE HERE").Contains("commit 01"), + Contains("commit 01"), ). Press(keys.Commits.MoveUpCommit). Lines( @@ -49,7 +49,7 @@ var MoveInRebase = NewIntegrationTest(NewIntegrationTestArgs{ Contains("commit 04"), Contains("commit 03"), Contains("--- Commits ---"), - Contains("YOU ARE HERE").Contains("commit 01"), + Contains("commit 01"), ). // assert we can't move past the top Press(keys.Commits.MoveUpCommit). @@ -62,7 +62,7 @@ var MoveInRebase = NewIntegrationTest(NewIntegrationTestArgs{ Contains("commit 04"), Contains("commit 03"), Contains("--- Commits ---"), - Contains("YOU ARE HERE").Contains("commit 01"), + Contains("commit 01"), ). Press(keys.Commits.MoveDownCommit). Lines( @@ -71,7 +71,7 @@ var MoveInRebase = NewIntegrationTest(NewIntegrationTestArgs{ Contains("commit 02").IsSelected(), Contains("commit 03"), Contains("--- Commits ---"), - Contains("YOU ARE HERE").Contains("commit 01"), + Contains("commit 01"), ). Press(keys.Commits.MoveDownCommit). Lines( @@ -80,7 +80,7 @@ var MoveInRebase = NewIntegrationTest(NewIntegrationTestArgs{ Contains("commit 03"), Contains("commit 02").IsSelected(), Contains("--- Commits ---"), - Contains("YOU ARE HERE").Contains("commit 01"), + Contains("commit 01"), ). // assert we can't move past the bottom Press(keys.Commits.MoveDownCommit). @@ -93,7 +93,7 @@ var MoveInRebase = NewIntegrationTest(NewIntegrationTestArgs{ Contains("commit 03"), Contains("commit 02").IsSelected(), Contains("--- Commits ---"), - Contains("YOU ARE HERE").Contains("commit 01"), + Contains("commit 01"), ). // move it back up one so that we land in a different order than we started with Press(keys.Commits.MoveUpCommit). @@ -103,7 +103,7 @@ var MoveInRebase = NewIntegrationTest(NewIntegrationTestArgs{ Contains("commit 02").IsSelected(), Contains("commit 03"), Contains("--- Commits ---"), - Contains("YOU ARE HERE").Contains("commit 01"), + Contains("commit 01"), ). Tap(func() { t.Common().ContinueRebase() @@ -112,7 +112,7 @@ var MoveInRebase = NewIntegrationTest(NewIntegrationTestArgs{ Contains("commit 04"), Contains("commit 02").IsSelected(), Contains("commit 03"), - DoesNotContain("YOU ARE HERE").Contains("commit 01"), + Contains("commit 01"), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/move_update_ref_todo.go b/pkg/integration/tests/interactive_rebase/move_update_ref_todo.go index b0025ebbf..00f4ba11f 100644 --- a/pkg/integration/tests/interactive_rebase/move_update_ref_todo.go +++ b/pkg/integration/tests/interactive_rebase/move_update_ref_todo.go @@ -34,7 +34,7 @@ var MoveUpdateRefTodo = NewIntegrationTest(NewIntegrationTestArgs{ Contains("pick").Contains("CI commit 03"), Contains("pick").Contains("CI commit 02"), Contains("--- Commits ---"), - Contains("CI ◯ <-- YOU ARE HERE --- commit 01"), + Contains("CI ◯ commit 01"), ). NavigateToLine(Contains("update-ref")). Press(keys.Commits.MoveUpCommit). @@ -48,7 +48,7 @@ var MoveUpdateRefTodo = NewIntegrationTest(NewIntegrationTestArgs{ Contains("pick").Contains("CI commit 03"), Contains("pick").Contains("CI commit 02"), Contains("--- Commits ---"), - Contains("CI ◯ <-- YOU ARE HERE --- commit 01"), + Contains("CI ◯ commit 01"), ). Tap(func() { t.Common().ContinueRebase() diff --git a/pkg/integration/tests/interactive_rebase/pick_rescheduled.go b/pkg/integration/tests/interactive_rebase/pick_rescheduled.go index c37304b8e..af948b7cd 100644 --- a/pkg/integration/tests/interactive_rebase/pick_rescheduled.go +++ b/pkg/integration/tests/interactive_rebase/pick_rescheduled.go @@ -30,7 +30,7 @@ var PickRescheduled = NewIntegrationTest(NewIntegrationTestArgs{ Contains("pick").Contains("three"), Contains("pick").Contains("two"), Contains("--- Commits ---"), - Contains("<-- YOU ARE HERE --- one").IsSelected(), + Contains("one").IsSelected(), ). Tap(func() { t.Shell().CreateFile("file3", "other content\n") @@ -44,7 +44,7 @@ var PickRescheduled = NewIntegrationTest(NewIntegrationTestArgs{ Contains("--- Pending rebase todos ---"), Contains("pick").Contains("three"), Contains("--- Commits ---"), - Contains("<-- YOU ARE HERE --- two"), + Contains("two"), Contains("one"), ) }, diff --git a/pkg/integration/tests/interactive_rebase/quick_start.go b/pkg/integration/tests/interactive_rebase/quick_start.go index ad36570f3..07baa0616 100644 --- a/pkg/integration/tests/interactive_rebase/quick_start.go +++ b/pkg/integration/tests/interactive_rebase/quick_start.go @@ -77,7 +77,7 @@ var QuickStart = NewIntegrationTest(NewIntegrationTestArgs{ Contains("feature-branch two").IsSelected(), Contains("feature-branch one"), Contains("--- Commits ---"), - Contains("last main commit").Contains("YOU ARE HERE"), + Contains("last main commit"), Contains("initial commit"), ). // Try again, verify we fail because we're already rebasing @@ -109,7 +109,7 @@ var QuickStart = NewIntegrationTest(NewIntegrationTestArgs{ Contains("--- Pending rebase todos ---"), Contains("branch-with-merge three").IsSelected(), Contains("--- Commits ---"), - Contains("Merge branch 'branch-to-merge'").Contains("YOU ARE HERE"), + Contains("Merge branch 'branch-to-merge'"), Contains("branch-to-merge two"), Contains("branch-to-merge one"), Contains("branch-with-merge two"), diff --git a/pkg/integration/tests/interactive_rebase/quick_start_keep_selection.go b/pkg/integration/tests/interactive_rebase/quick_start_keep_selection.go index 63f90b87a..d57be84b5 100644 --- a/pkg/integration/tests/interactive_rebase/quick_start_keep_selection.go +++ b/pkg/integration/tests/interactive_rebase/quick_start_keep_selection.go @@ -48,7 +48,7 @@ var QuickStartKeepSelection = NewIntegrationTest(NewIntegrationTestArgs{ Contains("pick").Contains("CI commit 03"), Contains("CI commit 02").IsSelected(), Contains("--- Commits ---"), - Contains("CI <-- YOU ARE HERE --- commit 01"), + Contains("CI commit 01"), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/quick_start_keep_selection_range.go b/pkg/integration/tests/interactive_rebase/quick_start_keep_selection_range.go index 31cec80ee..6b2fe4717 100644 --- a/pkg/integration/tests/interactive_rebase/quick_start_keep_selection_range.go +++ b/pkg/integration/tests/interactive_rebase/quick_start_keep_selection_range.go @@ -53,7 +53,7 @@ var QuickStartKeepSelectionRange = NewIntegrationTest(NewIntegrationTestArgs{ Contains("CI commit 03").IsSelected(), Contains("CI commit 02").IsSelected(), Contains("--- Commits ---"), - Contains("CI <-- YOU ARE HERE --- commit 01"), + Contains("CI commit 01"), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/rebase.go b/pkg/integration/tests/interactive_rebase/rebase.go index 93cf56e94..e1940ff7a 100644 --- a/pkg/integration/tests/interactive_rebase/rebase.go +++ b/pkg/integration/tests/interactive_rebase/rebase.go @@ -40,7 +40,7 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{ MatchesRegexp("pick.*second commit to edit"), MatchesRegexp("pick.*commit to squash"), Contains("--- Commits ---"), - MatchesRegexp("YOU ARE HERE.*first commit to edit").IsSelected(), + Contains("first commit to edit").IsSelected(), Contains("initial commit"), ). SelectPreviousItem(). @@ -52,7 +52,7 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{ MatchesRegexp("pick.*second commit to edit"), MatchesRegexp("squash.*commit to squash").IsSelected(), Contains("--- Commits ---"), - MatchesRegexp("YOU ARE HERE.*first commit to edit"), + Contains("first commit to edit"), Contains("initial commit"), ). SelectPreviousItem(). @@ -64,7 +64,7 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{ MatchesRegexp("edit.*second commit to edit").IsSelected(), MatchesRegexp("squash.*commit to squash"), Contains("--- Commits ---"), - MatchesRegexp("YOU ARE HERE.*first commit to edit"), + Contains("first commit to edit"), Contains("initial commit"), ). SelectPreviousItem(). @@ -76,7 +76,7 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{ MatchesRegexp("edit.*second commit to edit"), MatchesRegexp("squash.*commit to squash"), Contains("--- Commits ---"), - MatchesRegexp("YOU ARE HERE.*first commit to edit"), + Contains("first commit to edit"), Contains("initial commit"), ). SelectPreviousItem(). @@ -88,7 +88,7 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{ MatchesRegexp("edit.*second commit to edit"), MatchesRegexp("squash.*commit to squash"), Contains("--- Commits ---"), - MatchesRegexp("YOU ARE HERE.*first commit to edit"), + Contains("first commit to edit"), Contains("initial commit"), ). Tap(func() { @@ -99,7 +99,7 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{ MatchesRegexp("fixup.*commit to fixup").IsSelected(), MatchesRegexp("drop.*commit to drop"), Contains("--- Commits ---"), - MatchesRegexp("YOU ARE HERE.*second commit to edit"), + Contains("second commit to edit"), MatchesRegexp("first commit to edit"), Contains("initial commit"), ). diff --git a/pkg/integration/tests/interactive_rebase/revert_during_rebase_when_stopped_on_edit.go b/pkg/integration/tests/interactive_rebase/revert_during_rebase_when_stopped_on_edit.go index 5ec043d62..16a2b8c25 100644 --- a/pkg/integration/tests/interactive_rebase/revert_during_rebase_when_stopped_on_edit.go +++ b/pkg/integration/tests/interactive_rebase/revert_during_rebase_when_stopped_on_edit.go @@ -33,7 +33,7 @@ var RevertDuringRebaseWhenStoppedOnEdit = NewIntegrationTest(NewIntegrationTestA Contains("--- Pending rebase todos ---"), Contains("pick").Contains("commit 04"), Contains("--- Commits ---"), - Contains("<-- YOU ARE HERE --- commit 03").IsSelected(), + Contains("commit 03").IsSelected(), Contains("commit 02"), Contains("commit 01"), Contains("master commit 2"), @@ -52,7 +52,7 @@ var RevertDuringRebaseWhenStoppedOnEdit = NewIntegrationTest(NewIntegrationTestA Contains("--- Pending rebase todos ---"), Contains("pick").Contains("commit 04"), Contains("--- Commits ---"), - Contains(`<-- YOU ARE HERE --- Revert "commit 01"`), + Contains(`Revert "commit 01"`), Contains(`Revert "commit 02"`), Contains("commit 03"), Contains("commit 02").IsSelected(), diff --git a/pkg/integration/tests/interactive_rebase/revert_multiple_commits_in_interactive_rebase.go b/pkg/integration/tests/interactive_rebase/revert_multiple_commits_in_interactive_rebase.go index 039619d4c..529c0a5ec 100644 --- a/pkg/integration/tests/interactive_rebase/revert_multiple_commits_in_interactive_rebase.go +++ b/pkg/integration/tests/interactive_rebase/revert_multiple_commits_in_interactive_rebase.go @@ -87,7 +87,7 @@ var RevertMultipleCommitsInInteractiveRebase = NewIntegrationTest(NewIntegration Contains("pick").Contains("CI unrelated change 3"), Contains("pick").Contains("CI unrelated change 2"), Contains("--- Commits ---"), - Contains(`CI ◯ <-- YOU ARE HERE --- Revert "unrelated change 1"`), + Contains(`CI ◯ Revert "unrelated change 1"`), Contains(`CI ◯ Revert "add first line"`), Contains("CI ◯ add second line"), Contains("CI ◯ add first line"), diff --git a/pkg/integration/tests/interactive_rebase/revert_single_commit_in_interactive_rebase.go b/pkg/integration/tests/interactive_rebase/revert_single_commit_in_interactive_rebase.go index 84975c1d9..7126699dc 100644 --- a/pkg/integration/tests/interactive_rebase/revert_single_commit_in_interactive_rebase.go +++ b/pkg/integration/tests/interactive_rebase/revert_single_commit_in_interactive_rebase.go @@ -88,7 +88,7 @@ var RevertSingleCommitInInteractiveRebase = NewIntegrationTest(NewIntegrationTes Contains("pick").Contains("CI unrelated change 2"), Contains("pick").Contains("CI unrelated change 1"), Contains("--- Commits ---"), - Contains(`CI ◯ <-- YOU ARE HERE --- Revert "add first line"`), + Contains(`CI ◯ Revert "add first line"`), Contains("CI ◯ add second line"), Contains("CI ◯ add first line"), Contains("CI ◯ add empty file"), diff --git a/pkg/integration/tests/interactive_rebase/reword_commit_with_editor_and_fail.go b/pkg/integration/tests/interactive_rebase/reword_commit_with_editor_and_fail.go index 6633f9378..df6486772 100644 --- a/pkg/integration/tests/interactive_rebase/reword_commit_with_editor_and_fail.go +++ b/pkg/integration/tests/interactive_rebase/reword_commit_with_editor_and_fail.go @@ -36,7 +36,7 @@ var RewordCommitWithEditorAndFail = NewIntegrationTest(NewIntegrationTestArgs{ Contains("--- Pending rebase todos ---"), Contains("commit 03"), Contains("--- Commits ---"), - Contains("<-- YOU ARE HERE --- commit 02").IsSelected(), + Contains("commit 02").IsSelected(), Contains("commit 01"), ) diff --git a/pkg/integration/tests/interactive_rebase/reword_you_are_here_commit.go b/pkg/integration/tests/interactive_rebase/reword_you_are_here_commit.go index ee0ff81c4..92aaf1a43 100644 --- a/pkg/integration/tests/interactive_rebase/reword_you_are_here_commit.go +++ b/pkg/integration/tests/interactive_rebase/reword_you_are_here_commit.go @@ -28,7 +28,7 @@ var RewordYouAreHereCommit = NewIntegrationTest(NewIntegrationTestArgs{ Contains("--- Pending rebase todos ---"), Contains("commit 03"), Contains("--- Commits ---"), - Contains("<-- YOU ARE HERE --- commit 02").IsSelected(), + Contains("commit 02").IsSelected(), Contains("commit 01"), ). Press(keys.Commits.RenameCommit). @@ -44,7 +44,7 @@ var RewordYouAreHereCommit = NewIntegrationTest(NewIntegrationTestArgs{ Contains("--- Pending rebase todos ---"), Contains("commit 03"), Contains("--- Commits ---"), - Contains("<-- YOU ARE HERE --- renamed 02").IsSelected(), + Contains("renamed 02").IsSelected(), Contains("commit 01"), ) }, diff --git a/pkg/integration/tests/interactive_rebase/reword_you_are_here_commit_with_editor.go b/pkg/integration/tests/interactive_rebase/reword_you_are_here_commit_with_editor.go index 3ad86bde8..b927684fe 100644 --- a/pkg/integration/tests/interactive_rebase/reword_you_are_here_commit_with_editor.go +++ b/pkg/integration/tests/interactive_rebase/reword_you_are_here_commit_with_editor.go @@ -30,7 +30,7 @@ var RewordYouAreHereCommitWithEditor = NewIntegrationTest(NewIntegrationTestArgs Contains("--- Pending rebase todos ---"), Contains("commit 03"), Contains("--- Commits ---"), - Contains("<-- YOU ARE HERE --- commit 02").IsSelected(), + Contains("commit 02").IsSelected(), Contains("commit 01"), ). Press(keys.Commits.RenameCommitWithEditor). @@ -44,7 +44,7 @@ var RewordYouAreHereCommitWithEditor = NewIntegrationTest(NewIntegrationTestArgs Contains("--- Pending rebase todos ---"), Contains("commit 03"), Contains("--- Commits ---"), - Contains("<-- YOU ARE HERE --- renamed 02").IsSelected(), + Contains("renamed 02").IsSelected(), Contains("commit 01"), ) }, diff --git a/pkg/integration/tests/interactive_rebase/show_exec_todos.go b/pkg/integration/tests/interactive_rebase/show_exec_todos.go index 55a9bead0..1ae515845 100644 --- a/pkg/integration/tests/interactive_rebase/show_exec_todos.go +++ b/pkg/integration/tests/interactive_rebase/show_exec_todos.go @@ -35,7 +35,7 @@ var ShowExecTodos = NewIntegrationTest(NewIntegrationTestArgs{ Contains("exec").Contains("false"), Contains("pick").Contains("CI commit 03"), Contains("--- Commits ---"), - Contains("CI ◯ <-- YOU ARE HERE --- commit 02"), + Contains("CI ◯ commit 02"), Contains("CI ◯ commit 01"), ). Tap(func() { @@ -45,7 +45,7 @@ var ShowExecTodos = NewIntegrationTest(NewIntegrationTestArgs{ Lines( Contains("--- Pending rebase todos ---"), Contains("--- Commits ---"), - Contains("CI ◯ <-- YOU ARE HERE --- commit 03"), + Contains("CI ◯ commit 03"), Contains("CI ◯ commit 02"), Contains("CI ◯ commit 01"), ). diff --git a/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go b/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go index 9eb045909..f6653f9b0 100644 --- a/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go +++ b/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go @@ -33,7 +33,7 @@ var SwapInRebaseWithConflict = NewIntegrationTest(NewIntegrationTestArgs{ Contains("commit three"), Contains("commit two"), Contains("--- Commits ---"), - Contains("YOU ARE HERE").Contains("commit one").IsSelected(), + Contains("commit one").IsSelected(), ). SelectPreviousItem(). Press(keys.Commits.MoveUpCommit). @@ -42,7 +42,7 @@ var SwapInRebaseWithConflict = NewIntegrationTest(NewIntegrationTestArgs{ Contains("commit two").IsSelected(), Contains("commit three"), Contains("--- Commits ---"), - Contains("YOU ARE HERE").Contains("commit one"), + Contains("commit one"), ). Tap(func() { t.Common().ContinueRebase() diff --git a/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict_and_edit.go b/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict_and_edit.go index 23f796fd9..f5beb4374 100644 --- a/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict_and_edit.go +++ b/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict_and_edit.go @@ -33,7 +33,7 @@ var SwapInRebaseWithConflictAndEdit = NewIntegrationTest(NewIntegrationTestArgs{ Contains("commit three"), Contains("commit two"), Contains("--- Commits ---"), - Contains("<-- YOU ARE HERE --- commit one").IsSelected(), + Contains("commit one").IsSelected(), ). NavigateToLine(Contains("commit two")). Press(keys.Commits.MoveUpCommit). @@ -42,7 +42,7 @@ var SwapInRebaseWithConflictAndEdit = NewIntegrationTest(NewIntegrationTestArgs{ Contains("commit two").IsSelected(), Contains("commit three"), Contains("--- Commits ---"), - Contains("<-- YOU ARE HERE --- commit one"), + Contains("commit one"), ). NavigateToLine(Contains("commit three")). Press(keys.Universal.Edit). diff --git a/pkg/integration/tests/interactive_rebase/view_files_of_todo_entries.go b/pkg/integration/tests/interactive_rebase/view_files_of_todo_entries.go index a500ba210..29d79513e 100644 --- a/pkg/integration/tests/interactive_rebase/view_files_of_todo_entries.go +++ b/pkg/integration/tests/interactive_rebase/view_files_of_todo_entries.go @@ -33,7 +33,7 @@ var ViewFilesOfTodoEntries = NewIntegrationTest(NewIntegrationTestArgs{ Contains("update-ref").Contains("branch1"), Contains("pick").Contains("CI commit 02"), Contains("--- Commits ---"), - Contains("CI <-- YOU ARE HERE --- commit 01"), + Contains("CI commit 01"), ). Press(keys.Universal.GoInto)