Merge pull request #26994 from lewis6991/vimhelpers

test: big cleanup

1 files changed, 8 insertions, 8 deletions

diff --git a/test/functional/ui/messages_spec.lua b/test/functional/ui/messages_spec.lua
index 2a402437fd..4f95cd909c 100644
--- a/test/functional/ui/messages_spec.lua
+++ b/test/functional/ui/messages_spec.lua
@@ -5,7 +5,7 @@ local eval = helpers.eval
 local eq = helpers.eq
 local command = helpers.command
 local set_method_error = helpers.set_method_error
-local meths = helpers.meths
+local api = helpers.api
 local async_meths = helpers.async_meths
 local test_build_dir = helpers.test_build_dir
 local nvim_prog = helpers.nvim_prog
@@ -17,7 +17,7 @@ local poke_eventloop = helpers.poke_eventloop
 local assert_alive = helpers.assert_alive
 local is_os = helpers.is_os
 local is_ci = helpers.is_ci
-local funcs = helpers.funcs
+local fn = helpers.fn
 local skip = helpers.skip
 
 describe('ui/ext_messages', function()
@@ -1445,7 +1445,7 @@ vimComment     xxx match /\s"[^\-:.%#=*].*$/ms=s+1,lc=1  excludenl contains=@vim
 
   it('prints lines in Ex mode correctly with a burst of carriage returns #19341', function()
     command('set number')
-    meths.buf_set_lines(0, 0, 0, true, { 'aaa', 'bbb', 'ccc' })
+    api.nvim_buf_set_lines(0, 0, 0, true, { 'aaa', 'bbb', 'ccc' })
     feed('gggQ<CR><CR>1<CR><CR>vi')
     screen:expect([[
       Entering Ex mode.  Type "visual" to go to Normal mode.      |
@@ -1542,7 +1542,7 @@ vimComment     xxx match /\s"[^\-:.%#=*].*$/ms=s+1,lc=1  excludenl contains=@vim
       {1:~                                                           }|*5
                                                                   |
     ]])
-    eq(1, meths.get_option_value('cmdheight', {}))
+    eq(1, api.nvim_get_option_value('cmdheight', {}))
   end)
 
   it('using nvim_echo in VimResized does not cause hit-enter prompt #26139', function()
@@ -1553,7 +1553,7 @@ vimComment     xxx match /\s"[^\-:.%#=*].*$/ms=s+1,lc=1  excludenl contains=@vim
       {1:~                                                           }|*3
                                                                   |
     ]])
-    eq({ mode = 'n', blocking = false }, meths.get_mode())
+    eq({ mode = 'n', blocking = false }, api.nvim_get_mode())
   end)
 end)
 
@@ -1675,9 +1675,9 @@ describe('ui/ext_messages', function()
     })
 
     feed(':set mouse=a<cr>')
-    meths.input_mouse('left', 'press', '', 0, 12, 10)
+    api.nvim_input_mouse('left', 'press', '', 0, 12, 10)
     poke_eventloop()
-    meths.input_mouse('left', 'drag', '', 0, 11, 10)
+    api.nvim_input_mouse('left', 'drag', '', 0, 11, 10)
     feed('<c-l>')
     feed(':set cmdheight<cr>')
     screen:expect({
@@ -2183,7 +2183,7 @@ aliquip ex ea commodo consequat.]]
   end)
 
   it('with :!cmd does not crash on resize', function()
-    skip(funcs.executable('sleep') == 0, 'missing "sleep" command')
+    skip(fn.executable('sleep') == 0, 'missing "sleep" command')
     feed(':!sleep 1<cr>')
     screen:expect {
       grid = [[