test: do not inject vim module into global helpers

3 files changed, 9 insertions, 9 deletions

diff --git a/test/functional/ex_cmds/echo_spec.lua b/test/functional/ex_cmds/echo_spec.lua
index 4698d3de62..87bc15ceca 100644
--- a/test/functional/ex_cmds/echo_spec.lua
+++ b/test/functional/ex_cmds/echo_spec.lua
@@ -1,7 +1,7 @@
 local helpers = require('test.functional.helpers')(after_each)
 
 local eq = helpers.eq
-local NIL = helpers.NIL
+local NIL = vim.NIL
 local eval = helpers.eval
 local clear = helpers.clear
 local meths = helpers.meths
diff --git a/test/functional/ex_cmds/mksession_spec.lua b/test/functional/ex_cmds/mksession_spec.lua
index 7d93b972d1..1885963bbc 100644
--- a/test/functional/ex_cmds/mksession_spec.lua
+++ b/test/functional/ex_cmds/mksession_spec.lua
@@ -8,7 +8,7 @@ local eq = helpers.eq
 local neq = helpers.neq
 local funcs = helpers.funcs
 local matches = helpers.matches
-local pesc = helpers.pesc
+local pesc = vim.pesc
 local rmdir = helpers.rmdir
 local sleep = helpers.sleep
 local meths = helpers.meths
diff --git a/test/functional/ex_cmds/swapfile_preserve_recover_spec.lua b/test/functional/ex_cmds/swapfile_preserve_recover_spec.lua
index ffecbe0841..105b488f69 100644
--- a/test/functional/ex_cmds/swapfile_preserve_recover_spec.lua
+++ b/test/functional/ex_cmds/swapfile_preserve_recover_spec.lua
@@ -1,6 +1,6 @@
 local Screen = require('test.functional.ui.screen')
 local helpers = require('test.functional.helpers')(after_each)
-local luv = require('luv')
+local uv = vim.uv
 local eq, eval, expect, exec = helpers.eq, helpers.eval, helpers.expect, helpers.exec
 local assert_alive = helpers.assert_alive
 local clear = helpers.clear
@@ -12,7 +12,7 @@ local ok = helpers.ok
 local rmdir = helpers.rmdir
 local new_argv = helpers.new_argv
 local new_pipename = helpers.new_pipename
-local pesc = helpers.pesc
+local pesc = vim.pesc
 local os_kill = helpers.os_kill
 local set_session = helpers.set_session
 local spawn = helpers.spawn
@@ -42,7 +42,7 @@ describe(':recover', function()
 end)
 
 describe("preserve and (R)ecover with custom 'directory'", function()
-  local swapdir = luv.cwd() .. '/Xtest_recover_dir'
+  local swapdir = uv.cwd() .. '/Xtest_recover_dir'
   local testfile = 'Xtest_recover_file1'
   -- Put swapdir at the start of the 'directory' list. #1836
   -- Note: `set swapfile` *must* go after `set directory`: otherwise it may
@@ -129,7 +129,7 @@ describe("preserve and (R)ecover with custom 'directory'", function()
 end)
 
 describe('swapfile detection', function()
-  local swapdir = luv.cwd() .. '/Xtest_swapdialog_dir'
+  local swapdir = uv.cwd() .. '/Xtest_swapdialog_dir'
   local nvim0
   -- Put swapdir at the start of the 'directory' list. #1836
   -- Note: `set swapfile` *must* go after `set directory`: otherwise it may
@@ -376,8 +376,8 @@ describe('swapfile detection', function()
     ]])
 
     -- pretend that the swapfile was created before boot
-    local atime = os.time() - luv.uptime() - 10
-    luv.fs_utime(swname, atime, atime)
+    local atime = os.time() - uv.uptime() - 10
+    uv.fs_utime(swname, atime, atime)
 
     feed(':edit Xswaptest<CR>')
     screen:expect({
@@ -412,7 +412,7 @@ describe('swapfile detection', function()
 end)
 
 describe('quitting swapfile dialog on startup stops TUI properly', function()
-  local swapdir = luv.cwd() .. '/Xtest_swapquit_dir'
+  local swapdir = uv.cwd() .. '/Xtest_swapquit_dir'
   local testfile = 'Xtest_swapquit_file1'
   local otherfile = 'Xtest_swapquit_file2'
   -- Put swapdir at the start of the 'directory' list. #1836