1 files changed, 59 insertions, 61 deletions
diff --git a/test/functional/vimscript/has_spec.lua b/test/functional/vimscript/has_spec.lua
index 78a761d370..82b3db5b67 100644
--- a/test/functional/vimscript/has_spec.lua
+++ b/test/functional/vimscript/has_spec.lua
@@ -3,7 +3,7 @@ local Screen = require('test.functional.ui.screen')
 local clear = helpers.clear
 local connect = helpers.connect
 local eq = helpers.eq
-local funcs = helpers.funcs
+local fn = helpers.fn
 local is_os = helpers.is_os
 local nvim_prog = helpers.nvim_prog
 
@@ -11,85 +11,83 @@ describe('has()', function()
   before_each(clear)
 
   it('"nvim-x.y.z"', function()
-    eq(0, funcs.has("nvim-"))
-    eq(0, funcs.has("nvim-  "))
-    eq(0, funcs.has("nvim- \t "))
-    eq(0, funcs.has("nvim-0. 1. 1"))
-    eq(0, funcs.has("nvim-0. 1.1"))
-    eq(0, funcs.has("nvim-0.1. 1"))
-    eq(0, funcs.has("nvim-a"))
-    eq(0, funcs.has("nvim-a.b.c"))
-    eq(0, funcs.has("nvim-0.b.c"))
-    eq(0, funcs.has("nvim-0.0.c"))
-    eq(0, funcs.has("nvim-0.b.0"))
-    eq(0, funcs.has("nvim-a.b.0"))
-    eq(0, funcs.has("nvim-.0.0.0"))
-    eq(0, funcs.has("nvim-.0"))
-    eq(0, funcs.has("nvim-0."))
-    eq(0, funcs.has("nvim-0.."))
-    eq(0, funcs.has("nvim-."))
-    eq(0, funcs.has("nvim-.."))
-    eq(0, funcs.has("nvim-..."))
-    eq(0, funcs.has("nvim-42"))
-    eq(0, funcs.has("nvim-9999"))
-    eq(0, funcs.has("nvim-99.001.05"))
+    eq(0, fn.has('nvim-'))
+    eq(0, fn.has('nvim-  '))
+    eq(0, fn.has('nvim- \t '))
+    eq(0, fn.has('nvim-0. 1. 1'))
+    eq(0, fn.has('nvim-0. 1.1'))
+    eq(0, fn.has('nvim-0.1. 1'))
+    eq(0, fn.has('nvim-a'))
+    eq(0, fn.has('nvim-a.b.c'))
+    eq(0, fn.has('nvim-0.b.c'))
+    eq(0, fn.has('nvim-0.0.c'))
+    eq(0, fn.has('nvim-0.b.0'))
+    eq(0, fn.has('nvim-a.b.0'))
+    eq(0, fn.has('nvim-.0.0.0'))
+    eq(0, fn.has('nvim-.0'))
+    eq(0, fn.has('nvim-0.'))
+    eq(0, fn.has('nvim-0..'))
+    eq(0, fn.has('nvim-.'))
+    eq(0, fn.has('nvim-..'))
+    eq(0, fn.has('nvim-...'))
+    eq(0, fn.has('nvim-42'))
+    eq(0, fn.has('nvim-9999'))
+    eq(0, fn.has('nvim-99.001.05'))
 
-    eq(1, funcs.has("nvim"))
-    eq(1, funcs.has("nvim-0"))
-    eq(1, funcs.has("nvim-0.1"))
-    eq(1, funcs.has("nvim-0.0.0"))
-    eq(1, funcs.has("nvim-0.1.1."))
-    eq(1, funcs.has("nvim-0.1.1.abc"))
-    eq(1, funcs.has("nvim-0.1.1.."))
-    eq(1, funcs.has("nvim-0.1.1.. .."))
-    eq(1, funcs.has("nvim-0.1.1.... "))
-    eq(1, funcs.has("nvim-0.0.0"))
-    eq(1, funcs.has("nvim-0.0.1"))
-    eq(1, funcs.has("nvim-0.1.0"))
-    eq(1, funcs.has("nvim-0.1.1"))
-    eq(1, funcs.has("nvim-0.1.5"))
-    eq(1, funcs.has("nvim-0000.001.05"))
-    eq(1, funcs.has("nvim-0.01.005"))
-    eq(1, funcs.has("nvim-00.001.05"))
+    eq(1, fn.has('nvim'))
+    eq(1, fn.has('nvim-0'))
+    eq(1, fn.has('nvim-0.1'))
+    eq(1, fn.has('nvim-0.0.0'))
+    eq(1, fn.has('nvim-0.1.1.'))
+    eq(1, fn.has('nvim-0.1.1.abc'))
+    eq(1, fn.has('nvim-0.1.1..'))
+    eq(1, fn.has('nvim-0.1.1.. ..'))
+    eq(1, fn.has('nvim-0.1.1.... '))
+    eq(1, fn.has('nvim-0.0.0'))
+    eq(1, fn.has('nvim-0.0.1'))
+    eq(1, fn.has('nvim-0.1.0'))
+    eq(1, fn.has('nvim-0.1.1'))
+    eq(1, fn.has('nvim-0.1.5'))
+    eq(1, fn.has('nvim-0000.001.05'))
+    eq(1, fn.has('nvim-0.01.005'))
+    eq(1, fn.has('nvim-00.001.05'))
   end)
 
   it('"unnamedplus"', function()
-    if (not is_os('win')) and funcs.has("clipboard") == 1 then
-      eq(1, funcs.has("unnamedplus"))
+    if (not is_os('win')) and fn.has('clipboard') == 1 then
+      eq(1, fn.has('unnamedplus'))
     else
-      eq(0, funcs.has("unnamedplus"))
+      eq(0, fn.has('unnamedplus'))
     end
   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'))
+      eq(1, fn.has('wsl'))
     else
-      eq(0, funcs.has('wsl'))
+      eq(0, fn.has('wsl'))
     end
   end)
 
   it('"gui_running"', function()
-    eq(0, funcs.has('gui_running'))
-    local tui = Screen.new(50,15)
-    local gui_session = connect(funcs.serverstart())
-    local gui = Screen.new(50,15)
-    eq(0, funcs.has('gui_running'))
-    tui:attach({ext_linegrid=true, rgb=true, stdin_tty=true, stdout_tty=true})
-    gui:attach({ext_multigrid=true, rgb=true}, gui_session)
-    eq(1, funcs.has('gui_running'))
+    eq(0, fn.has('gui_running'))
+    local tui = Screen.new(50, 15)
+    local gui_session = connect(fn.serverstart())
+    local gui = Screen.new(50, 15)
+    eq(0, fn.has('gui_running'))
+    tui:attach({ ext_linegrid = true, rgb = true, stdin_tty = true, stdout_tty = true })
+    gui:attach({ ext_multigrid = true, rgb = true }, gui_session)
+    eq(1, fn.has('gui_running'))
     tui:detach()
-    eq(1, funcs.has('gui_running'))
+    eq(1, fn.has('gui_running'))
     gui:detach()
-    eq(0, funcs.has('gui_running'))
+    eq(0, fn.has('gui_running'))
   end)
 
   it('does not change v:shell_error', function()
-    funcs.system({nvim_prog, '-es', '+73cquit'})
-    funcs.has('python3') -- use a call whose implementation shells out
-    eq(73, funcs.eval('v:shell_error'))
+    fn.system({ nvim_prog, '-es', '+73cquit' })
+    fn.has('python3') -- use a call whose implementation shells out
+    eq(73, fn.eval('v:shell_error'))
   end)
 end)