Fix more unstable tests (#4721)

Similar to what was done in 457cdce, and for the same reason.

Author: stefanhaller

pkg/integration/tests/commit/checkout.go

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

pkg/integration/tests/custom_commands/suggestions_command.go

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

pkg/integration/tests/custom_commands/suggestions_preset.go

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

pkg/integration/tests/filter_and_search/nested_filter.go

@@ -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",
 	ExtraCmdArgs: []string{},
 	Skip:         false,
-	SetupConfig:  func(config *config.AppConfig) {},
+	SetupConfig: func(config *config.AppConfig) {
+		config.GetUserConfig().Git.LocalBranchSortOrder = "alphabetical"
+	},
 	SetupRepo: func(shell *Shell) {
 		// need to create some branches, each with their own commits
 		shell.NewBranch("branch-gold")

pkg/integration/tests/sync/fetch_and_auto_forward_branches_all_branches.go

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

pkg/integration/tests/sync/fetch_and_auto_forward_branches_none.go

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

pkg/integration/tests/sync/fetch_and_auto_forward_branches_only_main_branches.go

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