mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-06-15 16:23:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: fix merge conflict

Browse Source
This commit is contained in:
Justin M. Keyes
2026-04-24 18:43:13 +02:00
parent 3d923bfa50
commit 3b69e3d0cf
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/functional/ex_cmds/trust_spec.lua
View File

@@ -71,8 +71,7 @@ describe(':trust', function()
command('edit ' .. empty_file)
matches('^Allowed in trust database%: ".*' .. empty_file .. '"$', exec_capture('trust'))
local trust = t.read_file(fn.stdpath('state') .. pathsep .. 'trust')
eq(string.format('%s %s', hash, cwd .. pathsep .. empty_file), vim.trim(trust))
assert_trust_entry(('%s %s'):format(hash, osjoin(cwd, empty_file)))
end)
it('deny then trust then remove a file using current buffer', function()

5
test/functional/lua/secure_spec.lua
View File

@@ -334,12 +334,11 @@ describe('vim.secure', function()
it('trust an empty file using bufnr', function()
local cwd = fn.getcwd()
local hash = fn.sha256(assert(read_file(empty_file)))
local full_path = cwd .. pathsep .. empty_file
local full_path = osjoin(cwd, empty_file)
command('edit ' .. empty_file)
eq({ true, full_path }, exec_lua([[return {vim.secure.trust({action='allow', bufnr=0})}]]))
local trust = assert(read_file(stdpath('state') .. pathsep .. 'trust'))
eq(string.format('%s %s', hash, full_path), vim.trim(trust))
assert_trust_entry(('%s %s'):format(hash, full_path))
end)
it('deny then trust then remove a file using bufnr', function()