mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-05-12 04:45:47 +02:00
67 lines
1.7 KiB
Go
67 lines
1.7 KiB
Go
package branch
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
"github.com/jesseduffield/lazygit/pkg/integration/tests/shared"
|
|
)
|
|
|
|
var Rebase = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Rebase onto another branch, deal with the conflicts.",
|
|
ExtraCmdArgs: "",
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
shared.MergeConflictsSetup(shell)
|
|
},
|
|
Run: func(shell *Shell, input *Input, keys config.KeybindingConfig) {
|
|
input.Views().Commits().TopLines(
|
|
Contains("first change"),
|
|
Contains("original"),
|
|
)
|
|
|
|
input.Views().Branches().
|
|
Focus().
|
|
Lines(
|
|
Contains("first-change-branch"),
|
|
Contains("second-change-branch"),
|
|
Contains("original-branch"),
|
|
).
|
|
SelectNextItem().
|
|
Press(keys.Branches.RebaseBranch)
|
|
|
|
input.ExpectConfirmation().
|
|
Title(Equals("Rebasing")).
|
|
Content(Contains("Are you sure you want to rebase 'first-change-branch' on top of 'second-change-branch'?")).
|
|
Confirm()
|
|
|
|
input.ExpectConfirmation().
|
|
Title(Equals("Auto-merge failed")).
|
|
Content(Contains("Conflicts!")).
|
|
Confirm()
|
|
|
|
input.Views().Files().
|
|
IsFocused().
|
|
SelectedLine(Contains("file")).
|
|
PressEnter()
|
|
|
|
input.Views().MergeConflicts().
|
|
IsFocused().
|
|
PressPrimaryAction()
|
|
|
|
input.Views().Information().Content(Contains("rebasing"))
|
|
|
|
input.ExpectConfirmation().
|
|
Title(Equals("continue")).
|
|
Content(Contains("all merge conflicts resolved. Continue?")).
|
|
Confirm()
|
|
|
|
input.Views().Information().Content(DoesNotContain("rebasing"))
|
|
|
|
input.Views().Commits().TopLines(
|
|
Contains("second-change-branch unrelated change"),
|
|
Contains("second change"),
|
|
Contains("original"),
|
|
)
|
|
},
|
|
})
|