mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-06-04 23:37:41 +02:00
74054c9d70
Now that we have sections, it is no longer needed. Keep the "<-- CONFLICTS" marker though.
58 lines
1.4 KiB
Go
58 lines
1.4 KiB
Go
package interactive_rebase
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var EditAndAutoAmend = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Edit a commit, make a change and stage it, then continue the rebase to auto-amend the commit",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.
|
|
CreateNCommits(3)
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Commits().
|
|
Focus().
|
|
Lines(
|
|
Contains("commit 03"),
|
|
Contains("commit 02"),
|
|
Contains("commit 01"),
|
|
).
|
|
NavigateToLine(Contains("commit 02")).
|
|
Press(keys.Universal.Edit).
|
|
Lines(
|
|
Contains("--- Pending rebase todos ---"),
|
|
Contains("commit 03"),
|
|
Contains("--- Commits ---"),
|
|
Contains("commit 02").IsSelected(),
|
|
Contains("commit 01"),
|
|
)
|
|
|
|
t.Shell().CreateFile("fixup-file", "fixup content")
|
|
t.Views().Files().
|
|
Focus().
|
|
Press(keys.Files.RefreshFiles).
|
|
Lines(
|
|
Contains("??").Contains("fixup-file").IsSelected(),
|
|
).
|
|
PressPrimaryAction()
|
|
|
|
t.Common().ContinueRebase()
|
|
|
|
t.Views().Commits().
|
|
Focus().
|
|
Lines(
|
|
Contains("commit 03"),
|
|
Contains("commit 02").IsSelected(),
|
|
Contains("commit 01"),
|
|
)
|
|
|
|
t.Views().Main().
|
|
Content(Contains("fixup content"))
|
|
},
|
|
})
|