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

combine assert and input structs, clean up interface

This commit is contained in:
Jesse Duffield
2022-12-27 16:27:36 +11:00
parent c5c9f5bb94
commit b166b8f776
47 changed files with 1021 additions and 912 deletions

View File

@ -18,34 +18,41 @@ var DiffCommits = NewIntegrationTest(NewIntegrationTestArgs{
shell.UpdateFileAndAdd("file1", "first line\nsecond line\nthird line\n")
shell.Commit("third commit")
},
Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) {
input.SwitchToCommitsView()
Run: func(shell *Shell, input *Input, keys config.KeybindingConfig) {
input.Views().Commits().
Focus().
Lines(
Contains("third commit"),
Contains("second commit"),
Contains("first commit"),
).
Press(keys.Universal.DiffingMenu)
assert.Views().Current().Lines(
Contains("third commit"),
Contains("second commit"),
Contains("first commit"),
)
input.ExpectMenu().Title(Equals("Diffing")).Select(MatchesRegexp(`diff \w+`)).Confirm()
input.Press(keys.Universal.DiffingMenu)
input.Menu().Title(Equals("Diffing")).Select(MatchesRegexp(`diff \w+`)).Confirm()
input.Views().Information().Content(Contains("showing output for: git diff"))
assert.Views().ByName("information").Content(Contains("showing output for: git diff"))
input.Views().Commits().
SelectNextItem().
SelectNextItem().
SelectedLine(Contains("first commit"))
input.NextItem()
input.NextItem()
assert.Views().Current().SelectedLine(Contains("first commit"))
input.Views().Main().Content(Contains("-second line\n-third line"))
assert.Views().Main().Content(Contains("-second line\n-third line"))
input.Views().Commits().
Press(keys.Universal.DiffingMenu)
input.Press(keys.Universal.DiffingMenu)
input.Menu().Title(Equals("Diffing")).Select(Contains("reverse diff direction")).Confirm()
input.ExpectMenu().Title(Equals("Diffing")).Select(Contains("reverse diff direction")).Confirm()
assert.Views().Main().Content(Contains("+second line\n+third line"))
input.Views().Main().Content(Contains("+second line\n+third line"))
input.Enter()
input.Views().Commits().
PressEnter()
assert.Views().Current().Name("commitFiles").SelectedLine(Contains("file1"))
assert.Views().Main().Content(Contains("+second line\n+third line"))
input.Views().CommitFiles().
IsFocused().
SelectedLine(Contains("file1"))
input.Views().Main().Content(Contains("+second line\n+third line"))
},
})