mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-14 09:36:24 -04:00
31cbabe48f
I'm not a skilled UI designer, so I suspect there may be even better options, but it's definitely already better than the raw ASCII "---" we had before. Put the line only at the beginning because it looks bad if the line after the label is misaligned when labels don't have the same width (e.g. "Remote" vs. "Local" in the divergence view).
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"))
|
|
},
|
|
})
|