summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2023-08-03 19:07:56 +1000
committerJesse Duffield <jessedduffield@gmail.com>2023-08-03 21:02:12 +1000
commitb432fb5efef09f43e3dfa94b5ae5e4fd6aca63bc (patch)
tree1a366778de8db1928111d1efb7374f4971b39ebd
parentc390c9d58edc18083ed7f1a672b03b7c4d982c12 (diff)
Add undo/redo demo
-rw-r--r--pkg/integration/tests/demo/undo.go71
-rw-r--r--pkg/integration/tests/test_list.go1
2 files changed, 72 insertions, 0 deletions
diff --git a/pkg/integration/tests/demo/undo.go b/pkg/integration/tests/demo/undo.go
new file mode 100644
index 000000000..f11a514ac
--- /dev/null
+++ b/pkg/integration/tests/demo/undo.go
@@ -0,0 +1,71 @@
+package demo
+
+import (
+ "github.com/jesseduffield/lazygit/pkg/config"
+ . "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+// TODO: fix confirmation view wrapping issue: https://github.com/jesseduffield/lazygit/issues/2872
+
+var Undo = NewIntegrationTest(NewIntegrationTestArgs{
+ Description: "Undo",
+ ExtraCmdArgs: []string{},
+ Skip: false,
+ IsDemo: true,
+ SetupConfig: func(config *config.AppConfig) {
+ // No idea why I had to use version 2: it should be using my own computer's
+ // font and the one iterm uses is version 3.
+ config.UserConfig.Gui.NerdFontsVersion = "2"
+ },
+ SetupRepo: func(shell *Shell) {
+ shell.CreateNCommitsWithRandomMessages(30)
+ },
+ Run: func(t *TestDriver, keys config.KeybindingConfig) {
+ t.SetCaptionPrefix("Undo commands")
+ t.Wait(1000)
+
+ confirmCommitDrop := func() {
+ t.ExpectPopup().Confirmation().
+ Title(Equals("Delete commit")).
+ Content(Equals("Are you sure you want to delete this commit?")).
+ Wait(500).
+ 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\.`)).
+ Wait(500).
+ 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\.`)).
+ Wait(500).
+ Confirm()
+ }
+
+ t.Views().Commits().Focus().
+ SetCaptionPrefix("Drop two commits").
+ Wait(1000).
+ Press(keys.Universal.Remove).
+ Tap(confirmCommitDrop).
+ Press(keys.Universal.Remove).
+ Tap(confirmCommitDrop).
+ SetCaptionPrefix("Undo the drops").
+ Wait(1000).
+ Press(keys.Universal.Undo).
+ Tap(confirmUndo).
+ Press(keys.Universal.Undo).
+ Tap(confirmUndo).
+ SetCaptionPrefix("Redo the drops").
+ Wait(1000).
+ Press(keys.Universal.Redo).
+ Tap(confirmRedo).
+ Press(keys.Universal.Redo).
+ Tap(confirmRedo)
+ },
+})
diff --git a/pkg/integration/tests/test_list.go b/pkg/integration/tests/test_list.go
index 75508784e..c1e41bc91 100644
--- a/pkg/integration/tests/test_list.go
+++ b/pkg/integration/tests/test_list.go
@@ -97,6 +97,7 @@ var tests = []*components.IntegrationTest{
demo.InteractiveRebase,
demo.NukeWorkingTree,
demo.StageLines,
+ demo.Undo,
diff.Diff,
diff.DiffAndApplyPatch,
diff.DiffCommits,