sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

Remove the "YOU ARE HERE" marker

Browse Source 
Now that we have sections, it is no longer needed.

Keep the "<-- CONFLICTS" marker though.
This commit is contained in:
Stefan Haller
2025-04-05 13:43:50 +02:00
parent 6cbc1e0ace
commit 74054c9d70
37 changed files with 75 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/integration/tests/interactive_rebase/move_in_rebase.go
View File

@ -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"),
)
},
})