mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-04-25 13:42:30 +03:00
0b5504aa98
Assert the entire lines using Equals instead of Contains. This makes the tests a bit easier to read, and it makes it much easier to decide how they need to be changed when we change the layout (like we do in the last commit of this branch). It is true that this requires changing all these tests for any future UI changes, but I think this is a good price to pay; those adaptions are trivial and can be done without thinking.
111 lines
2.4 KiB
Go
111 lines
2.4 KiB
Go
package undo
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var UndoCommit = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Undo/redo a commit",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.CreateFileAndAdd("other-file", "other-file-1")
|
|
shell.Commit("one")
|
|
shell.CreateFileAndAdd("file", "file-1")
|
|
shell.Commit("two")
|
|
shell.UpdateFile("other-file", "other-file-2")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
confirmUndo := func() {
|
|
t.ExpectPopup().Confirmation().
|
|
Title(Equals("Undo")).
|
|
Content(MatchesRegexp(`Are you sure you want to soft reset to '.*'\?`)).
|
|
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()
|
|
}
|
|
|
|
confirmDiscardFile := func() {
|
|
t.ExpectPopup().Menu().
|
|
Title(Equals("Discard changes")).
|
|
Select(Contains("Discard all changes")).
|
|
Confirm()
|
|
}
|
|
|
|
t.Views().Files().
|
|
Lines(
|
|
Contains(" M other-file"),
|
|
)
|
|
|
|
t.Views().Commits().Focus().
|
|
Lines(
|
|
Contains("two").IsSelected(),
|
|
Contains("one"),
|
|
).
|
|
Press(keys.Universal.Undo).
|
|
Tap(confirmUndo).
|
|
Lines(
|
|
Contains("one").IsSelected(),
|
|
)
|
|
|
|
t.Views().Files().
|
|
Lines(
|
|
Equals("A file"),
|
|
Equals(" M other-file"),
|
|
)
|
|
|
|
t.Views().Commits().Focus().
|
|
Press(keys.Universal.Redo).
|
|
Tap(confirmRedo).
|
|
Lines(
|
|
Contains("two").IsSelected(),
|
|
Contains("one"),
|
|
)
|
|
|
|
t.Views().Files().
|
|
Lines(
|
|
Equals(" M other-file"),
|
|
)
|
|
|
|
// Undo again, this time discarding the original change before redoing again
|
|
t.Views().Commits().Focus().
|
|
Press(keys.Universal.Undo).
|
|
Tap(confirmUndo).
|
|
Lines(
|
|
Contains("one").IsSelected(),
|
|
)
|
|
|
|
t.Views().Files().Focus().
|
|
Lines(
|
|
Equals("A file"),
|
|
Equals(" M other-file").IsSelected(),
|
|
).
|
|
Press(keys.Universal.PrevItem).
|
|
Press(keys.Universal.Remove).
|
|
Tap(confirmDiscardFile).
|
|
Lines(
|
|
Equals(" M other-file"),
|
|
).
|
|
Press(keys.Universal.Redo).
|
|
Tap(confirmRedo)
|
|
|
|
t.Views().Commits().
|
|
Lines(
|
|
Contains("two"),
|
|
Contains("one"),
|
|
)
|
|
|
|
t.Views().Files().
|
|
Lines(
|
|
Equals(" M other-file"),
|
|
)
|
|
},
|
|
})
|