ComputerSurge/lazygit
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch 'master' into stash-untracked-changes

Browse Source
This commit is contained in:
Andrew Hynes
2022-11-01 16:08:34 -02:30
committed by GitHub
parent 69040f094d c4e71356bb
commit a47e72892a
138 changed files with 17323 additions and 1069 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
pkg/integration/tests/stash/rename.go Normal file
View File

@@ -0,0 +1,37 @@
package stash
import (
"github.com/jesseduffield/lazygit/pkg/config"
. "github.com/jesseduffield/lazygit/pkg/integration/components"
)
var Rename = NewIntegrationTest(NewIntegrationTestArgs{
Description: "Try to rename the stash.",
ExtraCmdArgs: "",
Skip: false,
SetupConfig: func(config *config.AppConfig) {},
SetupRepo: func(shell *Shell) {
shell.
EmptyCommit("blah").
CreateFileAndAdd("file-1", "change to stash1").
StashWithMessage("foo").
CreateFileAndAdd("file-2", "change to stash2").
StashWithMessage("bar")
},
Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) {
input.SwitchToStashWindow()
assert.CurrentViewName("stash")
assert.MatchSelectedLine(Equals("On master: bar"))
input.NextItem()
assert.MatchSelectedLine(Equals("On master: foo"))
input.PressKeys(keys.Stash.RenameStash)
assert.InPrompt()
assert.MatchCurrentViewTitle(Equals("Rename stash: stash@{1}"))
input.Type(" baz")
input.Confirm()
assert.MatchSelectedLine(Equals("On master: foo baz"))
},
})

4
pkg/integration/tests/tests.go
View File

@@ -8,6 +8,7 @@ import (
"github.com/jesseduffield/generics/set"
"github.com/jesseduffield/generics/slices"
"github.com/jesseduffield/lazycore/pkg/utils"
"github.com/jesseduffield/lazygit/pkg/integration/components"
"github.com/jesseduffield/lazygit/pkg/integration/tests/bisect"
"github.com/jesseduffield/lazygit/pkg/integration/tests/branch"
@@ -41,6 +42,7 @@ var tests = []*components.IntegrationTest{
custom_commands.FormPrompts,
stash.Stash,
stash.StashIncludingUntrackedFiles,
stash.Rename,
}
func GetTests() []*components.IntegrationTest {
@@ -56,7 +58,7 @@ func GetTests() []*components.IntegrationTest {
missingTestNames := []string{}
if err := filepath.Walk(filepath.Join(utils.GetLazygitRootDirectory(), "pkg/integration/tests"), func(path string, info os.FileInfo, err error) error {
if err := filepath.Walk(filepath.Join(utils.GetLazyRootDirectory(), "pkg/integration/tests"), func(path string, info os.FileInfo, err error) error {
if !info.IsDir() && strings.HasSuffix(path, ".go") {
// ignoring this current file
if filepath.Base(path) == "tests.go" {