1 files changed, 25 insertions, 26 deletions
diff --git a/test/functional/shada/buffers_spec.lua b/test/functional/shada/buffers_spec.lua
index b1c4ded541..9fead98fed 100644
--- a/test/functional/shada/buffers_spec.lua
+++ b/test/functional/shada/buffers_spec.lua
@@ -1,7 +1,6 @@
 -- shada buffer list saving/reading support
 local helpers = require('test.functional.helpers')(after_each)
-local nvim_command, funcs, eq, curbufmeths, meths =
-  helpers.command, helpers.funcs, helpers.eq, helpers.curbufmeths, helpers.meths
+local nvim_command, fn, eq, api = helpers.command, helpers.fn, helpers.eq, helpers.api
 local expect_exit = helpers.expect_exit
 
 local shada_helpers = require('test.functional.shada.helpers')
@@ -18,10 +17,10 @@ describe('shada support code', function()
     nvim_command('edit ' .. testfilename_2)
     expect_exit(nvim_command, 'qall')
     reset('set shada+=%')
-    eq(3, funcs.bufnr('$'))
-    eq('', funcs.bufname(1))
-    eq(testfilename, funcs.bufname(2))
-    eq(testfilename_2, funcs.bufname(3))
+    eq(3, fn.bufnr('$'))
+    eq('', fn.bufname(1))
+    eq(testfilename, fn.bufname(2))
+    eq(testfilename_2, fn.bufname(3))
   end)
 
   it('does not restore buffer list without % in &shada', function()
@@ -30,8 +29,8 @@ describe('shada support code', function()
     nvim_command('edit ' .. testfilename_2)
     expect_exit(nvim_command, 'qall')
     reset()
-    eq(1, funcs.bufnr('$'))
-    eq('', funcs.bufname(1))
+    eq(1, fn.bufnr('$'))
+    eq('', fn.bufname(1))
   end)
 
   it('does not dump buffer list without % in &shada', function()
@@ -40,44 +39,44 @@ describe('shada support code', function()
     nvim_command('edit ' .. testfilename_2)
     expect_exit(nvim_command, 'qall')
     reset('set shada+=%')
-    eq(1, funcs.bufnr('$'))
-    eq('', funcs.bufname(1))
+    eq(1, fn.bufnr('$'))
+    eq('', fn.bufname(1))
   end)
 
   it('does not dump unlisted buffer', function()
     reset('set shada+=%')
     nvim_command('edit ' .. testfilename)
     nvim_command('edit ' .. testfilename_2)
-    meths.set_option_value('buflisted', false, {})
+    api.nvim_set_option_value('buflisted', false, {})
     expect_exit(nvim_command, 'qall')
     reset('set shada+=%')
-    eq(2, funcs.bufnr('$'))
-    eq('', funcs.bufname(1))
-    eq(testfilename, funcs.bufname(2))
+    eq(2, fn.bufnr('$'))
+    eq('', fn.bufname(1))
+    eq(testfilename, fn.bufname(2))
   end)
 
   it('does not dump quickfix buffer', function()
     reset('set shada+=%')
     nvim_command('edit ' .. testfilename)
     nvim_command('edit ' .. testfilename_2)
-    meths.set_option_value('buftype', 'quickfix', {})
+    api.nvim_set_option_value('buftype', 'quickfix', {})
     expect_exit(nvim_command, 'qall')
     reset('set shada+=%')
-    eq(2, funcs.bufnr('$'))
-    eq('', funcs.bufname(1))
-    eq(testfilename, funcs.bufname(2))
+    eq(2, fn.bufnr('$'))
+    eq('', fn.bufname(1))
+    eq(testfilename, fn.bufname(2))
   end)
 
   it('does not dump unnamed buffers', function()
     reset('set shada+=% hidden')
-    curbufmeths.set_lines(0, 1, true, {'foo'})
+    api.nvim_buf_set_lines(0, 0, 1, true, { 'foo' })
     nvim_command('enew')
-    curbufmeths.set_lines(0, 1, true, {'bar'})
-    eq(2, funcs.bufnr('$'))
+    api.nvim_buf_set_lines(0, 0, 1, true, { 'bar' })
+    eq(2, fn.bufnr('$'))
     expect_exit(nvim_command, 'qall!')
     reset('set shada+=% hidden')
-    eq(1, funcs.bufnr('$'))
-    eq('', funcs.bufname(1))
+    eq(1, fn.bufnr('$'))
+    eq('', fn.bufname(1))
   end)
 
   it('restores 1 buffer with %1 in &shada, #5759', function()
@@ -86,8 +85,8 @@ describe('shada support code', function()
     nvim_command('edit ' .. testfilename_2)
     expect_exit(nvim_command, 'qall')
     reset('set shada+=%1')
-    eq(2, funcs.bufnr('$'))
-    eq('', funcs.bufname(1))
-    eq(testfilename, funcs.bufname(2))
+    eq(2, fn.bufnr('$'))
+    eq('', fn.bufname(1))
+    eq(testfilename, fn.bufname(2))
   end)
 end)