diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2023-07-17 17:29:24 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2023-07-30 18:35:23 +1000 |
| commit | ca6f9c4155c826ac2feb7a2a37d6953dcb94bb10 (patch) | |
| tree | 91038cde13c9169df013a67457c3c4cdac317a25 /pkg/integration | |
| parent | 7569180cacf0410ed69ea9c28051c9c168245540 (diff) | |
Fix tests
Going and fixing up some submodule tests which were broken by bad assumptions with worktree code
Diffstat (limited to 'pkg/integration')
| -rw-r--r-- | pkg/integration/components/view_driver.go | 2 | ||||
| -rw-r--r-- | pkg/integration/tests/ui/switch_tab_from_menu.go | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkg/integration/components/view_driver.go b/pkg/integration/components/view_driver.go index d3216bb91..8c2624dec 100644 --- a/pkg/integration/components/view_driver.go +++ b/pkg/integration/components/view_driver.go @@ -330,7 +330,7 @@ func (self *ViewDriver) Focus() *ViewDriver { } windows := []window{ {name: "status", viewNames: []string{"status"}}, - {name: "files", viewNames: []string{"files", "submodules"}}, + {name: "files", viewNames: []string{"files", "worktrees", "submodules"}}, {name: "branches", viewNames: []string{"localBranches", "remotes", "tags"}}, {name: "commits", viewNames: []string{"commits", "reflogCommits"}}, {name: "stash", viewNames: []string{"stash"}}, diff --git a/pkg/integration/tests/ui/switch_tab_from_menu.go b/pkg/integration/tests/ui/switch_tab_from_menu.go index 26219f422..e74d76017 100644 --- a/pkg/integration/tests/ui/switch_tab_from_menu.go +++ b/pkg/integration/tests/ui/switch_tab_from_menu.go @@ -17,7 +17,9 @@ var SwitchTabFromMenu = NewIntegrationTest(NewIntegrationTestArgs{ Press(keys.Universal.OptionMenuAlt1) t.ExpectPopup().Menu().Title(Equals("Keybindings")). - Select(Contains("Next tab")). + // Looping back around to the end to side-step the worktrees view which is + // only present on recent git versions + Select(Contains("Previous tab")). Confirm() t.Views().Submodules().IsFocused() |