test: use vim.mpack and vim.uv directly

4 files changed, 6 insertions, 11 deletions

diff --git a/test/functional/vimscript/buf_functions_spec.lua b/test/functional/vimscript/buf_functions_spec.lua
index c17edfad62..1b722247a8 100644
--- a/test/functional/vimscript/buf_functions_spec.lua
+++ b/test/functional/vimscript/buf_functions_spec.lua
@@ -1,7 +1,5 @@
 local helpers = require('test.functional.helpers')(after_each)
 
-local luv = require('luv')
-
 local eq = helpers.eq
 local clear = helpers.clear
 local funcs = helpers.funcs
@@ -87,7 +85,7 @@ describe('bufname() function', function()
   it('returns expected buffer name', function()
     eq('', funcs.bufname('%')) -- Buffer has no name yet
     command('file ' .. fname)
-    local wd = luv.cwd()
+    local wd = vim.uv.cwd()
     local sep = get_pathsep()
     local curdirname = funcs.fnamemodify(wd, ':t')
     for _, arg in ipairs({ '%', 1, 'X', wd }) do
@@ -120,7 +118,7 @@ describe('bufnr() function', function()
   it('returns expected buffer number', function()
     eq(1, funcs.bufnr('%'))
     command('file ' .. fname)
-    local wd = luv.cwd()
+    local wd = vim.uv.cwd()
     local curdirname = funcs.fnamemodify(wd, ':t')
     eq(1, funcs.bufnr(fname))
     eq(1, funcs.bufnr(wd))
diff --git a/test/functional/vimscript/glob_spec.lua b/test/functional/vimscript/glob_spec.lua
index ea49552310..77351f95fa 100644
--- a/test/functional/vimscript/glob_spec.lua
+++ b/test/functional/vimscript/glob_spec.lua
@@ -1,4 +1,3 @@
-local luv = require('luv')
 local helpers = require('test.functional.helpers')(after_each)
 local clear, command, eval, eq = helpers.clear, helpers.command, helpers.eval, helpers.eq
 local mkdir = helpers.mkdir
@@ -12,7 +11,7 @@ before_each(function()
 end)
 
 after_each(function()
-  luv.fs_rmdir('test-glob')
+  vim.uv.fs_rmdir('test-glob')
 end)
 
 describe('glob()', function()
diff --git a/test/functional/vimscript/has_spec.lua b/test/functional/vimscript/has_spec.lua
index 4e232daeb3..c797a3bbf9 100644
--- a/test/functional/vimscript/has_spec.lua
+++ b/test/functional/vimscript/has_spec.lua
@@ -62,8 +62,7 @@ describe('has()', function()
   end)
 
   it('"wsl"', function()
-    local luv = require('luv')
-    local is_wsl = luv.os_uname()['release']:lower():match('microsoft') and true or false
+    local is_wsl = vim.uv.os_uname()['release']:lower():match('microsoft') and true or false
     if is_wsl then
       eq(1, funcs.has('wsl'))
     else
diff --git a/test/functional/vimscript/writefile_spec.lua b/test/functional/vimscript/writefile_spec.lua
index b83d6c4a25..f03baa6ddd 100644
--- a/test/functional/vimscript/writefile_spec.lua
+++ b/test/functional/vimscript/writefile_spec.lua
@@ -1,5 +1,4 @@
 local helpers = require('test.functional.helpers')(after_each)
-local luv = require('luv')
 
 local mkdir = helpers.mkdir
 local clear = helpers.clear
@@ -28,8 +27,8 @@ end)
 after_each(function()
   os.remove(fname)
   os.remove(dfname)
-  luv.fs_rmdir(ddname)
-  luv.fs_rmdir(dname)
+  vim.uv.fs_rmdir(ddname)
+  vim.uv.fs_rmdir(dname)
 end)
 
 describe('writefile()', function()