test: avoid extra clear() calls

also: various other cleanup
This commit is contained in:
Justin M. Keyes
2017-10-02 00:24:19 +02:00
parent e9dba214ea
commit 6f7754dfa0
3 changed files with 29 additions and 40 deletions

View File

@@ -2,60 +2,55 @@ local helpers = require('test.functional.helpers')(after_each)
local clear = helpers.clear
local eq = helpers.eq
local eval = helpers.eval
local get_pathsep = helpers.get_pathsep
local command = helpers.command
local iswin = helpers.iswin
describe("'%:p' expanding", function()
local pathsep
describe('path collapse', function()
local targetdir
local expected_path
local function get_full_path()
return eval('expand("%:p")')
end
local function join_path(...)
local pathsep = (iswin() and '\\' or '/')
return table.concat({...}, pathsep)
end
before_each(function()
clear()
pathsep = get_pathsep()
targetdir = join_path('test', 'functional', 'fixtures')
clear(join_path(targetdir, 'tty-test.c'))
expected_path = get_full_path()
clear()
command('edit '..join_path(targetdir, 'tty-test.c'))
expected_path = eval('expand("%:p")')
end)
it('given a relative path with current directory in the middle #7117', function()
clear(join_path(targetdir, '.', 'tty-test.c'))
eq(expected_path, get_full_path())
it('with /./ segment #7117', function()
command('edit '..join_path(targetdir, '.', 'tty-test.c'))
eq(expected_path, eval('expand("%:p")'))
end)
it('given a relative path with current directory #7117', function()
clear(join_path('.', targetdir, 'tty-test.c'))
eq(expected_path, get_full_path())
it('with ./ prefix #7117', function()
command('edit '..join_path('.', targetdir, 'tty-test.c'))
eq(expected_path, eval('expand("%:p")'))
end)
it('given a relative path with current directory to a file when changing directory #7117', function()
clear(join_path('.', targetdir, 'tty-test.c'))
it('with ./ prefix, after directory change #7117', function()
command('edit '..join_path('.', targetdir, 'tty-test.c'))
command('cd test')
eq(expected_path, get_full_path())
eq(expected_path, eval('expand("%:p")'))
end)
it('given a relative path with directory up the tree to a file #7117', function()
clear(join_path(targetdir, '..', 'fixtures', 'tty-test.c'))
eq(expected_path, get_full_path())
it('with /../ segment #7117', function()
command('edit '..join_path(targetdir, '..', 'fixtures', 'tty-test.c'))
eq(expected_path, eval('expand("%:p")'))
end)
it('given a different starting directory and a relative path with directory up the tree #7117', function()
it('with ../ and different starting directory #7117', function()
command('cd test')
command('e ' .. join_path('..', targetdir, 'tty-test.c'))
eq(expected_path, get_full_path())
command('edit '..join_path('..', targetdir, 'tty-test.c'))
eq(expected_path, eval('expand("%:p")'))
end)
it('given a different starting directory and a relative path with current directory and up the tree #7117', function()
it('with ./../ and different starting directory #7117', function()
command('cd test')
command('e ' .. join_path('.', '..', targetdir, 'tty-test.c'))
eq(expected_path, get_full_path())
command('edit '..join_path('.', '..', targetdir, 'tty-test.c'))
eq(expected_path, eval('expand("%:p")'))
end)
end)