summaryrefslogtreecommitdiffstats
path: root/pkg/integration
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2023-07-29 13:31:12 +1000
committerJesse Duffield <jessedduffield@gmail.com>2023-07-30 18:35:24 +1000
commita1fae4105116775b5c4a0c9c3b01fa822b29cfac (patch)
tree0d6801813470ff50ff1a5f2a462b1ed993d47112 /pkg/integration
parentb16bb409fcd970ac385c7520e7a40f49e069e981 (diff)
Fix bug where worktree view would take over window upon switching branches
When switching worktrees (which we can now do via the branch view) we re-layout the windows and their views. We had the worktree view ahead of the file view based on the Flatten() method in context.go, because it used to be associated with the branches panel.
Diffstat (limited to 'pkg/integration')
-rw-r--r--pkg/integration/tests/worktree/add_from_branch.go7
1 files changed, 6 insertions, 1 deletions
diff --git a/pkg/integration/tests/worktree/add_from_branch.go b/pkg/integration/tests/worktree/add_from_branch.go
index 53636536d..70aa4dd60 100644
--- a/pkg/integration/tests/worktree/add_from_branch.go
+++ b/pkg/integration/tests/worktree/add_from_branch.go
@@ -55,6 +55,11 @@ var AddFromBranch = NewIntegrationTest(NewIntegrationTestArgs{
Lines(
Contains("mybranch").IsSelected(),
Contains("newbranch (worktree)"),
- )
+ ).
+ // Confirm the files view is still showing in the files window
+ Press(keys.Universal.PrevBlock)
+
+ t.Views().Files().
+ IsFocused()
},
})