ComputerSurge/lazygit
3
0
Fork 0
Code Pull Requests 1 Activity

Fix flakey worktree tests

Browse Source 
In the presentation layer, when showing branches, we'll show worktrees against branches if they're
associated. But there was a race condition: if the worktree model was refreshed after the branches model,
it wouldn't be used in the presentation layer when it came time to render the branches.

A better solution would be to have some way of signalling that a particular context needs to be refreshed
and after all the models are done being refreshed, we then refresh the contexts. This will prevent
double-renders
This commit is contained in:
Jesse Duffield
2023-07-29 17:30:40 +10:00
parent f31e213edc
commit 91909331b5
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/integration/tests/worktree/detach_worktree_from_branch.go
View File

@@ -35,7 +35,7 @@ var DetachWorktreeFromBranch = NewIntegrationTest(NewIntegrationTestArgs{
}).
Lines(
Contains("mybranch"),
Contains("newbranch").DoesNotContain("(worktree").IsSelected(),
Contains("newbranch").DoesNotContain("(worktree)").IsSelected(),
)
t.Views().Worktrees().

2
pkg/integration/tests/worktree/remove_worktree_from_branch.go
View File

@@ -46,7 +46,7 @@ var RemoveWorktreeFromBranch = NewIntegrationTest(NewIntegrationTestArgs{
}).
Lines(
Contains("mybranch"),
Contains("newbranch").DoesNotContain("(worktree").IsSelected(),
Contains("newbranch").DoesNotContain("(worktree)").IsSelected(),
)
t.Views().Worktrees().