mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-05-22 10:15:43 +02:00
Jesse Duffield
63dc07fded
By constructing an arg vector manually, we no longer need to quote arguments Mandate that args must be passed when building a command Now you need to provide an args array when building a command. There are a handful of places where we need to deal with a string, such as with user-defined custom commands, and for those we now require that at the callsite they use str.ToArgv to do that. I don't want to provide a method out of the box for it because I want to discourage its use. For some reason we were invoking a command through a shell when amending a commit, and I don't believe we needed to do that as there was nothing user- supplied about the command. So I've switched to using a regular command out- side the shell there
91 lines
2.2 KiB
Go
91 lines
2.2 KiB
Go
package undo
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var UndoDrop = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Drop some commits and then undo/redo the actions",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.EmptyCommit("one")
|
|
shell.EmptyCommit("two")
|
|
shell.EmptyCommit("three")
|
|
shell.EmptyCommit("four")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
confirmCommitDrop := func() {
|
|
t.ExpectPopup().Confirmation().
|
|
Title(Equals("Delete Commit")).
|
|
Content(Equals("Are you sure you want to delete this commit?")).
|
|
Confirm()
|
|
}
|
|
|
|
confirmUndo := func() {
|
|
t.ExpectPopup().Confirmation().
|
|
Title(Equals("Undo")).
|
|
Content(MatchesRegexp(`Are you sure you want to hard reset to '.*'\? An auto-stash will be performed if necessary\.`)).
|
|
Confirm()
|
|
}
|
|
|
|
confirmRedo := func() {
|
|
t.ExpectPopup().Confirmation().
|
|
Title(Equals("Redo")).
|
|
Content(MatchesRegexp(`Are you sure you want to hard reset to '.*'\? An auto-stash will be performed if necessary\.`)).
|
|
Confirm()
|
|
}
|
|
|
|
t.Views().Commits().Focus().
|
|
Lines(
|
|
Contains("four").IsSelected(),
|
|
Contains("three"),
|
|
Contains("two"),
|
|
Contains("one"),
|
|
).
|
|
Press(keys.Universal.Remove).
|
|
Tap(confirmCommitDrop).
|
|
Lines(
|
|
Contains("three").IsSelected(),
|
|
Contains("two"),
|
|
Contains("one"),
|
|
).
|
|
Press(keys.Universal.Remove).
|
|
Tap(confirmCommitDrop).
|
|
Lines(
|
|
Contains("two").IsSelected(),
|
|
Contains("one"),
|
|
).
|
|
Press(keys.Universal.Undo).
|
|
Tap(confirmUndo).
|
|
Lines(
|
|
Contains("three").IsSelected(),
|
|
Contains("two"),
|
|
Contains("one"),
|
|
).
|
|
Press(keys.Universal.Undo).
|
|
Tap(confirmUndo).
|
|
Lines(
|
|
Contains("four").IsSelected(),
|
|
Contains("three"),
|
|
Contains("two"),
|
|
Contains("one"),
|
|
).
|
|
Press(keys.Universal.Redo).
|
|
Tap(confirmRedo).
|
|
Lines(
|
|
Contains("three").IsSelected(),
|
|
Contains("two"),
|
|
Contains("one"),
|
|
).
|
|
Press(keys.Universal.Redo).
|
|
Tap(confirmRedo).
|
|
Lines(
|
|
Contains("two").IsSelected(),
|
|
Contains("one"),
|
|
)
|
|
},
|
|
})
|