mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-08-28 02:24:49 -05:00
Stefan Haller
02be5e74ed
This guards against regressions from the changes that follow. We're about to add a mechanism that keeps the selection anchored by commit hash, but we need to make sure that it doesn't take effect here; after a merge we want to select the newly added merge commit. In the current state of the code this happens to work because we keep the selection index the same, which happened to be 0 here; later we will change this to explicitly select the head commit after the merge.
54 lines
1.2 KiB
Go
54 lines
1.2 KiB
Go
package sync
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var PullMerge = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Pull with a merge strategy",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.CreateFileAndAdd("file", "content1")
|
|
shell.Commit("one")
|
|
shell.UpdateFileAndAdd("file", "content2")
|
|
shell.Commit("two")
|
|
shell.EmptyCommit("three")
|
|
|
|
shell.CloneIntoRemote("origin")
|
|
|
|
shell.SetBranchUpstream("master", "origin/master")
|
|
|
|
shell.HardReset("HEAD^^")
|
|
shell.EmptyCommit("four")
|
|
|
|
shell.SetConfig("pull.rebase", "false")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Commits().
|
|
Lines(
|
|
Contains("four").IsSelected(),
|
|
Contains("one"),
|
|
)
|
|
|
|
t.Views().Status().Content(Equals("↓2↑1 repo → master"))
|
|
|
|
t.Views().Files().
|
|
IsFocused().
|
|
Press(keys.Universal.Pull)
|
|
|
|
t.Views().Status().Content(Equals("↑2 repo → master"))
|
|
|
|
t.Views().Commits().
|
|
Lines(
|
|
Contains("Merge branch 'master' of ../origin").IsSelected(),
|
|
Contains("three"),
|
|
Contains("two"),
|
|
Contains("four"),
|
|
Contains("one"),
|
|
)
|
|
},
|
|
})
|