diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2023-02-26 12:56:08 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2023-02-26 13:01:51 +1100 |
| commit | 45d45d2397f16b3b99596a1ce4b32890c51ec42f (patch) | |
| tree | 62ac51f4702e01cc30c487779414a45d14e960b0 /pkg/integration | |
| parent | f7e8b2dd7194ef32f6644481c974602bd8059c9c (diff) | |
show file tree by default in integration tests
Diffstat (limited to 'pkg/integration')
4 files changed, 6 insertions, 12 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) { |