Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pass a reference to TestAppContext in tests

Browse source 
This allows us to drop the context *after* we ran all futures to
completion and that's crucial otherwise we'll never drop entities
and/or flush effects.
This commit is contained in:
Antonio Scandurra 2022-03-01 12:01:02 +01:00
parent 8390f04e7d
commit 466db69780
20 changed files with 748 additions and 819 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/project_panel/src/project_panel.rs
View file

@ -589,7 +589,7 @@ mod tests {
use workspace::WorkspaceParams;
#[gpui::test]
async fn test_visible_list(mut cx: gpui::TestAppContext) {
async fn test_visible_list(cx: &mut gpui::TestAppContext) {
let params = cx.update(WorkspaceParams::test);
let settings = params.settings.clone();
let fs = params.fs.as_fake();
@ -639,28 +639,28 @@ mod tests {
)
});
let (root1, _) = project
.update(&mut cx, |project, cx| {
.update(cx, |project, cx| {
project.find_or_create_local_worktree("/root1", false, cx)
})
.await
.unwrap();
root1
.read_with(&cx, |t, _| t.as_local().unwrap().scan_complete())
.read_with(cx, |t, _| t.as_local().unwrap().scan_complete())
.await;
let (root2, _) = project
.update(&mut cx, |project, cx| {
.update(cx, |project, cx| {
project.find_or_create_local_worktree("/root2", false, cx)
})
.await
.unwrap();
root2
.read_with(&cx, |t, _| t.as_local().unwrap().scan_complete())
.read_with(cx, |t, _| t.as_local().unwrap().scan_complete())
.await;
let (_, workspace) = cx.add_window(|cx| Workspace::new(&params, cx));
let panel = workspace.update(&mut cx, |_, cx| ProjectPanel::new(project, settings, cx));
let panel = workspace.update(cx, |_, cx| ProjectPanel::new(project, settings, cx));
assert_eq!(
visible_entry_details(&panel, 0..50, &mut cx),
visible_entry_details(&panel, 0..50, cx),
&[
EntryDetails {
filename: "root1".to_string(),
@ -721,9 +721,9 @@ mod tests {
],
);
toggle_expand_dir(&panel, "root1/b", &mut cx);
toggle_expand_dir(&panel, "root1/b", cx);
assert_eq!(
visible_entry_details(&panel, 0..50, &mut cx),
visible_entry_details(&panel, 0..50, cx),
&[
EntryDetails {
filename: "root1".to_string(),
@ -799,7 +799,7 @@ mod tests {
);
assert_eq!(
visible_entry_details(&panel, 5..8, &mut cx),
visible_entry_details(&panel, 5..8, cx),
[
EntryDetails {
filename: "4".to_string(),