From 3b69e3d0cf67badd8ea78f4e0974856f442ed36a Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Fri, 24 Apr 2026 18:43:13 +0200 Subject: [PATCH] test: fix merge conflict --- test/functional/ex_cmds/trust_spec.lua | 3 +-- test/functional/lua/secure_spec.lua | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/test/functional/ex_cmds/trust_spec.lua b/test/functional/ex_cmds/trust_spec.lua index ee823a6ce7..627d19b115 100644 --- a/test/functional/ex_cmds/trust_spec.lua +++ b/test/functional/ex_cmds/trust_spec.lua @@ -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() diff --git a/test/functional/lua/secure_spec.lua b/test/functional/lua/secure_spec.lua index 52a4ac9710..b8580d77a5 100644 --- a/test/functional/lua/secure_spec.lua +++ b/test/functional/lua/secure_spec.lua @@ -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()