1 files changed, 58 insertions, 0 deletions
diff --git a/pkg/integration/tests/interactive_rebase/squash_fixups_above.go b/pkg/integration/tests/interactive_rebase/squash_fixups_above.go
new file mode 100644
index 000000000..9af6594ef
--- /dev/null
+++ b/pkg/integration/tests/interactive_rebase/squash_fixups_above.go
@@ -0,0 +1,58 @@
+package interactive_rebase
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var SquashFixupsAbove = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Squashes all fixups above a commit and checks that the selected line stays correct.",
+	ExtraCmdArgs: []string{},
+	Skip:         false,
+	SetupConfig:  func(config *config.AppConfig) {},
+	SetupRepo: func(shell *Shell) {
+		shell.
+			CreateNCommits(3).
+			CreateFileAndAdd("fixup-file", "fixup content")
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		t.Views().Commits().
+			Focus().
+			Lines(
+				Contains("commit 03"),
+				Contains("commit 02"),
+				Contains("commit 01"),
+			).
+			NavigateToLine(Contains("commit 02")).
+			Press(keys.Commits.CreateFixupCommit).
+			Tap(func() {
+				t.ExpectPopup().Confirmation().
+					Title(Equals("Create fixup commit")).
+					Content(Contains("Are you sure you want to create a fixup! commit for commit")).
+					Confirm()
+			}).
+			Lines(
+				Contains("fixup! commit 02"),
+				Contains("commit 03").IsSelected(), // wrong, we want the next line
+				Contains("commit 02"),
+				Contains("commit 01"),
+			).
+			SelectNextItem().
+			Press(keys.Commits.SquashAboveCommits).
+			Tap(func() {
+				t.ExpectPopup().Menu().
+					Title(Equals("Apply fixup commits")).
+					Select(Contains("Above the selected commit")).
+					Confirm()
+			}).
+			Lines(
+				Contains("commit 03"),
+				Contains("commit 02"),
+				Contains("commit 01").IsSelected(), // wrong, we want the previous line
+			).
+			SelectPreviousItem()
+
+		t.Views().Main().
+			Content(Contains("fixup content"))
+	},
+})