mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-04-25 12:24:47 +02:00
19d0048cc4
Use Equals instead of Contains for asserting the status view content. This
solves the problem that we might assert Contains("↓2 repo"), but what it really
shows is "↑1↓2 repo", and the test still succeeds. At best this is confusing.
Also, this way we don't have to use the awkward DoesNotContain to check that it
really doesn't show a checkmark.
To do this, we need to fix two whitespace problems:
- there was always a space at the end for no reason. Simply remove it. It was
added in efb51eee96, but from looking at that diff it seems it was added
accidentally.
- there was a space at the beginning if the branch status was empty. This is
actually a cosmetic problem, for branches without a status the text was
indented by once space. Change this so that the space is added conditionally.
It's a bit awkward that we have to use Decolorise here, but this will go away
again later in this branch.
99 lines
2.2 KiB
Go
99 lines
2.2 KiB
Go
package sync
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var PullRebaseInteractiveConflict = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Pull with an interactive rebase strategy, where a conflict occurs",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.CreateFileAndAdd("file", "content1")
|
|
shell.Commit("one")
|
|
shell.UpdateFileAndAdd("file", "content2")
|
|
shell.Commit("two")
|
|
shell.CreateFileAndAdd("file3", "content3")
|
|
shell.Commit("three")
|
|
|
|
shell.CloneIntoRemote("origin")
|
|
|
|
shell.SetBranchUpstream("master", "origin/master")
|
|
|
|
shell.HardReset("HEAD^^")
|
|
shell.UpdateFileAndAdd("file", "content4")
|
|
shell.Commit("four")
|
|
shell.CreateFileAndAdd("file5", "content5")
|
|
shell.Commit("five")
|
|
|
|
shell.SetConfig("pull.rebase", "interactive")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Commits().
|
|
Lines(
|
|
Contains("five"),
|
|
Contains("four"),
|
|
Contains("one"),
|
|
)
|
|
|
|
t.Views().Status().Content(Equals("↑2↓2 repo → master"))
|
|
|
|
t.Views().Files().
|
|
IsFocused().
|
|
Press(keys.Universal.Pull)
|
|
|
|
t.Common().AcknowledgeConflicts()
|
|
|
|
t.Views().Commits().
|
|
Lines(
|
|
Contains("pick").Contains("five"),
|
|
Contains("conflict").Contains("YOU ARE HERE").Contains("four"),
|
|
Contains("three"),
|
|
Contains("two"),
|
|
Contains("one"),
|
|
)
|
|
|
|
t.Views().Files().
|
|
IsFocused().
|
|
Lines(
|
|
Contains("UU").Contains("file"),
|
|
).
|
|
PressEnter()
|
|
|
|
t.Views().MergeConflicts().
|
|
IsFocused().
|
|
TopLines(
|
|
Contains("<<<<<<< HEAD"),
|
|
Contains("content2"),
|
|
Contains("======="),
|
|
Contains("content4"),
|
|
Contains(">>>>>>>"),
|
|
).
|
|
SelectNextItem().
|
|
PressPrimaryAction() // choose 'content4'
|
|
|
|
t.Common().ContinueOnConflictsResolved()
|
|
|
|
t.Views().Status().Content(Equals("↑2 repo → master"))
|
|
|
|
t.Views().Commits().
|
|
Focus().
|
|
Lines(
|
|
Contains("five").IsSelected(),
|
|
Contains("four"),
|
|
Contains("three"),
|
|
Contains("two"),
|
|
Contains("one"),
|
|
).
|
|
SelectNextItem()
|
|
|
|
t.Views().Main().
|
|
Content(
|
|
Contains("-content2").
|
|
Contains("+content4"),
|
|
)
|
|
},
|
|
})
|