test: do not inject vim module into global helpers

8 files changed, 11 insertions, 11 deletions

diff --git a/test/functional/lua/api_spec.lua b/test/functional/lua/api_spec.lua
index 55f9ba7e13..d10802440f 100644
--- a/test/functional/lua/api_spec.lua
+++ b/test/functional/lua/api_spec.lua
@@ -6,7 +6,7 @@ local remove_trace = helpers.remove_trace
 local funcs = helpers.funcs
 local clear = helpers.clear
 local eval = helpers.eval
-local NIL = helpers.NIL
+local NIL = vim.NIL
 local eq = helpers.eq
 local exec_lua = helpers.exec_lua
 local pcall_err = helpers.pcall_err
diff --git a/test/functional/lua/commands_spec.lua b/test/functional/lua/commands_spec.lua
index b7bf2b2eae..8d5badb92b 100644
--- a/test/functional/lua/commands_spec.lua
+++ b/test/functional/lua/commands_spec.lua
@@ -3,7 +3,7 @@ local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 
 local eq = helpers.eq
-local NIL = helpers.NIL
+local NIL = vim.NIL
 local eval = helpers.eval
 local feed = helpers.feed
 local clear = helpers.clear
diff --git a/test/functional/lua/diagnostic_spec.lua b/test/functional/lua/diagnostic_spec.lua
index 22ef66bc60..de1c139344 100644
--- a/test/functional/lua/diagnostic_spec.lua
+++ b/test/functional/lua/diagnostic_spec.lua
@@ -1,6 +1,6 @@
 local helpers = require('test.functional.helpers')(after_each)
 
-local NIL = helpers.NIL
+local NIL = vim.NIL
 local command = helpers.command
 local clear = helpers.clear
 local exec_lua = helpers.exec_lua
diff --git a/test/functional/lua/luaeval_spec.lua b/test/functional/lua/luaeval_spec.lua
index 45a7258884..5efc15417a 100644
--- a/test/functional/lua/luaeval_spec.lua
+++ b/test/functional/lua/luaeval_spec.lua
@@ -12,7 +12,7 @@ local funcs = helpers.funcs
 local clear = helpers.clear
 local eval = helpers.eval
 local feed = helpers.feed
-local NIL = helpers.NIL
+local NIL = vim.NIL
 local eq = helpers.eq
 
 before_each(clear)
diff --git a/test/functional/lua/overrides_spec.lua b/test/functional/lua/overrides_spec.lua
index 0f1c7d8a51..00458ecc34 100644
--- a/test/functional/lua/overrides_spec.lua
+++ b/test/functional/lua/overrides_spec.lua
@@ -3,7 +3,7 @@ local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 
 local eq = helpers.eq
-local NIL = helpers.NIL
+local NIL = vim.NIL
 local feed = helpers.feed
 local clear = helpers.clear
 local funcs = helpers.funcs
diff --git a/test/functional/lua/secure_spec.lua b/test/functional/lua/secure_spec.lua
index 52770867a8..05311d153f 100644
--- a/test/functional/lua/secure_spec.lua
+++ b/test/functional/lua/secure_spec.lua
@@ -73,7 +73,7 @@ describe('vim.secure', function()
 
       local trust = helpers.read_file(funcs.stdpath('state') .. pathsep .. 'trust')
       eq(string.format('! %s', cwd .. pathsep .. 'Xfile'), vim.trim(trust))
-      eq(helpers.NIL, exec_lua([[return vim.secure.read('Xfile')]]))
+      eq(vim.NIL, exec_lua([[return vim.secure.read('Xfile')]]))
 
       os.remove(funcs.stdpath('state') .. pathsep .. 'trust')
 
@@ -103,7 +103,7 @@ describe('vim.secure', function()
       local hash = funcs.sha256(helpers.read_file('Xfile'))
       trust = helpers.read_file(funcs.stdpath('state') .. pathsep .. 'trust')
       eq(string.format('%s %s', hash, cwd .. pathsep .. 'Xfile'), vim.trim(trust))
-      eq(helpers.NIL, exec_lua([[vim.secure.read('Xfile')]]))
+      eq(vim.NIL, exec_lua([[vim.secure.read('Xfile')]]))
 
       os.remove(funcs.stdpath('state') .. pathsep .. 'trust')
 
diff --git a/test/functional/lua/thread_spec.lua b/test/functional/lua/thread_spec.lua
index 0a7a7f0448..c1981e19d4 100644
--- a/test/functional/lua/thread_spec.lua
+++ b/test/functional/lua/thread_spec.lua
@@ -6,7 +6,7 @@ local feed = helpers.feed
 local eq = helpers.eq
 local exec_lua = helpers.exec_lua
 local next_msg = helpers.next_msg
-local NIL = helpers.NIL
+local NIL = vim.NIL
 local pcall_err = helpers.pcall_err
 
 describe('thread', function()
diff --git a/test/functional/lua/vim_spec.lua b/test/functional/lua/vim_spec.lua
index 4ebba827ef..d38d8eaf90 100644
--- a/test/functional/lua/vim_spec.lua
+++ b/test/functional/lua/vim_spec.lua
@@ -11,14 +11,14 @@ local insert = helpers.insert
 local clear = helpers.clear
 local eq = helpers.eq
 local ok = helpers.ok
-local pesc = helpers.pesc
+local pesc = vim.pesc
 local eval = helpers.eval
 local feed = helpers.feed
 local pcall_err = helpers.pcall_err
 local exec_lua = helpers.exec_lua
 local matches = helpers.matches
 local exec = helpers.exec
-local NIL = helpers.NIL
+local NIL = vim.NIL
 local retry = helpers.retry
 local next_msg = helpers.next_msg
 local remove_trace = helpers.remove_trace
@@ -1196,7 +1196,7 @@ describe('lua stdlib', function()
       end)
     ]])
 
-    helpers.poke_eventloop()
+    poke_eventloop()
     eq('hello', exec_lua [[return vim.g.fnres]])
   end)