1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-03-17 21:18:31 +02:00

Add test for a pick that fails and gets rescheduled

This test is interesting because it already behaves as desired: since git has
rescheduled the "pick" command, we do _not_ want to show a "conflict" entry in
this case, as we would see the same commit twice then.
This commit is contained in:
Stefan Haller 2023-03-08 21:24:48 +01:00
parent 3d76c734aa
commit ba160cb5db
2 changed files with 48 additions and 0 deletions

View File

@ -0,0 +1,47 @@
package interactive_rebase
import (
"github.com/jesseduffield/lazygit/pkg/config"
. "github.com/jesseduffield/lazygit/pkg/integration/components"
)
var PickRescheduled = NewIntegrationTest(NewIntegrationTestArgs{
Description: "Makes a pick during a rebase fail because it would overwrite an untracked file",
ExtraCmdArgs: []string{},
Skip: false,
SetupConfig: func(config *config.AppConfig) {},
SetupRepo: func(shell *Shell) {
shell.CreateFileAndAdd("file1", "1\n").Commit("one")
shell.UpdateFileAndAdd("file2", "2\n").Commit("two")
shell.UpdateFileAndAdd("file3", "3\n").Commit("three")
},
Run: func(t *TestDriver, keys config.KeybindingConfig) {
t.Views().Commits().
Focus().
Lines(
Contains("three").IsSelected(),
Contains("two"),
Contains("one"),
).
NavigateToLine(Contains("one")).
Press(keys.Universal.Edit).
Lines(
Contains("pick").Contains("three"),
Contains("pick").Contains("two"),
Contains("<-- YOU ARE HERE --- one").IsSelected(),
).
Tap(func() {
t.Shell().CreateFile("file3", "other content\n")
t.Common().ContinueRebase()
t.ExpectPopup().Alert().Title(Equals("Error")).
Content(Contains("The following untracked working tree files would be overwritten by merge").
Contains("Please move or remove them before you merge.")).
Confirm()
}).
Lines(
Contains("pick").Contains("three"),
Contains("<-- YOU ARE HERE --- two"),
Contains("one"),
)
},
})

View File

@ -109,6 +109,7 @@ var tests = []*components.IntegrationTest{
interactive_rebase.FixupSecondCommit,
interactive_rebase.Move,
interactive_rebase.MoveInRebase,
interactive_rebase.PickRescheduled,
interactive_rebase.Rebase,
interactive_rebase.RewordFirstCommit,
interactive_rebase.RewordLastCommit,