1 files changed, 45 insertions, 34 deletions
diff --git a/test/functional/autocmd/tabclose_spec.lua b/test/functional/autocmd/tabclose_spec.lua
index 92d860c628..d0b2ac6a8d 100644
--- a/test/functional/autocmd/tabclose_spec.lua
+++ b/test/functional/autocmd/tabclose_spec.lua
@@ -1,5 +1,7 @@
 local helpers = require('test.functional.helpers')(after_each)
-local clear, nvim, eq = helpers.clear, helpers.nvim, helpers.eq
+local clear, eq = helpers.clear, helpers.eq
+local api = helpers.api
+local command = helpers.command
 
 describe('TabClosed', function()
   before_each(clear)
@@ -7,62 +9,71 @@ describe('TabClosed', function()
   describe('au TabClosed', function()
     describe('with * as <afile>', function()
       it('matches when closing any tab', function()
-        nvim('command', 'au! TabClosed * echom "tabclosed:".expand("<afile>").":".expand("<amatch>").":".tabpagenr()')
+        command(
+          'au! TabClosed * echom "tabclosed:".expand("<afile>").":".expand("<amatch>").":".tabpagenr()'
+        )
         repeat
-          nvim('command', 'tabnew')
-        until nvim('eval', 'tabpagenr()') == 6 -- current tab is now 6
-        eq("tabclosed:6:6:5", nvim('exec', 'tabclose', true)) -- close last 6, current tab is now 5
-        eq("tabclosed:5:5:4", nvim('exec', 'close', true)) -- close last window on tab, closes tab
-        eq("tabclosed:2:2:3", nvim('exec', '2tabclose', true)) -- close tab 2, current tab is now 3
-        eq("tabclosed:1:1:2\ntabclosed:1:1:1", nvim('exec', 'tabonly', true)) -- close tabs 1 and 2
+          command('tabnew')
+        until api.nvim_eval('tabpagenr()') == 6 -- current tab is now 6
+        eq('tabclosed:6:6:5', api.nvim_exec('tabclose', true)) -- close last 6, current tab is now 5
+        eq('tabclosed:5:5:4', api.nvim_exec('close', true)) -- close last window on tab, closes tab
+        eq('tabclosed:2:2:3', api.nvim_exec('2tabclose', true)) -- close tab 2, current tab is now 3
+        eq('tabclosed:1:1:2\ntabclosed:1:1:1', api.nvim_exec('tabonly', true)) -- close tabs 1 and 2
       end)
 
       it('is triggered when closing a window via bdelete from another tab', function()
-        nvim('command', 'au! TabClosed * echom "tabclosed:".expand("<afile>").":".expand("<amatch>").":".tabpagenr()')
-        nvim('command', '1tabedit Xtestfile')
-        nvim('command', '1tabedit Xtestfile')
-        nvim('command', 'normal! 1gt')
-        eq({1, 3}, nvim('eval', '[tabpagenr(), tabpagenr("$")]'))
-        eq("tabclosed:2:2:1\ntabclosed:2:2:1", nvim('exec', 'bdelete Xtestfile', true))
-        eq({1, 1}, nvim('eval', '[tabpagenr(), tabpagenr("$")]'))
+        command(
+          'au! TabClosed * echom "tabclosed:".expand("<afile>").":".expand("<amatch>").":".tabpagenr()'
+        )
+        command('1tabedit Xtestfile')
+        command('1tabedit Xtestfile')
+        command('normal! 1gt')
+        eq({ 1, 3 }, api.nvim_eval('[tabpagenr(), tabpagenr("$")]'))
+        eq('tabclosed:2:2:1\ntabclosed:2:2:1', api.nvim_exec('bdelete Xtestfile', true))
+        eq({ 1, 1 }, api.nvim_eval('[tabpagenr(), tabpagenr("$")]'))
       end)
 
       it('is triggered when closing a window via bdelete from current tab', function()
-        nvim('command', 'au! TabClosed * echom "tabclosed:".expand("<afile>").":".expand("<amatch>").":".tabpagenr()')
-        nvim('command', 'file Xtestfile1')
-        nvim('command', '1tabedit Xtestfile2')
-        nvim('command', '1tabedit Xtestfile2')
+        command(
+          'au! TabClosed * echom "tabclosed:".expand("<afile>").":".expand("<amatch>").":".tabpagenr()'
+        )
+        command('file Xtestfile1')
+        command('1tabedit Xtestfile2')
+        command('1tabedit Xtestfile2')
 
         -- Only one tab is closed, and the alternate file is used for the other.
-        eq({2, 3}, nvim('eval', '[tabpagenr(), tabpagenr("$")]'))
-        eq("tabclosed:2:2:2", nvim('exec', 'bdelete Xtestfile2', true))
-        eq('Xtestfile1', nvim('eval', 'bufname("")'))
+        eq({ 2, 3 }, api.nvim_eval('[tabpagenr(), tabpagenr("$")]'))
+        eq('tabclosed:2:2:2', api.nvim_exec('bdelete Xtestfile2', true))
+        eq('Xtestfile1', api.nvim_eval('bufname("")'))
       end)
     end)
 
     describe('with NR as <afile>', function()
       it('matches when closing a tab whose index is NR', function()
-        nvim('command', 'au! TabClosed * echom "tabclosed:".expand("<afile>").":".expand("<amatch>").":".tabpagenr()')
-        nvim('command', 'au! TabClosed 2 echom "tabclosed:match"')
+        command(
+          'au! TabClosed * echom "tabclosed:".expand("<afile>").":".expand("<amatch>").":".tabpagenr()'
+        )
+        command('au! TabClosed 2 echom "tabclosed:match"')
         repeat
-          nvim('command',  'tabnew')
-        until nvim('eval', 'tabpagenr()') == 7 -- current tab is now 7
+          command('tabnew')
+        until api.nvim_eval('tabpagenr()') == 7 -- current tab is now 7
         -- sanity check, we shouldn't match on tabs with numbers other than 2
-        eq("tabclosed:7:7:6", nvim('exec', 'tabclose', true))
+        eq('tabclosed:7:7:6', api.nvim_exec('tabclose', true))
         -- close tab page 2, current tab is now 5
-        eq("tabclosed:2:2:5\ntabclosed:match", nvim('exec', '2tabclose', true))
+        eq('tabclosed:2:2:5\ntabclosed:match', api.nvim_exec('2tabclose', true))
       end)
     end)
 
     describe('with close', function()
       it('is triggered', function()
-        nvim('command', 'au! TabClosed * echom "tabclosed:".expand("<afile>").":".expand("<amatch>").":".tabpagenr()')
-        nvim('command',  'tabedit Xtestfile')
-        eq({2, 2}, nvim('eval', '[tabpagenr(), tabpagenr("$")]'))
-        eq("tabclosed:2:2:1", nvim('exec', 'close', true))
-        eq({1, 1}, nvim('eval', '[tabpagenr(), tabpagenr("$")]'))
+        command(
+          'au! TabClosed * echom "tabclosed:".expand("<afile>").":".expand("<amatch>").":".tabpagenr()'
+        )
+        command('tabedit Xtestfile')
+        eq({ 2, 2 }, api.nvim_eval('[tabpagenr(), tabpagenr("$")]'))
+        eq('tabclosed:2:2:1', api.nvim_exec('close', true))
+        eq({ 1, 1 }, api.nvim_eval('[tabpagenr(), tabpagenr("$")]'))
       end)
     end)
   end)
 end)
-