mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-12 09:32:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

functests: Fix buf_functions test on Windows

Browse Source
This commit is contained in:
ZyX
2016-11-05 21:34:22 +03:00
parent 4bcee96347
commit 5239616297
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/functional/eval/buf_functions_spec.lua
View File

@@ -13,6 +13,7 @@ local winmeths = helpers.winmeths
local curbufmeths = helpers.curbufmeths local curbufmeths = helpers.curbufmeths
local curwinmeths = helpers.curwinmeths local curwinmeths = helpers.curwinmeths
local curtabmeths = helpers.curtabmeths local curtabmeths = helpers.curtabmeths
local get_pathsep = helpers.get_pathsep
local fname = 'Xtest-functional-eval-buf_functions' local fname = 'Xtest-functional-eval-buf_functions'
local fname2 = fname .. '.2' local fname2 = fname .. '.2'
@@ -66,14 +67,15 @@ describe('bufname() function', function()
eq('', funcs.bufname('%')) -- Buffer has no name yet eq('', funcs.bufname('%')) -- Buffer has no name yet
command('file ' .. fname) command('file ' .. fname)
local wd = lfs.currentdir() local wd = lfs.currentdir()
local sep = get_pathsep()
local curdirname = funcs.fnamemodify(wd, ':t') local curdirname = funcs.fnamemodify(wd, ':t')
for _, arg in ipairs({'%', 1, 'X', wd}) do for _, arg in ipairs({'%', 1, 'X', wd}) do
eq(fname, funcs.bufname(arg)) eq(fname, funcs.bufname(arg))
meths.set_current_dir('..') meths.set_current_dir('..')
eq(curdirname .. '/' .. fname, funcs.bufname(arg)) eq(curdirname .. sep .. fname, funcs.bufname(arg))
meths.set_current_dir(curdirname) meths.set_current_dir(curdirname)
meths.set_current_dir(dirname) meths.set_current_dir(dirname)
eq(wd .. '/' .. fname, funcs.bufname(arg)) eq(wd .. sep .. fname, funcs.bufname(arg))
meths.set_current_dir('..') meths.set_current_dir('..')
eq(fname, funcs.bufname(arg)) eq(fname, funcs.bufname(arg))
command('enew') command('enew')

5
test/functional/helpers.lua
View File

@@ -570,6 +570,10 @@ local curbufmeths = create_callindex(curbuf)
local curwinmeths = create_callindex(curwin) local curwinmeths = create_callindex(curwin)
local curtabmeths = create_callindex(curtab) local curtabmeths = create_callindex(curtab)
local function get_pathsep()
return funcs.fnamemodify('.', ':p'):sub(-1)
end
local M = { local M = {
prepend_argv = prepend_argv, prepend_argv = prepend_argv,
clear = clear, clear = clear,
@@ -635,6 +639,7 @@ local M = {
tmpname = tmpname, tmpname = tmpname,
meth_pcall = meth_pcall, meth_pcall = meth_pcall,
NIL = mpack.NIL, NIL = mpack.NIL,
get_pathsep = get_pathsep,
} }
return function(after_each) return function(after_each)