mirror of
https://github.com/neovim/neovim.git
synced 2025-10-21 17:21:49 +00:00
refactor: format test/*
This commit is contained in:
Justin M. Keyes
@@ -19,11 +19,14 @@ describe('vim.secure', function()
|
||||
local xstate = 'Xstate'
|
||||
|
||||
setup(function()
|
||||
clear{env={XDG_STATE_HOME=xstate}}
|
||||
clear { env = { XDG_STATE_HOME = xstate } }
|
||||
helpers.mkdir_p(xstate .. pathsep .. (is_os('win') and 'nvim-data' or 'nvim'))
|
||||
helpers.write_file('Xfile', [[
|
||||
helpers.write_file(
|
||||
'Xfile',
|
||||
[[
|
||||
let g:foobar = 42
|
||||
]])
|
||||
]]
|
||||
)
|
||||
end)
|
||||
|
||||
teardown(function()
|
||||
@@ -35,10 +38,10 @@ describe('vim.secure', function()
|
||||
local screen = Screen.new(80, 8)
|
||||
screen:attach()
|
||||
screen:set_default_attr_ids({
|
||||
[1] = {bold = true, foreground = Screen.colors.Blue1},
|
||||
[2] = {bold = true, reverse = true},
|
||||
[3] = {bold = true, foreground = Screen.colors.SeaGreen},
|
||||
[4] = {reverse = true},
|
||||
[1] = { bold = true, foreground = Screen.colors.Blue1 },
|
||||
[2] = { bold = true, reverse = true },
|
||||
[3] = { bold = true, foreground = Screen.colors.SeaGreen },
|
||||
[4] = { reverse = true },
|
||||
})
|
||||
|
||||
--- XXX: screen:expect() may fail if this path is too long.
|
||||
@@ -46,20 +49,27 @@ describe('vim.secure', function()
|
||||
|
||||
-- Need to use feed_command instead of exec_lua because of the confirmation prompt
|
||||
feed_command([[lua vim.secure.read('Xfile')]])
|
||||
screen:expect{grid=[[
|
||||
screen:expect {
|
||||
grid = [[
|
||||
|
|
||||
{1:~ }|*3
|
||||
{2: }|
|
||||
:lua vim.secure.read('Xfile') |
|
||||
{3:]] .. cwd .. pathsep .. [[Xfile is not trusted.}{MATCH:%s+}|
|
||||
{3:]]
|
||||
.. cwd
|
||||
.. pathsep
|
||||
.. [[Xfile is not trusted.}{MATCH:%s+}|
|
||||
{3:[i]gnore, (v)iew, (d)eny, (a)llow: }^ |
|
||||
]]}
|
||||
]],
|
||||
}
|
||||
feed('d')
|
||||
screen:expect{grid=[[
|
||||
screen:expect {
|
||||
grid = [[
|
||||
^ |
|
||||
{1:~ }|*6
|
||||
|
|
||||
]]}
|
||||
]],
|
||||
}
|
||||
|
||||
local trust = helpers.read_file(funcs.stdpath('state') .. pathsep .. 'trust')
|
||||
eq(string.format('! %s', cwd .. pathsep .. 'Xfile'), vim.trim(trust))
|
||||
@@ -68,20 +78,27 @@ describe('vim.secure', function()
|
||||
os.remove(funcs.stdpath('state') .. pathsep .. 'trust')
|
||||
|
||||
feed_command([[lua vim.secure.read('Xfile')]])
|
||||
screen:expect{grid=[[
|
||||
screen:expect {
|
||||
grid = [[
|
||||
|
|
||||
{1:~ }|*3
|
||||
{2: }|
|
||||
:lua vim.secure.read('Xfile') |
|
||||
{3:]] .. cwd .. pathsep .. [[Xfile is not trusted.}{MATCH:%s+}|
|
||||
{3:]]
|
||||
.. cwd
|
||||
.. pathsep
|
||||
.. [[Xfile is not trusted.}{MATCH:%s+}|
|
||||
{3:[i]gnore, (v)iew, (d)eny, (a)llow: }^ |
|
||||
]]}
|
||||
]],
|
||||
}
|
||||
feed('a')
|
||||
screen:expect{grid=[[
|
||||
screen:expect {
|
||||
grid = [[
|
||||
^ |
|
||||
{1:~ }|*6
|
||||
|
|
||||
]]}
|
||||
]],
|
||||
}
|
||||
|
||||
local hash = funcs.sha256(helpers.read_file('Xfile'))
|
||||
trust = helpers.read_file(funcs.stdpath('state') .. pathsep .. 'trust')
|
||||
@@ -91,44 +108,61 @@ describe('vim.secure', function()
|
||||
os.remove(funcs.stdpath('state') .. pathsep .. 'trust')
|
||||
|
||||
feed_command([[lua vim.secure.read('Xfile')]])
|
||||
screen:expect{grid=[[
|
||||
screen:expect {
|
||||
grid = [[
|
||||
|
|
||||
{1:~ }|*3
|
||||
{2: }|
|
||||
:lua vim.secure.read('Xfile') |
|
||||
{3:]] .. cwd .. pathsep .. [[Xfile is not trusted.}{MATCH:%s+}|
|
||||
{3:]]
|
||||
.. cwd
|
||||
.. pathsep
|
||||
.. [[Xfile is not trusted.}{MATCH:%s+}|
|
||||
{3:[i]gnore, (v)iew, (d)eny, (a)llow: }^ |
|
||||
]]}
|
||||
]],
|
||||
}
|
||||
feed('i')
|
||||
screen:expect{grid=[[
|
||||
screen:expect {
|
||||
grid = [[
|
||||
^ |
|
||||
{1:~ }|*6
|
||||
|
|
||||
]]}
|
||||
]],
|
||||
}
|
||||
|
||||
-- Trust database is not updated
|
||||
trust = helpers.read_file(funcs.stdpath('state') .. pathsep .. 'trust')
|
||||
eq(nil, trust)
|
||||
|
||||
feed_command([[lua vim.secure.read('Xfile')]])
|
||||
screen:expect{grid=[[
|
||||
screen:expect {
|
||||
grid = [[
|
||||
|
|
||||
{1:~ }|*3
|
||||
{2: }|
|
||||
:lua vim.secure.read('Xfile') |
|
||||
{3:]] .. cwd .. pathsep .. [[Xfile is not trusted.}{MATCH:%s+}|
|
||||
{3:]]
|
||||
.. cwd
|
||||
.. pathsep
|
||||
.. [[Xfile is not trusted.}{MATCH:%s+}|
|
||||
{3:[i]gnore, (v)iew, (d)eny, (a)llow: }^ |
|
||||
]]}
|
||||
]],
|
||||
}
|
||||
feed('v')
|
||||
screen:expect{grid=[[
|
||||
screen:expect {
|
||||
grid = [[
|
||||
^let g:foobar = 42 |
|
||||
{1:~ }|*2
|
||||
{2:]] .. funcs.fnamemodify(cwd, ':~') .. pathsep .. [[Xfile [RO]{MATCH:%s+}}|
|
||||
{2:]]
|
||||
.. funcs.fnamemodify(cwd, ':~')
|
||||
.. pathsep
|
||||
.. [[Xfile [RO]{MATCH:%s+}}|
|
||||
|
|
||||
{1:~ }|
|
||||
{4:[No Name] }|
|
||||
|
|
||||
]]}
|
||||
]],
|
||||
}
|
||||
|
||||
-- Trust database is not updated
|
||||
trust = helpers.read_file(funcs.stdpath('state') .. pathsep .. 'trust')
|
||||
@@ -144,7 +178,7 @@ describe('vim.secure', function()
|
||||
local xstate = 'Xstate'
|
||||
|
||||
setup(function()
|
||||
clear{env={XDG_STATE_HOME=xstate}}
|
||||
clear { env = { XDG_STATE_HOME = xstate } }
|
||||
helpers.mkdir_p(xstate .. pathsep .. (is_os('win') and 'nvim-data' or 'nvim'))
|
||||
end)
|
||||
|
||||
@@ -161,13 +195,17 @@ describe('vim.secure', function()
|
||||
end)
|
||||
|
||||
it('returns error when passing both path and bufnr', function()
|
||||
matches('"path" and "bufnr" are mutually exclusive',
|
||||
pcall_err(exec_lua, [[vim.secure.trust({action='deny', bufnr=0, path='test_file'})]]))
|
||||
matches(
|
||||
'"path" and "bufnr" are mutually exclusive',
|
||||
pcall_err(exec_lua, [[vim.secure.trust({action='deny', bufnr=0, path='test_file'})]])
|
||||
)
|
||||
end)
|
||||
|
||||
it('returns error when passing neither path or bufnr', function()
|
||||
matches('one of "path" or "bufnr" is required',
|
||||
pcall_err(exec_lua, [[vim.secure.trust({action='deny'})]]))
|
||||
matches(
|
||||
'one of "path" or "bufnr" is required',
|
||||
pcall_err(exec_lua, [[vim.secure.trust({action='deny'})]])
|
||||
)
|
||||
end)
|
||||
|
||||
it('trust then deny then remove a file using bufnr', function()
|
||||
@@ -176,15 +214,15 @@ describe('vim.secure', function()
|
||||
local full_path = cwd .. pathsep .. 'test_file'
|
||||
|
||||
command('edit test_file')
|
||||
eq({true, full_path}, exec_lua([[return {vim.secure.trust({action='allow', bufnr=0})}]]))
|
||||
eq({ true, full_path }, exec_lua([[return {vim.secure.trust({action='allow', bufnr=0})}]]))
|
||||
local trust = helpers.read_file(funcs.stdpath('state') .. pathsep .. 'trust')
|
||||
eq(string.format('%s %s', hash, full_path), vim.trim(trust))
|
||||
|
||||
eq({true, full_path}, exec_lua([[return {vim.secure.trust({action='deny', bufnr=0})}]]))
|
||||
eq({ true, full_path }, exec_lua([[return {vim.secure.trust({action='deny', bufnr=0})}]]))
|
||||
trust = helpers.read_file(funcs.stdpath('state') .. pathsep .. 'trust')
|
||||
eq(string.format('! %s', full_path), vim.trim(trust))
|
||||
|
||||
eq({true, full_path}, exec_lua([[return {vim.secure.trust({action='remove', bufnr=0})}]]))
|
||||
eq({ true, full_path }, exec_lua([[return {vim.secure.trust({action='remove', bufnr=0})}]]))
|
||||
trust = helpers.read_file(funcs.stdpath('state') .. pathsep .. 'trust')
|
||||
eq('', vim.trim(trust))
|
||||
end)
|
||||
@@ -195,15 +233,15 @@ describe('vim.secure', function()
|
||||
local full_path = cwd .. pathsep .. 'test_file'
|
||||
|
||||
command('edit test_file')
|
||||
eq({true, full_path}, exec_lua([[return {vim.secure.trust({action='deny', bufnr=0})}]]))
|
||||
eq({ true, full_path }, exec_lua([[return {vim.secure.trust({action='deny', bufnr=0})}]]))
|
||||
local trust = helpers.read_file(funcs.stdpath('state') .. pathsep .. 'trust')
|
||||
eq(string.format('! %s', full_path), vim.trim(trust))
|
||||
|
||||
eq({true, full_path}, exec_lua([[return {vim.secure.trust({action='allow', bufnr=0})}]]))
|
||||
eq({ true, full_path }, exec_lua([[return {vim.secure.trust({action='allow', bufnr=0})}]]))
|
||||
trust = helpers.read_file(funcs.stdpath('state') .. pathsep .. 'trust')
|
||||
eq(string.format('%s %s', hash, full_path), vim.trim(trust))
|
||||
|
||||
eq({true, full_path}, exec_lua([[return {vim.secure.trust({action='remove', bufnr=0})}]]))
|
||||
eq({ true, full_path }, exec_lua([[return {vim.secure.trust({action='remove', bufnr=0})}]]))
|
||||
trust = helpers.read_file(funcs.stdpath('state') .. pathsep .. 'trust')
|
||||
eq('', vim.trim(trust))
|
||||
end)
|
||||
@@ -214,15 +252,21 @@ describe('vim.secure', function()
|
||||
local full_path = cwd .. pathsep .. 'test_file'
|
||||
|
||||
command('edit test_file')
|
||||
eq({true, full_path}, exec_lua([[return {vim.secure.trust({action='allow', bufnr=0})}]]))
|
||||
eq({ true, full_path }, exec_lua([[return {vim.secure.trust({action='allow', bufnr=0})}]]))
|
||||
local trust = helpers.read_file(funcs.stdpath('state') .. pathsep .. 'trust')
|
||||
eq(string.format('%s %s', hash, full_path), vim.trim(trust))
|
||||
|
||||
eq({true, full_path}, exec_lua([[return {vim.secure.trust({action='deny', path='test_file'})}]]))
|
||||
eq(
|
||||
{ true, full_path },
|
||||
exec_lua([[return {vim.secure.trust({action='deny', path='test_file'})}]])
|
||||
)
|
||||
trust = helpers.read_file(funcs.stdpath('state') .. pathsep .. 'trust')
|
||||
eq(string.format('! %s', full_path), vim.trim(trust))
|
||||
|
||||
eq({true, full_path}, exec_lua([[return {vim.secure.trust({action='remove', path='test_file'})}]]))
|
||||
eq(
|
||||
{ true, full_path },
|
||||
exec_lua([[return {vim.secure.trust({action='remove', path='test_file'})}]])
|
||||
)
|
||||
trust = helpers.read_file(funcs.stdpath('state') .. pathsep .. 'trust')
|
||||
eq('', vim.trim(trust))
|
||||
end)
|
||||
@@ -233,23 +277,31 @@ describe('vim.secure', function()
|
||||
local full_path = cwd .. pathsep .. 'test_file'
|
||||
|
||||
command('edit test_file')
|
||||
eq({true, full_path}, exec_lua([[return {vim.secure.trust({action='deny', path='test_file'})}]]))
|
||||
eq(
|
||||
{ true, full_path },
|
||||
exec_lua([[return {vim.secure.trust({action='deny', path='test_file'})}]])
|
||||
)
|
||||
local trust = helpers.read_file(funcs.stdpath('state') .. pathsep .. 'trust')
|
||||
eq(string.format('! %s', full_path), vim.trim(trust))
|
||||
|
||||
eq({true, full_path}, exec_lua([[return {vim.secure.trust({action='allow', bufnr=0})}]]))
|
||||
eq({ true, full_path }, exec_lua([[return {vim.secure.trust({action='allow', bufnr=0})}]]))
|
||||
trust = helpers.read_file(funcs.stdpath('state') .. pathsep .. 'trust')
|
||||
eq(string.format('%s %s', hash, full_path), vim.trim(trust))
|
||||
|
||||
eq({true, full_path}, exec_lua([[return {vim.secure.trust({action='remove', path='test_file'})}]]))
|
||||
eq(
|
||||
{ true, full_path },
|
||||
exec_lua([[return {vim.secure.trust({action='remove', path='test_file'})}]])
|
||||
)
|
||||
trust = helpers.read_file(funcs.stdpath('state') .. pathsep .. 'trust')
|
||||
eq('', vim.trim(trust))
|
||||
end)
|
||||
|
||||
it('trust returns error when buffer not associated to file', function()
|
||||
command('new')
|
||||
eq({false, 'buffer is not associated with a file'},
|
||||
exec_lua([[return {vim.secure.trust({action='allow', bufnr=0})}]]))
|
||||
eq(
|
||||
{ false, 'buffer is not associated with a file' },
|
||||
exec_lua([[return {vim.secure.trust({action='allow', bufnr=0})}]])
|
||||
)
|
||||
end)
|
||||
end)
|
||||
end)
|
||||
|
||||
Reference in New Issue
Block a user