feat: add a menu to rebase current branch to a target branch upstream

pkg/integration/tests/branch/rebase_to_upstream.go

@@ -0,0 +1,82 @@
+package branch
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var RebaseToUpstream = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Rebase the current branch to the selected branch upstream",
+	ExtraCmdArgs: []string{},
+	Skip:         false,
+	SetupConfig:  func(config *config.AppConfig) {},
+	SetupRepo: func(shell *Shell) {
+		shell.
+			CloneIntoRemote("origin").
+			EmptyCommit("ensure-master").
+			EmptyCommit("to-be-added"). // <- this will only exist remotely
+			PushBranch("origin", "master").
+			HardReset("HEAD~1").
+			NewBranchFrom("base-branch", "master").
+			EmptyCommit("base-branch-commit").
+			NewBranch("target").
+			EmptyCommit("target-commit")
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		t.Views().Commits().Lines(
+			Contains("target-commit"),
+			Contains("base-branch-commit"),
+			Contains("ensure-master"),
+		)
+
+		t.Views().Branches().
+			Focus().
+			Lines(
+				Contains("target").IsSelected(),
+				Contains("base-branch"),
+				Contains("master"),
+			).
+			SelectNextItem().
+			Lines(
+				Contains("target"),
+				Contains("base-branch").IsSelected(),
+				Contains("master"),
+			).
+			Press(keys.Branches.SetUpstream).
+			Tap(func() {
+				t.ExpectPopup().Menu().
+					Title(Equals("Upstream options")).
+					Select(Contains("Rebase checked-out branch onto upstream of selected branch")).
+					Tooltip(Contains("Disabled: The selected branch has no upstream (or the upstream is not stored locally)")).
+					Confirm()
+				t.ExpectPopup().Alert().
+					Title(Equals("Error")).
+					Content(Equals("The selected branch has no upstream (or the upstream is not stored locally)")).
+					Confirm()
+			}).
+			SelectNextItem().
+			Lines(
+				Contains("target"),
+				Contains("base-branch"),
+				Contains("master").IsSelected(),
+			).
+			Press(keys.Branches.SetUpstream).
+			Tap(func() {
+				t.ExpectPopup().Menu().
+					Title(Equals("Upstream options")).
+					Select(Contains("Rebase checked-out branch onto origin/master...")).
+					Confirm()
+				t.ExpectPopup().Menu().
+					Title(Equals("Rebase 'target' onto 'origin/master'")).
+					Select(Contains("Simple rebase")).
+					Confirm()
+			})
+
+		t.Views().Commits().Lines(
+			Contains("target-commit"),
+			Contains("base-branch-commit"),
+			Contains("to-be-added"),
+			Contains("ensure-master"),
+		)
+	},
+})