mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-03-03 15:02:52 +02:00
Extend test to expect what commits we want to be listed when there's a conflict
This commit is contained in:
parent
41b00c8313
commit
cddf056f4d
@ -7,6 +7,13 @@ import (
|
|||||||
func handleConflictsFromSwap(t *TestDriver) {
|
func handleConflictsFromSwap(t *TestDriver) {
|
||||||
t.Common().AcknowledgeConflicts()
|
t.Common().AcknowledgeConflicts()
|
||||||
|
|
||||||
|
t.Views().Commits().
|
||||||
|
Lines(
|
||||||
|
Contains("pick").Contains("commit two"),
|
||||||
|
// Would be nice to see "three" here, it's the one that conflicted
|
||||||
|
Contains("<-- YOU ARE HERE --- commit one"),
|
||||||
|
)
|
||||||
|
|
||||||
t.Views().Files().
|
t.Views().Files().
|
||||||
IsFocused().
|
IsFocused().
|
||||||
Lines(
|
Lines(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user