fix tests to work with upstream changes

denoland · May 17, 2021 · adabd40 · adabd40
1 parent 33f2d47
commit adabd40
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 1 deletion.
diff --git a/cli/bench/lsp.rs b/cli/bench/lsp.rs
@@ -144,7 +144,7 @@ fn bench_startup_shutdown(deno_exe: &Path) -> Result<Duration, AnyError> {
     }),
   )?;
 
-  let (id, method, _): (u64, String, Option<Value>) = client.read_request()?;
+  let (id, method, _) = client.read_request::<Value>()?;
   assert_eq!(method, "workspace/configuration");
 
   client.write_response(

diff --git a/cli/tests/integration_tests_lsp.rs b/cli/tests/integration_tests_lsp.rs
@@ -38,6 +38,13 @@ where
   client
     .write_notification("textDocument/didOpen", params)
     .unwrap();
+
+  let (id, method, _) = client.read_request::<Value>().unwrap();
+  assert_eq!(method, "workspace/configuration");
+  client
+    .write_response(id, json!({ "enable": true }))
+    .unwrap();
+
   let (method, _) = client.read_notification::<Value>().unwrap();
   assert_eq!(method, "textDocument/publishDiagnostics");
   let (method, _) = client.read_notification::<Value>().unwrap();
@@ -209,6 +216,13 @@ fn lsp_hover_disabled() {
       }),
     )
     .unwrap();
+
+  let (id, method, _) = client.read_request::<Value>().unwrap();
+  assert_eq!(method, "workspace/configuration");
+  client
+    .write_response(id, json!({ "enable": false }))
+    .unwrap();
+
   let (maybe_res, maybe_err) = client
     .write_request(
       "textDocument/hover",
@@ -453,6 +467,12 @@ fn lsp_hover_closed_document() {
       }),
     )
     .unwrap();
+  let (id, method, _) = client.read_request::<Value>().unwrap();
+  assert_eq!(method, "workspace/configuration");
+  client
+    .write_response(id, json!({ "enable": true }))
+    .unwrap();
+
   client
     .write_notification(
       "textDocument/didOpen",
@@ -466,6 +486,12 @@ fn lsp_hover_closed_document() {
       }),
     )
     .unwrap();
+  let (id, method, _) = client.read_request::<Value>().unwrap();
+  assert_eq!(method, "workspace/configuration");
+  client
+    .write_response(id, json!({ "enable": true }))
+    .unwrap();
+
   let (method, _) = client.read_notification::<Value>().unwrap();
   assert_eq!(method, "textDocument/publishDiagnostics");
   let (method, _) = client.read_notification::<Value>().unwrap();

diff --git a/cli/tests/lsp/initialize_params.json b/cli/tests/lsp/initialize_params.json
@@ -51,6 +51,10 @@
         "willSaveWaitUntil": true,
         "didSave": true
       }
+    },
+    "workspace": {
+      "configuration": true,
+      "workspaceFolders": true
     }
   }
 }
diff --git a/cli/tests/lsp/initialize_params_disabled.json b/cli/tests/lsp/initialize_params_disabled.json
@@ -51,6 +51,10 @@
         "willSaveWaitUntil": true,
         "didSave": true
       }
+    },
+    "workspace": {
+      "configuration": true,
+      "workspaceFolders": true
     }
   }
 }
diff --git a/cli/tests/lsp/initialize_params_registry.json b/cli/tests/lsp/initialize_params_registry.json
@@ -53,6 +53,10 @@
         "willSaveWaitUntil": true,
         "didSave": true
       }
+    },
+    "workspace": {
+      "configuration": true,
+      "workspaceFolders": true
     }
   }
 }
diff --git a/cli/tests/lsp/initialize_params_unstable.json b/cli/tests/lsp/initialize_params_unstable.json
@@ -51,6 +51,10 @@
         "willSaveWaitUntil": true,
         "didSave": true
       }
+    },
+    "workspace": {
+      "configuration": true,
+      "workspaceFolders": true
     }
   }
 }