Merge remote-tracking branch 'upstream/master' into mix_20240309

1 files changed, 15 insertions, 14 deletions

diff --git a/test/functional/lua/loader_spec.lua b/test/functional/lua/loader_spec.lua
index 4e42a18405..f13e6664c5 100644
--- a/test/functional/lua/loader_spec.lua
+++ b/test/functional/lua/loader_spec.lua
@@ -1,10 +1,11 @@
 -- Test suite for testing interactions with API bindings
-local helpers = require('test.functional.helpers')(after_each)
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
 
-local exec_lua = helpers.exec_lua
-local command = helpers.command
-local clear = helpers.clear
-local eq = helpers.eq
+local exec_lua = n.exec_lua
+local command = n.command
+local clear = n.clear
+local eq = t.eq
 
 describe('vim.loader', function()
   before_each(clear)
@@ -35,7 +36,7 @@ describe('vim.loader', function()
       vim.loader.enable()
     ]]
 
-    local tmp = helpers.tmpname()
+    local tmp = t.tmpname()
     command('edit ' .. tmp)
 
     eq(
@@ -73,15 +74,15 @@ describe('vim.loader', function()
       vim.loader.enable()
     ]]
 
-    local tmp1, tmp2 = (function(t)
-      assert(os.remove(t))
-      assert(helpers.mkdir(t))
-      assert(helpers.mkdir(t .. '/%'))
-      return t .. '/%/x', t .. '/%%x'
-    end)(helpers.tmpname())
+    local tmp = t.tmpname()
+    assert(os.remove(tmp))
+    assert(t.mkdir(tmp))
+    assert(t.mkdir(tmp .. '/%'))
+    local tmp1 = tmp .. '/%/x'
+    local tmp2 = tmp .. '/%%x'
 
-    helpers.write_file(tmp1, 'return 1', true)
-    helpers.write_file(tmp2, 'return 2', true)
+    t.write_file(tmp1, 'return 1', true)
+    t.write_file(tmp2, 'return 2', true)
     vim.uv.fs_utime(tmp1, 0, 0)
     vim.uv.fs_utime(tmp2, 0, 0)
     eq(1, exec_lua('return loadfile(...)()', tmp1))