mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-10-30 23:57:43 +02:00
34 lines
950 B
Go
34 lines
950 B
Go
package interactive_rebase
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var SwapWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Directly swap two commits, causing a conflict. Then resolve the conflict and continue",
|
|
ExtraCmdArgs: "",
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.CreateFileAndAdd("myfile", "one")
|
|
shell.Commit("commit one")
|
|
shell.UpdateFileAndAdd("myfile", "two")
|
|
shell.Commit("commit two")
|
|
shell.UpdateFileAndAdd("myfile", "three")
|
|
shell.Commit("commit three")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Commits().
|
|
Focus().
|
|
Lines(
|
|
Contains("commit three").IsSelected(),
|
|
Contains("commit two"),
|
|
Contains("commit one"),
|
|
).
|
|
Press(keys.Commits.MoveDownCommit)
|
|
|
|
handleConflictsFromSwap(t)
|
|
},
|
|
})
|