1 files changed, 21 insertions, 22 deletions
diff --git a/test/functional/vimscript/writefile_spec.lua b/test/functional/vimscript/writefile_spec.lua
index b83d6c4a25..051e3794a3 100644
--- a/test/functional/vimscript/writefile_spec.lua
+++ b/test/functional/vimscript/writefile_spec.lua
@@ -1,11 +1,10 @@
 local helpers = require('test.functional.helpers')(after_each)
-local luv = require('luv')
 
 local mkdir = helpers.mkdir
 local clear = helpers.clear
 local eq = helpers.eq
-local funcs = helpers.funcs
-local meths = helpers.meths
+local fn = helpers.fn
+local api = helpers.api
 local exc_exec = helpers.exc_exec
 local read_file = helpers.read_file
 local write_file = helpers.write_file
@@ -28,26 +27,26 @@ 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()
   it('writes empty list to a file', function()
     eq(nil, read_file(fname))
-    eq(0, funcs.writefile({}, fname))
+    eq(0, fn.writefile({}, fname))
     eq('', read_file(fname))
     os.remove(fname)
     eq(nil, read_file(fname))
-    eq(0, funcs.writefile({}, fname, 'b'))
+    eq(0, fn.writefile({}, fname, 'b'))
     eq('', read_file(fname))
     os.remove(fname)
     eq(nil, read_file(fname))
-    eq(0, funcs.writefile({}, fname, 'ab'))
+    eq(0, fn.writefile({}, fname, 'ab'))
     eq('', read_file(fname))
     os.remove(fname)
     eq(nil, read_file(fname))
-    eq(0, funcs.writefile({}, fname, 'a'))
+    eq(0, fn.writefile({}, fname, 'a'))
     eq('', read_file(fname))
   end)
 
@@ -67,41 +66,41 @@ describe('writefile()', function()
 
   it('appends to a file', function()
     eq(nil, read_file(fname))
-    eq(0, funcs.writefile({ 'abc', 'def', 'ghi' }, fname))
+    eq(0, fn.writefile({ 'abc', 'def', 'ghi' }, fname))
     eq('abc\ndef\nghi\n', read_file(fname))
-    eq(0, funcs.writefile({ 'jkl' }, fname, 'a'))
+    eq(0, fn.writefile({ 'jkl' }, fname, 'a'))
     eq('abc\ndef\nghi\njkl\n', read_file(fname))
     os.remove(fname)
     eq(nil, read_file(fname))
-    eq(0, funcs.writefile({ 'abc', 'def', 'ghi' }, fname, 'b'))
+    eq(0, fn.writefile({ 'abc', 'def', 'ghi' }, fname, 'b'))
     eq('abc\ndef\nghi', read_file(fname))
-    eq(0, funcs.writefile({ 'jkl' }, fname, 'ab'))
+    eq(0, fn.writefile({ 'jkl' }, fname, 'ab'))
     eq('abc\ndef\nghijkl', read_file(fname))
   end)
 
   it('correctly treats NLs', function()
-    eq(0, funcs.writefile({ '\na\nb\n' }, fname, 'b'))
+    eq(0, fn.writefile({ '\na\nb\n' }, fname, 'b'))
     eq('\0a\0b\0', read_file(fname))
-    eq(0, funcs.writefile({ 'a\n\n\nb' }, fname, 'b'))
+    eq(0, fn.writefile({ 'a\n\n\nb' }, fname, 'b'))
     eq('a\0\0\0b', read_file(fname))
   end)
 
   it('writes with s and S', function()
-    eq(0, funcs.writefile({ '\na\nb\n' }, fname, 'bs'))
+    eq(0, fn.writefile({ '\na\nb\n' }, fname, 'bs'))
     eq('\0a\0b\0', read_file(fname))
-    eq(0, funcs.writefile({ 'a\n\n\nb' }, fname, 'bS'))
+    eq(0, fn.writefile({ 'a\n\n\nb' }, fname, 'bS'))
     eq('a\0\0\0b', read_file(fname))
   end)
 
   it('correctly overwrites file', function()
-    eq(0, funcs.writefile({ '\na\nb\n' }, fname, 'b'))
+    eq(0, fn.writefile({ '\na\nb\n' }, fname, 'b'))
     eq('\0a\0b\0', read_file(fname))
-    eq(0, funcs.writefile({ 'a\n' }, fname, 'b'))
+    eq(0, fn.writefile({ 'a\n' }, fname, 'b'))
     eq('a\0', read_file(fname))
   end)
 
   it('shows correct file name when supplied numbers', function()
-    meths.set_current_dir(dname)
+    api.nvim_set_current_dir(dname)
     eq(
       "Vim(call):E482: Can't open file 2 for writing: illegal operation on a directory",
       pcall_err(command, ('call writefile([42], %s)'):format(ddname_tail))
@@ -111,12 +110,12 @@ describe('writefile()', function()
   it('writefile(..., "p") creates missing parent directories', function()
     os.remove(dname)
     eq(nil, read_file(dfname))
-    eq(0, funcs.writefile({ 'abc', 'def', 'ghi' }, dfname, 'p'))
+    eq(0, fn.writefile({ 'abc', 'def', 'ghi' }, dfname, 'p'))
     eq('abc\ndef\nghi\n', read_file(dfname))
     os.remove(dfname)
     os.remove(dname)
     eq(nil, read_file(dfname))
-    eq(0, funcs.writefile({ '\na\nb\n' }, dfname, 'pb'))
+    eq(0, fn.writefile({ '\na\nb\n' }, dfname, 'pb'))
     eq('\0a\0b\0', read_file(dfname))
     os.remove(dfname)
     os.remove(dname)