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

combine assert and input structs, clean up interface

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/integration/tests/custom_commands/basic.go
View File

@ -24,15 +24,15 @@ var Basic = NewIntegrationTest(NewIntegrationTestArgs{
Run: func(
shell *Shell,
input *Input,
assert *Assert,
keys config.KeybindingConfig,
) {
assert.Model().WorkingTreeFileCount(0)
input.Model().WorkingTreeFileCount(0)
input.Press("a")
assert.Views().ByName("files").Lines(
Contains("myfile"),
)
input.Views().Files().
IsFocused().
Press("a").
Lines(
Contains("myfile"),
)
},
})

19
pkg/integration/tests/custom_commands/form_prompts.go
View File

@ -58,24 +58,25 @@ var FormPrompts = NewIntegrationTest(NewIntegrationTestArgs{
Run: func(
shell *Shell,
input *Input,
assert *Assert,
keys config.KeybindingConfig,
) {
assert.Model().WorkingTreeFileCount(0)
input.Model().WorkingTreeFileCount(0)
input.Press("a")
input.Views().Files().
IsFocused().
Press("a")
input.Prompt().Title(Equals("Enter a file name")).Type("my file").Confirm()
input.ExpectPrompt().Title(Equals("Enter a file name")).Type("my file").Confirm()
input.Menu().Title(Equals("Choose file content")).Select(Contains("bar")).Confirm()
input.ExpectMenu().Title(Equals("Choose file content")).Select(Contains("bar")).Confirm()
input.Confirmation().
input.ExpectConfirmation().
Title(Equals("Are you sure?")).
Content(Equals("Are you REALLY sure you want to make this file? Up to you buddy.")).
Confirm()
assert.Model().WorkingTreeFileCount(1)
assert.Views().Current().SelectedLine(Contains("my file"))
assert.Views().Main().Content(Contains(`"BAR"`))
input.Model().WorkingTreeFileCount(1)
input.Views().Files().SelectedLine(Contains("my file"))
input.Views().Main().Content(Contains(`"BAR"`))
},
})

20
pkg/integration/tests/custom_commands/menu_from_command.go
View File

@ -45,22 +45,20 @@ var MenuFromCommand = NewIntegrationTest(NewIntegrationTestArgs{
Run: func(
shell *Shell,
input *Input,
assert *Assert,
keys config.KeybindingConfig,
) {
assert.Model().WorkingTreeFileCount(0)
input.SwitchToBranchesView()
input.Model().WorkingTreeFileCount(0)
input.Views().Branches().
Focus().
Press("a")
input.Press("a")
input.ExpectMenu().Title(Equals("Choose commit message")).Select(Contains("bar")).Confirm()
input.Menu().Title(Equals("Choose commit message")).Select(Contains("bar")).Confirm()
input.ExpectPrompt().Title(Equals("Description")).Type(" my branch").Confirm()
input.Prompt().Title(Equals("Description")).Type(" my branch").Confirm()
input.Model().WorkingTreeFileCount(1)
input.SwitchToFilesView()
assert.Model().WorkingTreeFileCount(1)
assert.Views().Current().SelectedLine(Contains("output.txt"))
assert.Views().Main().Content(Contains("bar Branch: #feature/foo my branch feature/foo"))
input.Views().Files().Focus().SelectedLine(Contains("output.txt"))
input.Views().Main().Content(Contains("bar Branch: #feature/foo my branch feature/foo"))
},
})

17
pkg/integration/tests/custom_commands/menu_from_commands_output.go
View File

@ -44,23 +44,22 @@ var MenuFromCommandsOutput = NewIntegrationTest(NewIntegrationTestArgs{
Run: func(
shell *Shell,
input *Input,
assert *Assert,
keys config.KeybindingConfig,
) {
assert.Model().CurrentBranchName("feature/bar")
input.Model().CurrentBranchName("feature/bar")
input.Model().WorkingTreeFileCount(0)
assert.Model().WorkingTreeFileCount(0)
input.SwitchToBranchesView()
input.Views().Branches().
Focus().
Press("a")
input.Press("a")
input.Prompt().
input.ExpectPrompt().
Title(Equals("Which git command do you want to run?")).
InitialText(Equals("branch")).
Confirm()
input.Menu().Title(Equals("Branch:")).Select(Equals("master")).Confirm()
input.ExpectMenu().Title(Equals("Branch:")).Select(Equals("master")).Confirm()
assert.Model().CurrentBranchName("master")
input.Model().CurrentBranchName("master")
},
})

19
pkg/integration/tests/custom_commands/multiple_prompts.go
View File

@ -56,24 +56,25 @@ var MultiplePrompts = NewIntegrationTest(NewIntegrationTestArgs{
Run: func(
shell *Shell,
input *Input,
assert *Assert,
keys config.KeybindingConfig,
) {
assert.Model().WorkingTreeFileCount(0)
input.Model().WorkingTreeFileCount(0)
input.Press("a")
input.Views().Files().
IsFocused().
Press("a")
input.Prompt().Title(Equals("Enter a file name")).Type("myfile").Confirm()
input.ExpectPrompt().Title(Equals("Enter a file name")).Type("myfile").Confirm()
input.Menu().Title(Equals("Choose file content")).Select(Contains("bar")).Confirm()
input.ExpectMenu().Title(Equals("Choose file content")).Select(Contains("bar")).Confirm()
input.Confirmation().
input.ExpectConfirmation().
Title(Equals("Are you sure?")).
Content(Equals("Are you REALLY sure you want to make this file? Up to you buddy.")).
Confirm()
assert.Model().WorkingTreeFileCount(1)
assert.Views().Current().SelectedLine(Contains("myfile"))
assert.Views().Main().Content(Contains("BAR"))
input.Model().WorkingTreeFileCount(1)
input.Views().Files().SelectedLine(Contains("myfile"))
input.Views().Main().Content(Contains("BAR"))
},
})