mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-11-23 02:26:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4718 from jszakmeister/fix-some-failing-tests

Browse Source 
Fix some failing tests.
This commit is contained in:
Justin M. Keyes
2016-05-09 14:03:15 -04:00
parent b02ba11cb1 69d1bc1a47
commit 31373e400d
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/functional/ex_cmds/cd_spec.lua
View File

@@ -53,7 +53,7 @@ for _, cmd in ipairs {'cd', 'chdir'} do
eq(0, wlwd()) eq(0, wlwd())
-- Change tab-local working directory and verify it is different -- Change tab-local working directory and verify it is different
execute('t' .. cmd .. ' ' .. directories[1]) execute('silent t' .. cmd .. ' ' .. directories[1])
eq(globalDir .. '/' .. directories[1], cwd()) eq(globalDir .. '/' .. directories[1], cwd())
eq(cwd(), tcwd()) -- working directory maches tab directory eq(cwd(), tcwd()) -- working directory maches tab directory
eq(1, tlwd()) eq(1, tlwd())
@@ -65,7 +65,7 @@ for _, cmd in ipairs {'cd', 'chdir'} do
eq(1, tlwd()) -- Still tab-local working directory eq(1, tlwd()) -- Still tab-local working directory
eq(0, wlwd()) -- Still no window-local working directory eq(0, wlwd()) -- Still no window-local working directory
eq(globalDir .. '/' .. directories[1], cwd()) eq(globalDir .. '/' .. directories[1], cwd())
execute('l' .. cmd .. ' ../' .. directories[2]) execute('silent l' .. cmd .. ' ../' .. directories[2])
eq(globalDir .. '/' .. directories[2], cwd()) eq(globalDir .. '/' .. directories[2], cwd())
eq(globalDir .. '/' .. directories[1], tcwd()) eq(globalDir .. '/' .. directories[1], tcwd())
eq(1, wlwd()) eq(1, wlwd())
@@ -83,7 +83,7 @@ for _, cmd in ipairs {'cd', 'chdir'} do
eq(0, wlwd()) eq(0, wlwd())
-- Verify global changes don't affect local ones -- Verify global changes don't affect local ones
execute('' .. cmd .. ' ' .. directories[3]) execute('silent ' .. cmd .. ' ' .. directories[3])
eq(globalDir .. '/' .. directories[3], cwd()) eq(globalDir .. '/' .. directories[3], cwd())
execute('tabnext') execute('tabnext')
eq(globalDir .. '/' .. directories[1], cwd()) eq(globalDir .. '/' .. directories[1], cwd())
@@ -91,7 +91,7 @@ for _, cmd in ipairs {'cd', 'chdir'} do
eq(0, wlwd()) -- Still no window-local directory in this window eq(0, wlwd()) -- Still no window-local directory in this window
-- Unless the global change happened in a tab with local directory -- Unless the global change happened in a tab with local directory
execute('' .. cmd .. ' ..') execute('silent ' .. cmd .. ' ..')
eq(globalDir, cwd() ) eq(globalDir, cwd() )
eq(0 , tlwd()) eq(0 , tlwd())
eq(0 , wlwd()) eq(0 , wlwd())
@@ -111,6 +111,10 @@ end
-- Test legal parameters for 'getcwd' and 'haslocaldir' -- Test legal parameters for 'getcwd' and 'haslocaldir'
for _, cmd in ipairs {'getcwd', 'haslocaldir'} do for _, cmd in ipairs {'getcwd', 'haslocaldir'} do
describe(cmd..'()', function() describe(cmd..'()', function()
before_each(function()
clear()
end)
-- Test invalid argument types -- Test invalid argument types
local err474 = 'Vim(call):E474: Invalid argument' local err474 = 'Vim(call):E474: Invalid argument'
it('fails on string', function() it('fails on string', function()

3
test/unit/tempfile_spec.lua
View File

@@ -5,6 +5,9 @@ local os = helpers.cimport './src/nvim/os/os.h'
local tempfile = helpers.cimport './src/nvim/fileio.h' local tempfile = helpers.cimport './src/nvim/fileio.h'
describe('tempfile related functions', function() describe('tempfile related functions', function()
before_each(function()
tempfile.vim_deltempdir()
end)
after_each(function() after_each(function()
tempfile.vim_deltempdir() tempfile.vim_deltempdir()
end) end)