mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-07-05 00:59:19 +02:00
265557afa2
Pretty basic fix, didn't seem to have any complications. I only added the refs/ prefix to the FullRefName() method to align with other similar methods, and to make this change not impact any user facing modals. Fixes: https://github.com/jesseduffield/lazygit/issues/4634 Also adds a test demonstrating that the stash show behavior is now fixed
44 lines
1.0 KiB
Go
44 lines
1.0 KiB
Go
package stash
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var ShowWithBranchNamedStash = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "View stash when there is a branch also named 'stash'",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.EmptyCommit("initial commit")
|
|
shell.CreateFile("file", "content")
|
|
shell.GitAddAll()
|
|
|
|
shell.NewBranch("stash")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Stash().
|
|
IsEmpty()
|
|
|
|
t.Views().Files().
|
|
Lines(
|
|
Contains("file"),
|
|
).
|
|
Press(keys.Files.StashAllChanges)
|
|
|
|
t.ExpectPopup().Prompt().Title(Equals("Stash changes")).Type("my stashed file").Confirm()
|
|
|
|
t.Views().Stash().
|
|
Lines(
|
|
MatchesRegexp(`\ds .* my stashed file`),
|
|
)
|
|
|
|
t.Views().Files().
|
|
IsEmpty()
|
|
|
|
t.Views().Stash().Focus()
|
|
t.Views().Main().ContainsLines(Equals(" file | 1 +"))
|
|
},
|
|
})
|