migrate merge conflict undo test

pkg/integration/tests/conflicts/undo_choose_hunk.go

@@ -0,0 +1,34 @@
+package conflicts
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+	"github.com/jesseduffield/lazygit/pkg/integration/tests/shared"
+)
+
+var UndoChooseHunk = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Chooses a hunk when resolving a merge conflict and then undoes the choice",
+	ExtraCmdArgs: "",
+	Skip:         false,
+	SetupConfig:  func(config *config.AppConfig) {},
+	SetupRepo: func(shell *Shell) {
+		shared.CreateMergeConflictFileMultiple(shell)
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		t.Views().Files().
+			IsFocused().
+			Lines(
+				Contains("UU file").IsSelected(),
+			).
+			PressEnter()
+
+		t.Views().MergeConflicts().
+			IsFocused().
+			Content(Contains("<<<<<<< HEAD\nFirst Change")).
+			PressPrimaryAction().
+			// choosing the first hunk
+			Content(DoesNotContain("<<<<<<< HEAD\nFirst Change")).
+			Press(keys.Universal.Undo).
+			Content(Contains("<<<<<<< HEAD\nFirst Change"))
+	},
+})

pkg/integration/tests/shared/conflicts.go

@@ -48,10 +48,96 @@ var MergeConflictsSetup = func(shell *Shell) {
 		Checkout("first-change-branch")
 }
 
-var CreateMergeCommit = func(shell *Shell) {
+var CreateMergeConflictFile = func(shell *Shell) {
 	MergeConflictsSetup(shell)
 
 	shell.RunShellCommandExpectError("git merge --no-edit second-change-branch")
+}
+
+var CreateMergeCommit = func(shell *Shell) {
+	CreateMergeConflictFile(shell)
 	shell.UpdateFileAndAdd("file", SecondChangeFileContent)
 	shell.ContinueMerge()
 }
+
+// These 'multiple' variants are just like the short ones but with longer file contents and with multiple conflicts within the file.
+
+var OriginalFileContentMultiple = `
+This
+Is
+The
+Original
+File
+..
+It
+Is
+Longer
+Than
+The
+Other
+Options
+`
+
+var FirstChangeFileContentMultiple = `
+This
+Is
+The
+First Change
+File
+..
+It
+Is
+Longer
+Than
+The
+Other
+Other First Change
+`
+
+var SecondChangeFileContentMultiple = `
+This
+Is
+The
+Second Change
+File
+..
+It
+Is
+Longer
+Than
+The
+Other
+Other Second Change
+`
+
+// prepares us for a rebase/merge that has conflicts
+var MergeConflictsSetupMultiple = func(shell *Shell) {
+	shell.
+		NewBranch("original-branch").
+		EmptyCommit("one").
+		EmptyCommit("two").
+		EmptyCommit("three").
+		CreateFileAndAdd("file", OriginalFileContentMultiple).
+		Commit("original").
+		NewBranch("first-change-branch").
+		UpdateFileAndAdd("file", FirstChangeFileContentMultiple).
+		Commit("first change").
+		Checkout("original-branch").
+		NewBranch("second-change-branch").
+		UpdateFileAndAdd("file", SecondChangeFileContentMultiple).
+		Commit("second change").
+		EmptyCommit("second-change-branch unrelated change").
+		Checkout("first-change-branch")
+}
+
+var CreateMergeConflictFileMultiple = func(shell *Shell) {
+	MergeConflictsSetupMultiple(shell)
+
+	shell.RunShellCommandExpectError("git merge --no-edit second-change-branch")
+}
+
+var CreateMergeCommitMultiple = func(shell *Shell) {
+	CreateMergeConflictFileMultiple(shell)
+	shell.UpdateFileAndAdd("file", SecondChangeFileContentMultiple)
+	shell.ContinueMerge()
+}

pkg/integration/tests/tests_gen.go

@@ -9,6 +9,7 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/integration/tests/cherry_pick"
 	"github.com/jesseduffield/lazygit/pkg/integration/tests/commit"
 	"github.com/jesseduffield/lazygit/pkg/integration/tests/config"
+	"github.com/jesseduffield/lazygit/pkg/integration/tests/conflicts"
 	"github.com/jesseduffield/lazygit/pkg/integration/tests/custom_commands"
 	"github.com/jesseduffield/lazygit/pkg/integration/tests/diff"
 	"github.com/jesseduffield/lazygit/pkg/integration/tests/file"
@@ -46,6 +47,7 @@ var tests = []*components.IntegrationTest{
 	commit.StagedWithoutHooks,
 	commit.Unstaged,
 	config.RemoteNamedStar,
+	conflicts.UndoChooseHunk,
 	custom_commands.Basic,
 	custom_commands.FormPrompts,
 	custom_commands.MenuFromCommand,