Merge remote-tracking branch 'origin/rolling'

1 files changed, 5 insertions, 3 deletions

diff --git a/tests/config_loader_spec.lua b/tests/config_loader_spec.lua
index 8e7ab339..1aef0974 100644
--- a/tests/config_loader_spec.lua
+++ b/tests/config_loader_spec.lua
@@ -1,5 +1,6 @@
 local a = require "plenary.async_lib.tests"
 local config = require "lvim.config"
+local utils = require "lvim.utils"
 
 a.describe("config-loader", function()
   local user_config_path = config:get_user_config_path()
@@ -20,18 +21,19 @@ a.describe("config-loader", function()
     vim.opt.undodir = "/tmp"
     assert.equal(vim.opt.undodir:get()[1], "/tmp")
     config:reload()
-    assert.equal(vim.opt.undodir:get()[1], get_cache_dir() .. "/undo")
+    assert.equal(vim.opt.undodir:get()[1], utils.join_paths(get_cache_dir(), "undo"))
   end)
 
   a.it("should not get interrupted by errors in user-config", function()
     vim.opt.undodir = "/tmp"
     assert.equal(vim.opt.undodir:get()[1], "/tmp")
-    os.execute("echo bad_string_test >> " .. user_config_path)
+    os.execute(string.format("echo 'bad_string_test' >> %s", user_config_path))
     local error_handler = function(msg)
       return msg
     end
     local err = xpcall(config:reload(), error_handler)
     assert.falsy(err)
-    assert.equal(vim.opt.undodir:get()[1], get_cache_dir() .. "/undo")
+    assert.equal(vim.opt.undodir:get()[1], utils.join_paths(get_cache_dir(), "undo"))
+    os.execute(string.format("echo '' > %s", user_config_path))
   end)
 end)