mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-05-11 04:15:48 +02:00
74054c9d70
Now that we have sections, it is no longer needed. Keep the "<-- CONFLICTS" marker though.
51 lines
1.6 KiB
Go
51 lines
1.6 KiB
Go
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("--- Pending rebase todos ---"),
|
|
Contains("pick").Contains("three"),
|
|
Contains("pick").Contains("two"),
|
|
Contains("--- Commits ---"),
|
|
Contains("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("--- Pending rebase todos ---"),
|
|
Contains("pick").Contains("three"),
|
|
Contains("--- Commits ---"),
|
|
Contains("two"),
|
|
Contains("one"),
|
|
)
|
|
},
|
|
})
|