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

allow checking if line is selected in Lines and TopLines methods

Browse Source
This commit is contained in:
Jesse Duffield
2022-12-26 17:37:41 +11:00
parent 96310288ee
commit 09db4c4397
7 changed files with 68 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/integration/tests/branch/rebase_and_drop.go
View File

@ -27,7 +27,7 @@ var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{
)
assert.View("commits").TopLines(
Contains("to keep"),
Contains("to keep").IsSelected(),
Contains("to remove"),
Contains("first change"),
Contains("original"),
@ -44,22 +44,29 @@ var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{
assert.CurrentView().
Name("files").
SelectedLine(Contains("file"))
SelectedLine(MatchesRegexp("UU.*file"))
input.SwitchToCommitsView()
assert.CurrentView().
TopLines(
MatchesRegexp(`pick.*to keep`),
MatchesRegexp(`pick.*to keep`).IsSelected(),
MatchesRegexp(`pick.*to remove`),
MatchesRegexp("YOU ARE HERE.*second-change-branch unrelated change"),
MatchesRegexp("second change"),
MatchesRegexp("original"),
).
SelectedLineIdx(0)
)
input.NextItem()
input.Press(keys.Universal.Remove)
assert.CurrentView().SelectedLine(MatchesRegexp(`drop.*to remove`))
assert.CurrentView().
TopLines(
MatchesRegexp(`pick.*to keep`),
MatchesRegexp(`drop.*to remove`).IsSelected(),
MatchesRegexp("YOU ARE HERE.*second-change-branch unrelated change"),
MatchesRegexp("second change"),
MatchesRegexp("original"),
)
input.SwitchToFilesView()
@ -76,7 +83,7 @@ var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{
assert.View("commits").TopLines(
Contains("to keep"),
Contains("second-change-branch unrelated change"),
Contains("second-change-branch unrelated change").IsSelected(),
Contains("second change"),
Contains("original"),
)