lazygit/pkg/integration/tests/undo/undo_commit.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(
				Contains("A  file"),
				Contains(" M other-file"),
			)

		t.Views().Commits().Focus().
			Press(keys.Universal.Redo).
			Tap(confirmRedo).
			Lines(
				Contains("two").IsSelected(),
				Contains("one"),
			)

		t.Views().Files().
			Lines(
				Contains(" 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(
				Contains("A  file"),
				Contains(" M other-file").IsSelected(),
			).
			Press(keys.Universal.PrevItem).
			Press(keys.Universal.Remove).
			Tap(confirmDiscardFile).
			Lines(
				Contains(" M other-file"),
			).
			Press(keys.Universal.Redo).
			Tap(confirmRedo)

		t.Views().Commits().
			Lines(
				Contains("two"),
				Contains("one"),
			)

		t.Views().Files().
			Lines(
				Contains(" M other-file"),
			)
	},
})