From 2b9a97a46ee67b8fd8834536bd72e7c67c56a320 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Tue, 4 May 2021 12:41:00 -0700
Subject: [PATCH] Fix hangs in workspace tests

---
 zed/src/file_finder.rs | 19 +++++++++++--------
 zed/src/workspace.rs   |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/zed/src/file_finder.rs b/zed/src/file_finder.rs
index 57118bcf22793ed78abfdb64aac4b962a294e9e7..05ff52d0202613859b2c346f348fe1d3ff50f88d 100644
--- a/zed/src/file_finder.rs
+++ b/zed/src/file_finder.rs
@@ -640,16 +640,19 @@ mod tests {
             }));
             let settings = settings::channel(&app.font_cache()).unwrap().1;
 
-            let (_, workspace) = app.add_window(|ctx| {
-                let mut workspace = Workspace::new(0, settings.clone(), ctx);
-                smol::block_on(workspace.open_paths(
-                    &[tmp_dir.path().join("dir1"), tmp_dir.path().join("dir2")],
-                    ctx,
-                ));
-                workspace
-            });
+            let (_, workspace) = app.add_window(|ctx| Workspace::new(0, settings.clone(), ctx));
+
+            workspace
+                .update(&mut app, |workspace, ctx| {
+                    workspace.open_paths(
+                        &[tmp_dir.path().join("dir1"), tmp_dir.path().join("dir2")],
+                        ctx,
+                    )
+                })
+                .await;
             app.read(|ctx| workspace.read(ctx).worktree_scans_complete(ctx))
                 .await;
+
             let (_, finder) =
                 app.add_window(|ctx| FileFinder::new(settings, workspace.clone(), ctx));
 
diff --git a/zed/src/workspace.rs b/zed/src/workspace.rs
index 00cdeef7a5ea09467a53fac30809a89cde12d119..0e0faa6b9167583ce915c847e9fa4eedef60d504 100644
--- a/zed/src/workspace.rs
+++ b/zed/src/workspace.rs
@@ -685,7 +685,7 @@ mod tests {
 
             let (_, workspace) = app.add_window(|ctx| {
                 let mut workspace = Workspace::new(0, settings, ctx);
-                smol::block_on(workspace.open_paths(&[dir.path().into()], ctx));
+                workspace.open_path(dir.path().into(), ctx);
                 workspace
             });