Merge #5909 from justinmk/win32-xdg

Windows: fix XDG fallback paths

4 files changed, 36 insertions, 9 deletions

diff --git a/test/functional/options/defaults_spec.lua b/test/functional/options/defaults_spec.lua
index 1ae855f26c..caeca5e4e2 100644
--- a/test/functional/options/defaults_spec.lua
+++ b/test/functional/options/defaults_spec.lua
@@ -9,8 +9,6 @@ local eval = helpers.eval
 local eq = helpers.eq
 local neq = helpers.neq
 
-if helpers.pending_win32(pending) then return end
-
 local function init_session(...)
   local args = { helpers.nvim_prog, '-i', 'NONE', '--embed',
     '--cmd', 'set shortmess+=I background=light noswapfile noautoindent',
@@ -24,6 +22,8 @@ end
 
 describe('startup defaults', function()
   describe(':filetype', function()
+    if helpers.pending_win32(pending) then return end
+
     local function expect_filetype(expected)
       local screen = Screen.new(48, 4)
       screen:attach()
@@ -99,8 +99,37 @@ describe('startup defaults', function()
 end)
 
 describe('XDG-based defaults', function()
-  -- Need to be in separate describe() block to not run clear() twice.
+  -- Need separate describe() blocks to not run clear() twice.
   -- Do not put before_each() here for the same reasons.
+
+  describe('with empty/broken environment', function()
+    it('sets correct defaults', function()
+      clear({env={
+        XDG_CONFIG_HOME=nil,
+        XDG_DATA_HOME=nil,
+        XDG_CACHE_HOME=nil,
+        XDG_RUNTIME_DIR=nil,
+        XDG_CONFIG_DIRS=nil,
+        XDG_DATA_DIRS=nil,
+        LOCALAPPDATA=nil,
+        HOMEPATH=nil,
+        HOMEDRIVE=nil,
+        HOME=nil,
+        TEMP=nil,
+        VIMRUNTIME=nil,
+        USER=nil,
+      }})
+
+      eq('.', meths.get_option('backupdir'))
+      eq('.', meths.get_option('viewdir'))
+      eq('.', meths.get_option('directory'))
+      eq('.', meths.get_option('undodir'))
+    end)
+  end)
+
+  -- TODO(jkeyes): tests below fail on win32 because of path separator.
+  if helpers.pending_win32(pending) then return end
+
   describe('with too long XDG variables', function()
     before_each(function()
       clear({env={
diff --git a/test/functional/shada/buffers_spec.lua b/test/functional/shada/buffers_spec.lua
index 7e6338897a..a4746c2205 100644
--- a/test/functional/shada/buffers_spec.lua
+++ b/test/functional/shada/buffers_spec.lua
@@ -8,8 +8,6 @@ local reset, set_additional_cmd, clear =
   shada_helpers.reset, shada_helpers.set_additional_cmd,
   shada_helpers.clear
 
-if helpers.pending_win32(pending) then return end
-
 describe('ShaDa support code', function()
   local testfilename = 'Xtestfile-functional-shada-buffers'
   local testfilename_2 = 'Xtestfile-functional-shada-buffers-2'
diff --git a/test/functional/shada/marks_spec.lua b/test/functional/shada/marks_spec.lua
index 36d2c665d7..fa760ceb5b 100644
--- a/test/functional/shada/marks_spec.lua
+++ b/test/functional/shada/marks_spec.lua
@@ -14,8 +14,6 @@ local nvim_current_line = function()
   return curwinmeths.get_cursor()[1]
 end
 
-if helpers.pending_win32(pending) then return end
-
 describe('ShaDa support code', function()
   local testfilename = 'Xtestfile-functional-shada-marks'
   local testfilename_2 = 'Xtestfile-functional-shada-marks-2'
diff --git a/test/functional/shada/shada_spec.lua b/test/functional/shada/shada_spec.lua
index f845f6f93b..32598fc399 100644
--- a/test/functional/shada/shada_spec.lua
+++ b/test/functional/shada/shada_spec.lua
@@ -23,8 +23,6 @@ local wshada, _, shada_fname, clean =
 local dirname = 'Xtest-functional-shada-shada.d'
 local dirshada = dirname .. '/main.shada'
 
-if helpers.pending_win32(pending) then return end
-
 describe('ShaDa support code', function()
   before_each(reset)
   after_each(function()
@@ -173,6 +171,7 @@ describe('ShaDa support code', function()
   end
 
   it('correctly uses shada-r option', function()
+    nvim_command('set shellslash')
     meths.set_var('__home', paths.test_source_path)
     nvim_command('let $HOME = __home')
     nvim_command('unlet __home')
@@ -196,6 +195,7 @@ describe('ShaDa support code', function()
   end)
 
   it('correctly ignores case with shada-r option', function()
+    nvim_command('set shellslash')
     local pwd = funcs.getcwd()
     local relfname = 'абв/test'
     local fname = pwd .. '/' .. relfname
@@ -240,6 +240,8 @@ describe('ShaDa support code', function()
   end)
 
   it('does not crash when ShaDa file directory is not writable', function()
+    if helpers.pending_win32(pending) then return end
+
     funcs.mkdir(dirname, '', 0)
     eq(0, funcs.filewritable(dirname))
     set_additional_cmd('set shada=')