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

68 lines
1.9 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
},
Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) {
2022-12-26 07:49:54 +02:00
input.SwitchToBranchesView()
2022-08-22 12:43:19 +02:00
2022-12-27 06:07:11 +02:00
assert.Views().ByName("localBranches").Lines(
2022-12-25 02:38:00 +02:00
Contains("first-change-branch"),
Contains("second-change-branch"),
Contains("original-branch"),
)
2022-12-27 06:07:11 +02:00
assert.Views().ByName("commits").TopLines(
2022-12-25 02:38:00 +02:00
Contains("first change"),
Contains("original"),
)
2022-08-22 12:43:19 +02:00
input.NextItem()
input.Press(keys.Branches.RebaseBranch)
2022-08-22 12:43:19 +02:00
2022-12-27 02:21:44 +02:00
input.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-27 02:21:44 +02:00
input.Confirmation().
Title(Equals("Auto-merge failed")).
Content(Contains("Conflicts!")).
Confirm()
2022-08-22 12:43:19 +02:00
2022-12-27 06:07:11 +02:00
assert.Views().Current().Name("files").SelectedLine(Contains("file"))
2022-08-22 12:43:19 +02:00
// not using Confirm() convenience method because I suspect we might change this
// keybinding to something more bespoke
input.Press(keys.Universal.Confirm)
2022-08-22 12:43:19 +02:00
2022-12-27 06:07:11 +02:00
assert.Views().Current().Name("mergeConflicts")
2022-08-22 12:43:19 +02:00
input.PrimaryAction()
2022-12-27 06:07:11 +02:00
assert.Views().ByName("information").Content(Contains("rebasing"))
2022-12-27 02:21:44 +02:00
input.Confirmation().
Title(Equals("continue")).
Content(Contains("all merge conflicts resolved. Continue?")).
Confirm()
2022-12-27 06:07:11 +02:00
assert.Views().ByName("information").Content(DoesNotContain("rebasing"))
2022-08-22 12:43:19 +02:00
2022-12-27 06:07:11 +02:00
assert.Views().ByName("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
},
})