Merge remote-tracking branch 'origin/rolling'

2 files changed, 2 insertions, 4 deletions

diff --git a/tests/minimal_lsp.lua b/tests/minimal_lsp.lua
index 660f824b..a610fd7f 100644
--- a/tests/minimal_lsp.lua
+++ b/tests/minimal_lsp.lua
@@ -87,7 +87,7 @@ _G.load_config = function()
       server:install()
     end
     local default_opts = server:get_default_options()
-    setup_opts.cmd_env = default_opts.cmd_env
+    setup_opts = vim.tbl_deep_extend("force", setup_opts, default_opts)
   end
 
   if not name then
diff --git a/tests/specs/bootstrap_spec.lua b/tests/specs/bootstrap_spec.lua
index 51c3330e..9426a16c 100644
--- a/tests/specs/bootstrap_spec.lua
+++ b/tests/specs/bootstrap_spec.lua
@@ -12,9 +12,7 @@ a.describe("initial start", function()
     assert.falsy(package.loaded["lvim.impatient"])
   end)
 
-  a.it("should be able to use lunarvim directories using vim.fn", function()
-    assert.equal(lvim_runtime_path, vim.fn.stdpath "data")
-    assert.equal(lvim_config_path, vim.fn.stdpath "config")
+  a.it("should be able to use lunarvim cache directory using vim.fn", function()
     assert.equal(lvim_cache_path, vim.fn.stdpath "cache")
   end)