mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-01-10 04:07:18 +02:00
47d422bb8a
This should already have been done when adding the "View divergence from upstream" command, but now we're going to add yet another item to the menu that is unrelated to setting or unsetting the upstream.
41 lines
1.2 KiB
Go
41 lines
1.2 KiB
Go
package branch
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var SetUpstream = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Set the upstream of a branch",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.EmptyCommit("one")
|
|
shell.CloneIntoRemote("origin")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Branches().
|
|
Focus().
|
|
Press(keys.Universal.NextScreenMode). // we need to enlargen the window to see the upstream
|
|
Lines(
|
|
Contains("master").DoesNotContain("origin master").IsSelected(),
|
|
).
|
|
Press(keys.Branches.SetUpstream).
|
|
Tap(func() {
|
|
t.ExpectPopup().Menu().
|
|
Title(Equals("Upstream options")).
|
|
Select(Contains(" Set upstream of selected branch")). // using leading space to disambiguate from the 'reset' option
|
|
Confirm()
|
|
|
|
t.ExpectPopup().Prompt().
|
|
Title(Equals("Enter upstream as '<remote> <branchname>'")).
|
|
SuggestionLines(Equals("origin master")).
|
|
ConfirmFirstSuggestion()
|
|
}).
|
|
Lines(
|
|
Contains("master").Contains("origin master").IsSelected(),
|
|
)
|
|
},
|
|
})
|