1 files changed, 31 insertions, 31 deletions
diff --git a/test/functional/api/tabpage_spec.lua b/test/functional/api/tabpage_spec.lua
index 830b547da5..65b030fc60 100644
--- a/test/functional/api/tabpage_spec.lua
+++ b/test/functional/api/tabpage_spec.lua
@@ -1,7 +1,7 @@
 local helpers = require('test.functional.helpers')(after_each)
 local clear, eq, ok = helpers.clear, helpers.eq, helpers.ok
-local meths = helpers.meths
-local funcs = helpers.funcs
+local api = helpers.api
+local fn = helpers.fn
 local request = helpers.request
 local NIL = vim.NIL
 local pcall_err = helpers.pcall_err
@@ -14,33 +14,33 @@ describe('api/tabpage', function()
     it('works', function()
       helpers.command('tabnew')
       helpers.command('vsplit')
-      local tab1, tab2 = unpack(meths.nvim_list_tabpages())
-      local win1, win2, win3 = unpack(meths.nvim_list_wins())
-      eq({ win1 }, meths.nvim_tabpage_list_wins(tab1))
-      eq({ win2, win3 }, meths.nvim_tabpage_list_wins(tab2))
-      eq(win2, meths.nvim_tabpage_get_win(tab2))
-      meths.nvim_set_current_win(win3)
-      eq(win3, meths.nvim_tabpage_get_win(tab2))
+      local tab1, tab2 = unpack(api.nvim_list_tabpages())
+      local win1, win2, win3 = unpack(api.nvim_list_wins())
+      eq({ win1 }, api.nvim_tabpage_list_wins(tab1))
+      eq({ win2, win3 }, api.nvim_tabpage_list_wins(tab2))
+      eq(win2, api.nvim_tabpage_get_win(tab2))
+      api.nvim_set_current_win(win3)
+      eq(win3, api.nvim_tabpage_get_win(tab2))
     end)
 
     it('validates args', function()
-      eq('Invalid tabpage id: 23', pcall_err(meths.nvim_tabpage_list_wins, 23))
+      eq('Invalid tabpage id: 23', pcall_err(api.nvim_tabpage_list_wins, 23))
     end)
   end)
 
   describe('{get,set,del}_var', function()
     it('works', function()
-      meths.nvim_tabpage_set_var(0, 'lua', { 1, 2, { ['3'] = 1 } })
-      eq({ 1, 2, { ['3'] = 1 } }, meths.nvim_tabpage_get_var(0, 'lua'))
-      eq({ 1, 2, { ['3'] = 1 } }, meths.nvim_eval('t:lua'))
-      eq(1, funcs.exists('t:lua'))
-      meths.nvim_tabpage_del_var(0, 'lua')
-      eq(0, funcs.exists('t:lua'))
-      eq('Key not found: lua', pcall_err(meths.nvim_tabpage_del_var, 0, 'lua'))
-      meths.nvim_tabpage_set_var(0, 'lua', 1)
+      api.nvim_tabpage_set_var(0, 'lua', { 1, 2, { ['3'] = 1 } })
+      eq({ 1, 2, { ['3'] = 1 } }, api.nvim_tabpage_get_var(0, 'lua'))
+      eq({ 1, 2, { ['3'] = 1 } }, api.nvim_eval('t:lua'))
+      eq(1, fn.exists('t:lua'))
+      api.nvim_tabpage_del_var(0, 'lua')
+      eq(0, fn.exists('t:lua'))
+      eq('Key not found: lua', pcall_err(api.nvim_tabpage_del_var, 0, 'lua'))
+      api.nvim_tabpage_set_var(0, 'lua', 1)
       command('lockvar t:lua')
-      eq('Key is locked: lua', pcall_err(meths.nvim_tabpage_del_var, 0, 'lua'))
-      eq('Key is locked: lua', pcall_err(meths.nvim_tabpage_set_var, 0, 'lua', 1))
+      eq('Key is locked: lua', pcall_err(api.nvim_tabpage_del_var, 0, 'lua'))
+      eq('Key is locked: lua', pcall_err(api.nvim_tabpage_set_var, 0, 'lua', 1))
     end)
 
     it('tabpage_set_var returns the old value', function()
@@ -61,28 +61,28 @@ describe('api/tabpage', function()
 
   describe('get_number', function()
     it('works', function()
-      local tabs = meths.nvim_list_tabpages()
-      eq(1, meths.nvim_tabpage_get_number(tabs[1]))
+      local tabs = api.nvim_list_tabpages()
+      eq(1, api.nvim_tabpage_get_number(tabs[1]))
 
       helpers.command('tabnew')
-      local tab1, tab2 = unpack(meths.nvim_list_tabpages())
-      eq(1, meths.nvim_tabpage_get_number(tab1))
-      eq(2, meths.nvim_tabpage_get_number(tab2))
+      local tab1, tab2 = unpack(api.nvim_list_tabpages())
+      eq(1, api.nvim_tabpage_get_number(tab1))
+      eq(2, api.nvim_tabpage_get_number(tab2))
 
       helpers.command('-tabmove')
-      eq(2, meths.nvim_tabpage_get_number(tab1))
-      eq(1, meths.nvim_tabpage_get_number(tab2))
+      eq(2, api.nvim_tabpage_get_number(tab1))
+      eq(1, api.nvim_tabpage_get_number(tab2))
     end)
   end)
 
   describe('is_valid', function()
     it('works', function()
       helpers.command('tabnew')
-      local tab = meths.nvim_list_tabpages()[2]
-      meths.nvim_set_current_tabpage(tab)
-      ok(meths.nvim_tabpage_is_valid(tab))
+      local tab = api.nvim_list_tabpages()[2]
+      api.nvim_set_current_tabpage(tab)
+      ok(api.nvim_tabpage_is_valid(tab))
       helpers.command('tabclose')
-      ok(not meths.nvim_tabpage_is_valid(tab))
+      ok(not api.nvim_tabpage_is_valid(tab))
     end)
   end)
 end)