From 45d45d2397f16b3b99596a1ce4b32890c51ec42f Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Sun, 26 Feb 2023 12:56:08 +1100
Subject: [PATCH] show file tree by default in integration tests

---
 pkg/integration/tests/file/dir_with_untracked_file.go | 4 +---
 pkg/integration/tests/file/discard_staged_changes.go  | 6 +++---
 pkg/integration/tests/sync/fetch_prune.go             | 4 +---
 pkg/integration/tests/ui/switch_tab_from_menu.go      | 4 +---
 test/default_test_config/config.yml                   | 2 --
 5 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/pkg/integration/tests/file/dir_with_untracked_file.go b/pkg/integration/tests/file/dir_with_untracked_file.go
index 39da6e157..3b45e634c 100644
--- a/pkg/integration/tests/file/dir_with_untracked_file.go
+++ b/pkg/integration/tests/file/dir_with_untracked_file.go
@@ -10,9 +10,7 @@ var DirWithUntrackedFile = NewIntegrationTest(NewIntegrationTestArgs{
 	Description:  "When selecting a directory that contains an untracked file, we should not get an error",
 	ExtraCmdArgs: "",
 	Skip:         false,
-	SetupConfig: func(config *config.AppConfig) {
-		config.UserConfig.Gui.ShowFileTree = true
-	},
+	SetupConfig:  func(config *config.AppConfig) {},
 	SetupRepo: func(shell *Shell) {
 		shell.CreateDir("dir")
 		shell.CreateFile("dir/file", "foo")
diff --git a/pkg/integration/tests/file/discard_staged_changes.go b/pkg/integration/tests/file/discard_staged_changes.go
index 728df8898..9b40ee72d 100644
--- a/pkg/integration/tests/file/discard_staged_changes.go
+++ b/pkg/integration/tests/file/discard_staged_changes.go
@@ -25,15 +25,15 @@ var DiscardStagedChanges = NewIntegrationTest(NewIntegrationTestArgs{
 			IsFocused().
 			Lines(
 				Contains(` M file2`).IsSelected(),
-				Contains(` M fileToRemove`),
 				Contains(`?? file3`),
+				Contains(` M fileToRemove`),
 			).
-			SelectNextItem().
+			NavigateToLine(Contains(`fileToRemove`)).
 			PressPrimaryAction().
 			Lines(
 				Contains(` M file2`),
-				Contains(`M  fileToRemove`).IsSelected(),
 				Contains(`?? file3`),
+				Contains(`M  fileToRemove`).IsSelected(),
 			).
 			Press(keys.Files.ViewResetOptions)
 
diff --git a/pkg/integration/tests/sync/fetch_prune.go b/pkg/integration/tests/sync/fetch_prune.go
index 765a4ad36..c650947c1 100644
--- a/pkg/integration/tests/sync/fetch_prune.go
+++ b/pkg/integration/tests/sync/fetch_prune.go
@@ -9,9 +9,7 @@ var FetchPrune = NewIntegrationTest(NewIntegrationTestArgs{
 	Description:  "Fetch from the remote with the 'prune' option set in the git config",
 	ExtraCmdArgs: "",
 	Skip:         false,
-	SetupConfig: func(config *config.AppConfig) {
-		config.UserConfig.Git.AutoFetch = false
-	},
+	SetupConfig:  func(config *config.AppConfig) {},
 	SetupRepo: func(shell *Shell) {
 		// This option makes it so that git checks for deleted branches in the remote
 		// upon fetching.
diff --git a/pkg/integration/tests/ui/switch_tab_from_menu.go b/pkg/integration/tests/ui/switch_tab_from_menu.go
index 0a5b56c23..1a9067a28 100644
--- a/pkg/integration/tests/ui/switch_tab_from_menu.go
+++ b/pkg/integration/tests/ui/switch_tab_from_menu.go
@@ -9,9 +9,7 @@ var SwitchTabFromMenu = NewIntegrationTest(NewIntegrationTestArgs{
 	Description:  "Switch tab via the options menu",
 	ExtraCmdArgs: "",
 	Skip:         false,
-	SetupConfig: func(config *config.AppConfig) {
-		config.UserConfig.Git.AutoFetch = false
-	},
+	SetupConfig:  func(config *config.AppConfig) {},
 	SetupRepo: func(shell *Shell) {
 	},
 	Run: func(t *TestDriver, keys config.KeybindingConfig) {
diff --git a/test/default_test_config/config.yml b/test/default_test_config/config.yml
index 77a9ad237..36df9937b 100644
--- a/test/default_test_config/config.yml
+++ b/test/default_test_config/config.yml
@@ -8,8 +8,6 @@ gui:
     - bold
     SelectedRangeBgcolor:
     - reverse
-  # TODO: we should update most tests to use a file tree now that it's the default
-  showFileTree: false
 git:
   # We don't want to run any periodic background git commands because it'll introduce race conditions and flakiness.
   # If we need to refresh something from within the test (which should only really happen if we've invoked a