test: fix the progress tests

Author: aminya

tests/client.rs

@@ -175,10 +175,13 @@ fn client_test_simple_workspace() {
     let count = rls
         .messages()
         .iter()
-        .filter(|msg| msg["method"] == "window/progress")
-        .filter(|msg| msg["params"]["title"] == "Building")
+        .filter(|msg| msg["method"] == "$/progress")
+        .filter(|msg| msg["params"]["value"]["kind"] == "report")
         .filter(|msg| {
-            msg["params"]["message"].as_str().map(|x| x.starts_with("member_")).unwrap_or(false)
+            msg["params"]["value"]["message"]
+                .as_str()
+                .map(|x| x.starts_with("member_"))
+                .unwrap_or(false)
         })
         .count();
     assert_eq!(count, 4);

tests/support/client/mod.rs

@@ -265,9 +265,7 @@ impl<T: AsyncRead + AsyncWrite> RlsHandle<T> {
     /// Blocks until the processing (building + indexing) is done by the RLS.
     #[allow(clippy::bool_comparison)]
     pub fn wait_for_indexing(&mut self) {
-        self.wait_for_message(|msg| {
-            msg["params"]["title"] == "Indexing" && msg["params"]["done"] == true
-        });
+        self.wait_for_message(|msg| msg["params"]["value"]["kind"] == "end");
     }
 
     /// Blocks until a "textDocument/publishDiagnostics" message is received.

tests/support/mod.rs

@@ -179,10 +179,7 @@ impl RlsHandle {
             |stdout| {
                 stdout
                     .to_json_messages()
-                    .filter(|json| {
-                        json["params"]["title"] == "Indexing"
-                            && json["params"]["done"].as_bool().unwrap_or(false)
-                    })
+                    .filter(|json| json["params"]["value"]["kind"] == "end")
                     .count()
                     >= n
             },