1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-12-12 11:15:00 +02:00
lazygit/pkg/integration/tests/branch/rebase.go

68 lines
1.7 KiB
Go
Raw Normal View History

2022-08-22 12:43:19 +02:00
package branch
import (
"github.com/jesseduffield/lazygit/pkg/config"
. "github.com/jesseduffield/lazygit/pkg/integration/components"
"github.com/jesseduffield/lazygit/pkg/integration/tests/shared"
2022-08-22 12:43:19 +02:00
)
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)
2022-08-22 12:43:19 +02:00
},
2022-12-27 12:47:37 +02:00
Run: func(t *TestDriver, keys config.KeybindingConfig) {
2022-12-27 12:35:36 +02:00
t.Views().Commits().TopLines(
2022-12-25 02:38:00 +02:00
Contains("first change"),
Contains("original"),
)
2022-12-27 12:35:36 +02:00
t.Views().Branches().
Focus().
Lines(
Contains("first-change-branch"),
Contains("second-change-branch"),
Contains("original-branch"),
).
SelectNextItem().
Press(keys.Branches.RebaseBranch)
2022-08-22 12:43:19 +02:00
2022-12-28 02:00:22 +02:00
t.ExpectPopup().Confirmation().
Title(Equals("Rebasing")).
Content(Contains("Are you sure you want to rebase 'first-change-branch' on top of 'second-change-branch'?")).
Confirm()
2022-12-28 02:00:22 +02:00
t.ExpectPopup().Confirmation().
Title(Equals("Auto-merge failed")).
Content(Contains("Conflicts!")).
Confirm()
2022-08-22 12:43:19 +02:00
2022-12-27 12:35:36 +02:00
t.Views().Files().
IsFocused().
SelectedLine(Contains("file")).
PressEnter()
2022-08-22 12:43:19 +02:00
2022-12-27 12:35:36 +02:00
t.Views().MergeConflicts().
IsFocused().
PressPrimaryAction()
2022-08-22 12:43:19 +02:00
2022-12-27 12:35:36 +02:00
t.Views().Information().Content(Contains("rebasing"))
2022-12-28 02:00:22 +02:00
t.ExpectPopup().Confirmation().
Title(Equals("continue")).
Content(Contains("all merge conflicts resolved. Continue?")).
Confirm()
2022-12-27 12:35:36 +02:00
t.Views().Information().Content(DoesNotContain("rebasing"))
2022-08-22 12:43:19 +02:00
2022-12-27 12:35:36 +02:00
t.Views().Commits().TopLines(
2022-12-25 02:38:00 +02:00
Contains("second-change-branch unrelated change"),
Contains("second change"),
Contains("original"),
)
2022-08-22 12:43:19 +02:00
},
})