test: do not inject vim module into global helpers

7 files changed, 8 insertions, 8 deletions

diff --git a/test/functional/vimscript/ctx_functions_spec.lua b/test/functional/vimscript/ctx_functions_spec.lua
index 01daeddbab..c336f3cb2d 100644
--- a/test/functional/vimscript/ctx_functions_spec.lua
+++ b/test/functional/vimscript/ctx_functions_spec.lua
@@ -6,12 +6,12 @@ local command = helpers.command
 local eq = helpers.eq
 local eval = helpers.eval
 local feed = helpers.feed
-local map = helpers.tbl_map
+local map = vim.tbl_map
 local nvim = helpers.nvim
 local parse_context = helpers.parse_context
 local exec_capture = helpers.exec_capture
 local source = helpers.source
-local trim = helpers.trim
+local trim = vim.trim
 local write_file = helpers.write_file
 local pcall_err = helpers.pcall_err
 
diff --git a/test/functional/vimscript/input_spec.lua b/test/functional/vimscript/input_spec.lua
index 8a634a6700..52c28869ff 100644
--- a/test/functional/vimscript/input_spec.lua
+++ b/test/functional/vimscript/input_spec.lua
@@ -10,7 +10,7 @@ local command = helpers.command
 local exc_exec = helpers.exc_exec
 local pcall_err = helpers.pcall_err
 local async_meths = helpers.async_meths
-local NIL = helpers.NIL
+local NIL = vim.NIL
 
 local screen
 
diff --git a/test/functional/vimscript/json_functions_spec.lua b/test/functional/vimscript/json_functions_spec.lua
index a93caf8405..e469b45b34 100644
--- a/test/functional/vimscript/json_functions_spec.lua
+++ b/test/functional/vimscript/json_functions_spec.lua
@@ -7,7 +7,7 @@ local eval = helpers.eval
 local command = helpers.command
 local exc_exec = helpers.exc_exec
 local pcall_err = helpers.pcall_err
-local NIL = helpers.NIL
+local NIL = vim.NIL
 local source = helpers.source
 
 describe('json_decode() function', function()
diff --git a/test/functional/vimscript/screenchar_spec.lua b/test/functional/vimscript/screenchar_spec.lua
index 767e3c57ef..5df9c480e8 100644
--- a/test/functional/vimscript/screenchar_spec.lua
+++ b/test/functional/vimscript/screenchar_spec.lua
@@ -1,7 +1,7 @@
 local helpers = require('test.functional.helpers')(after_each)
 local clear, eq, neq = helpers.clear, helpers.eq, helpers.neq
 local command, meths, funcs = helpers.command, helpers.meths, helpers.funcs
-local tbl_deep_extend = helpers.tbl_deep_extend
+local tbl_deep_extend = vim.tbl_deep_extend
 
 -- Set up two overlapping floating windows
 local setup_floating_windows = function()
diff --git a/test/functional/vimscript/sort_spec.lua b/test/functional/vimscript/sort_spec.lua
index a5119a737f..ca769b9f16 100644
--- a/test/functional/vimscript/sort_spec.lua
+++ b/test/functional/vimscript/sort_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/vimscript/special_vars_spec.lua b/test/functional/vimscript/special_vars_spec.lua
index 4266336652..80c3c45561 100644
--- a/test/functional/vimscript/special_vars_spec.lua
+++ b/test/functional/vimscript/special_vars_spec.lua
@@ -6,7 +6,7 @@ local clear = helpers.clear
 local eval = helpers.eval
 local eq = helpers.eq
 local meths = helpers.meths
-local NIL = helpers.NIL
+local NIL = vim.NIL
 
 describe('Special values', function()
   before_each(clear)
diff --git a/test/functional/vimscript/string_spec.lua b/test/functional/vimscript/string_spec.lua
index 719fea2c96..aa93ddb27f 100644
--- a/test/functional/vimscript/string_spec.lua
+++ b/test/functional/vimscript/string_spec.lua
@@ -7,7 +7,7 @@ local eval = helpers.eval
 local exc_exec = helpers.exc_exec
 local pcall_err = helpers.pcall_err
 local funcs = helpers.funcs
-local NIL = helpers.NIL
+local NIL = vim.NIL
 local source = helpers.source
 
 describe('string() function', function()