mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-10 07:36:27 -04:00
31cbabe48f
I'm not a skilled UI designer, so I suspect there may be even better options, but it's definitely already better than the raw ASCII "---" we had before. Put the line only at the beginning because it looks bad if the line after the label is misaligned when labels don't have the same width (e.g. "Remote" vs. "Local" in the divergence view).
47 lines
1.4 KiB
Go
47 lines
1.4 KiB
Go
package interactive_rebase
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var EditTheConflCommit = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Swap two commits, causing a conflict; then try to interact with the 'confl' commit, which results in an error.",
|
|
ExtraCmdArgs: []string{},
|
|
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).
|
|
Tap(func() {
|
|
t.Common().AcknowledgeConflicts()
|
|
}).
|
|
Focus().
|
|
Lines(
|
|
Contains("─── Pending rebase todos"),
|
|
Contains("pick").Contains("commit two"),
|
|
Contains("pick").Contains("<-- CONFLICT --- commit three"),
|
|
Contains("─── Commits"),
|
|
Contains("commit one"),
|
|
).
|
|
NavigateToLine(Contains("<-- CONFLICT --- commit three")).
|
|
Press(keys.Commits.RenameCommit)
|
|
|
|
t.ExpectToast(Contains("Disabled: Rewording commits while interactively rebasing is not currently supported"))
|
|
},
|
|
})
|