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

Rename "Custom Command" to "Shell Command"

Browse Source 
The double use of the term "Custom Command" for both shell commands and
user-configured keybindings was confusing.
This commit is contained in:
Stefan Haller
2024-08-06 10:47:43 +02:00
parent 0cbe08b105
commit dbca9306de
22 changed files with 77 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/integration/tests/shell_commands/basic_shell_command.go
View File

@ -17,10 +17,10 @@ var BasicShellCommand = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().
IsEmpty().
IsFocused().
Press(keys.Universal.ExecuteCustomCommand)
Press(keys.Universal.ExecuteShellCommand)
t.ExpectPopup().Prompt().
Title(Equals("Custom command:")).
Title(Equals("Shell command:")).
Type("touch file.txt").
Confirm()

4
pkg/integration/tests/shell_commands/complex_shell_command.go
View File

@ -17,10 +17,10 @@ var ComplexShellCommand = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().
IsEmpty().
IsFocused().
Press(keys.Universal.ExecuteCustomCommand)
Press(keys.Universal.ExecuteShellCommand)
t.ExpectPopup().Prompt().
Title(Equals("Custom command:")).
Title(Equals("Shell command:")).
Type("sh -c \"touch file.txt\"").
Confirm()

8
pkg/integration/tests/shell_commands/delete_from_history.go
View File

@ -13,9 +13,9 @@ var DeleteFromHistory = NewIntegrationTest(NewIntegrationTestArgs{
SetupConfig: func(cfg *config.AppConfig) {},
Run: func(t *TestDriver, keys config.KeybindingConfig) {
createCustomCommand := func(command string) {
t.GlobalPress(keys.Universal.ExecuteCustomCommand)
t.GlobalPress(keys.Universal.ExecuteShellCommand)
t.ExpectPopup().Prompt().
Title(Equals("Custom command:")).
Title(Equals("Shell command:")).
Type(command).
Confirm()
}
@ -24,9 +24,9 @@ var DeleteFromHistory = NewIntegrationTest(NewIntegrationTestArgs{
createCustomCommand("echo 2")
createCustomCommand("echo 3")
t.GlobalPress(keys.Universal.ExecuteCustomCommand)
t.GlobalPress(keys.Universal.ExecuteShellCommand)
t.ExpectPopup().Prompt().
Title(Equals("Custom command:")).
Title(Equals("Shell command:")).
SuggestionLines(
Contains("3"),
Contains("2"),

8
pkg/integration/tests/shell_commands/edit_history.go
View File

@ -12,15 +12,15 @@ var EditHistory = NewIntegrationTest(NewIntegrationTestArgs{
SetupRepo: func(shell *Shell) {},
SetupConfig: func(cfg *config.AppConfig) {},
Run: func(t *TestDriver, keys config.KeybindingConfig) {
t.GlobalPress(keys.Universal.ExecuteCustomCommand)
t.GlobalPress(keys.Universal.ExecuteShellCommand)
t.ExpectPopup().Prompt().
Title(Equals("Custom command:")).
Title(Equals("Shell command:")).
Type("echo x").
Confirm()
t.GlobalPress(keys.Universal.ExecuteCustomCommand)
t.GlobalPress(keys.Universal.ExecuteShellCommand)
t.ExpectPopup().Prompt().
Title(Equals("Custom command:")).
Title(Equals("Shell command:")).
Type("ec").
SuggestionLines(
Equals("echo x"),

20
pkg/integration/tests/shell_commands/history.go
View File

@ -12,22 +12,22 @@ var History = NewIntegrationTest(NewIntegrationTestArgs{
SetupRepo: func(shell *Shell) {},
SetupConfig: func(cfg *config.AppConfig) {},
Run: func(t *TestDriver, keys config.KeybindingConfig) {
t.GlobalPress(keys.Universal.ExecuteCustomCommand)
t.GlobalPress(keys.Universal.ExecuteShellCommand)
t.ExpectPopup().Prompt().
Title(Equals("Custom command:")).
Title(Equals("Shell command:")).
Type("echo 1").
Confirm()
t.GlobalPress(keys.Universal.ExecuteCustomCommand)
t.GlobalPress(keys.Universal.ExecuteShellCommand)
t.ExpectPopup().Prompt().
Title(Equals("Custom command:")).
Title(Equals("Shell command:")).
SuggestionLines(Contains("1")).
Type("echo 2").
Confirm()
t.GlobalPress(keys.Universal.ExecuteCustomCommand)
t.GlobalPress(keys.Universal.ExecuteShellCommand)
t.ExpectPopup().Prompt().
Title(Equals("Custom command:")).
Title(Equals("Shell command:")).
SuggestionLines(
// "echo 2" was typed last, so it should come first
Contains("2"),
@ -36,9 +36,9 @@ var History = NewIntegrationTest(NewIntegrationTestArgs{
Type("echo 3").
Confirm()
t.GlobalPress(keys.Universal.ExecuteCustomCommand)
t.GlobalPress(keys.Universal.ExecuteShellCommand)
t.ExpectPopup().Prompt().
Title(Equals("Custom command:")).
Title(Equals("Shell command:")).
SuggestionLines(
Contains("3"),
Contains("2"),
@ -48,9 +48,9 @@ var History = NewIntegrationTest(NewIntegrationTestArgs{
Confirm()
// Executing a command again should move it to the front:
t.GlobalPress(keys.Universal.ExecuteCustomCommand)
t.GlobalPress(keys.Universal.ExecuteShellCommand)
t.ExpectPopup().Prompt().
Title(Equals("Custom command:")).
Title(Equals("Shell command:")).
SuggestionLines(
Contains("1"),
Contains("3"),

12
pkg/integration/tests/shell_commands/omit_from_history.go
View File

@ -14,23 +14,23 @@ var OmitFromHistory = NewIntegrationTest(NewIntegrationTestArgs{
},
SetupConfig: func(cfg *config.AppConfig) {},
Run: func(t *TestDriver, keys config.KeybindingConfig) {
t.GlobalPress(keys.Universal.ExecuteCustomCommand)
t.GlobalPress(keys.Universal.ExecuteShellCommand)
t.ExpectPopup().Prompt().
Title(Equals("Custom command:")).
Title(Equals("Shell command:")).
Type("echo aubergine").
Confirm()
t.GlobalPress(keys.Universal.ExecuteCustomCommand)
t.GlobalPress(keys.Universal.ExecuteShellCommand)
t.ExpectPopup().Prompt().
Title(Equals("Custom command:")).
Title(Equals("Shell command:")).
SuggestionLines(Contains("aubergine")).
SuggestionLines(DoesNotContain("tangerine")).
Type(" echo tangerine").
Confirm()
t.GlobalPress(keys.Universal.ExecuteCustomCommand)
t.GlobalPress(keys.Universal.ExecuteShellCommand)
t.ExpectPopup().Prompt().
Title(Equals("Custom command:")).
Title(Equals("Shell command:")).
SuggestionLines(Contains("aubergine")).
SuggestionLines(DoesNotContain("tangerine")).
Cancel()