go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-08-06 22:33:07 +02:00
Code Issues Releases Activity

Fix more unstable tests (#4721)

Browse Source 
Similar to what was done in 457cdce61d, and for the same reason.
This commit is contained in:
Stefan Haller
2025-07-10 09:02:41 +02:00
committed by GitHub
parent 656cb3203c bf19475733
commit c2aab81f54
7 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,9 @@ var Checkout = NewIntegrationTest(NewIntegrationTestArgs{
Description: "Checkout a commit as a detached head, or checkout an existing branch at a commit", Description: "Checkout a commit as a detached head, or checkout an existing branch at a commit",
ExtraCmdArgs: []string{}, ExtraCmdArgs: []string{},
Skip: false, Skip: false,
SetupConfig: func(config *config.AppConfig) {}, SetupConfig: func(config *config.AppConfig) {
config.GetUserConfig().Git.LocalBranchSortOrder = "alphabetical"
},
SetupRepo: func(shell *Shell) { SetupRepo: func(shell *Shell) {
shell.EmptyCommit("one") shell.EmptyCommit("one")
shell.EmptyCommit("two") shell.EmptyCommit("two")

2
pkg/integration/tests/custom_commands/suggestions_command.go
View File

@ -37,6 +37,8 @@ var SuggestionsCommand = NewIntegrationTest(NewIntegrationTestArgs{
}, },
}, },
} }
cfg.GetUserConfig().Git.LocalBranchSortOrder = "alphabetical"
}, },
Run: func(t *TestDriver, keys config.KeybindingConfig) { Run: func(t *TestDriver, keys config.KeybindingConfig) {
t.Views().Branches(). t.Views().Branches().

2
pkg/integration/tests/custom_commands/suggestions_preset.go
View File

@ -37,6 +37,8 @@ var SuggestionsPreset = NewIntegrationTest(NewIntegrationTestArgs{
}, },
}, },
} }
cfg.GetUserConfig().Git.LocalBranchSortOrder = "alphabetical"
}, },
Run: func(t *TestDriver, keys config.KeybindingConfig) { Run: func(t *TestDriver, keys config.KeybindingConfig) {
t.Views().Branches(). t.Views().Branches().

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

@ -9,7 +9,9 @@ var NestedFilter = NewIntegrationTest(NewIntegrationTestArgs{
Description: "Filter in the several nested panels and verify the filters are preserved as you escape back to the surface", Description: "Filter in the several nested panels and verify the filters are preserved as you escape back to the surface",
ExtraCmdArgs: []string{}, ExtraCmdArgs: []string{},
Skip: false, Skip: false,
SetupConfig: func(config *config.AppConfig) {}, SetupConfig: func(config *config.AppConfig) {
config.GetUserConfig().Git.LocalBranchSortOrder = "alphabetical"
},
SetupRepo: func(shell *Shell) { SetupRepo: func(shell *Shell) {
// need to create some branches, each with their own commits // need to create some branches, each with their own commits
shell.NewBranch("branch-gold") shell.NewBranch("branch-gold")

1
pkg/integration/tests/sync/fetch_and_auto_forward_branches_all_branches.go
View File

@ -11,6 +11,7 @@ var FetchAndAutoForwardBranchesAllBranches = NewIntegrationTest(NewIntegrationTe
Skip: false, Skip: false,
SetupConfig: func(config *config.AppConfig) { SetupConfig: func(config *config.AppConfig) {
config.GetUserConfig().Git.AutoForwardBranches = "allBranches" config.GetUserConfig().Git.AutoForwardBranches = "allBranches"
config.GetUserConfig().Git.LocalBranchSortOrder = "alphabetical"
}, },
SetupRepo: func(shell *Shell) { SetupRepo: func(shell *Shell) {
shell.CreateNCommits(3) shell.CreateNCommits(3)

1
pkg/integration/tests/sync/fetch_and_auto_forward_branches_none.go
View File

@ -11,6 +11,7 @@ var FetchAndAutoForwardBranchesNone = NewIntegrationTest(NewIntegrationTestArgs{
Skip: false, Skip: false,
SetupConfig: func(config *config.AppConfig) { SetupConfig: func(config *config.AppConfig) {
config.GetUserConfig().Git.AutoForwardBranches = "none" config.GetUserConfig().Git.AutoForwardBranches = "none"
config.GetUserConfig().Git.LocalBranchSortOrder = "alphabetical"
}, },
SetupRepo: func(shell *Shell) { SetupRepo: func(shell *Shell) {
shell.CreateNCommits(3) shell.CreateNCommits(3)

1
pkg/integration/tests/sync/fetch_and_auto_forward_branches_only_main_branches.go
View File

@ -11,6 +11,7 @@ var FetchAndAutoForwardBranchesOnlyMainBranches = NewIntegrationTest(NewIntegrat
Skip: false, Skip: false,
SetupConfig: func(config *config.AppConfig) { SetupConfig: func(config *config.AppConfig) {
config.GetUserConfig().Git.AutoForwardBranches = "onlyMainBranches" config.GetUserConfig().Git.AutoForwardBranches = "onlyMainBranches"
config.GetUserConfig().Git.LocalBranchSortOrder = "alphabetical"
}, },
SetupRepo: func(shell *Shell) { SetupRepo: func(shell *Shell) {
shell.CreateNCommits(3) shell.CreateNCommits(3)