1 files changed, 30 insertions, 30 deletions
diff --git a/test/functional/legacy/autochdir_spec.lua b/test/functional/legacy/autochdir_spec.lua
index 5da54b4850..e5980f5942 100644
--- a/test/functional/legacy/autochdir_spec.lua
+++ b/test/functional/legacy/autochdir_spec.lua
@@ -1,11 +1,11 @@
 local helpers = require('test.functional.helpers')(after_each)
 local clear, eq, matches = helpers.clear, helpers.eq, helpers.matches
-local eval, command, call, meths = helpers.eval, helpers.command, helpers.call, helpers.meths
+local eval, command, call, api = helpers.eval, helpers.command, helpers.call, helpers.api
 local source, exec_capture = helpers.source, helpers.exec_capture
 local mkdir = helpers.mkdir
 
 local function expected_empty()
-  eq({}, meths.get_vvar('errors'))
+  eq({}, api.nvim_get_vvar('errors'))
 end
 
 describe('autochdir behavior', function()
@@ -25,13 +25,13 @@ describe('autochdir behavior', function()
   it('sets filename', function()
     command('set acd')
     command('new')
-    command('w '..dir..'/Xtest')
+    command('w ' .. dir .. '/Xtest')
     eq('Xtest', eval("expand('%')"))
     eq(dir, eval([[substitute(getcwd(), '.*/\(\k*\)', '\1', '')]]))
   end)
 
   it(':file in win_execute() does not cause wrong directory', function()
-    command('cd '..dir)
+    command('cd ' .. dir)
     source([[
       func Test_set_filename_other_window()
         let cwd = getcwd()
@@ -64,53 +64,53 @@ describe('autochdir behavior', function()
 
   it('win_execute() does not change directory', function()
     local subdir = 'Xfile'
-    command('cd '..dir)
+    command('cd ' .. dir)
     command('set acd')
     call('mkdir', subdir)
     local winid = eval('win_getid()')
-    command('new '..subdir..'/file')
-    matches(dir..'/'..subdir..'$', eval('getcwd()'))
+    command('new ' .. subdir .. '/file')
+    matches(dir .. '/' .. subdir .. '$', eval('getcwd()'))
     command('cd ..')
-    matches(dir..'$', eval('getcwd()'))
+    matches(dir .. '$', eval('getcwd()'))
     call('win_execute', winid, 'echo')
-    matches(dir..'$', eval('getcwd()'))
+    matches(dir .. '$', eval('getcwd()'))
   end)
 
   it(':verbose pwd shows whether autochdir is used', function()
     local subdir = 'Xautodir'
-    command('cd '..dir)
+    command('cd ' .. dir)
     local cwd = eval('getcwd()')
     command('edit global.txt')
-    matches('%[global%].*'..dir..'$', exec_capture('verbose pwd'))
+    matches('%[global%].*' .. dir .. '$', exec_capture('verbose pwd'))
     call('mkdir', subdir)
-    command('split '..subdir..'/local.txt')
-    command('lcd '..subdir)
-    matches('%[window%].*'..dir..'/'..subdir..'$', exec_capture('verbose pwd'))
+    command('split ' .. subdir .. '/local.txt')
+    command('lcd ' .. subdir)
+    matches('%[window%].*' .. dir .. '/' .. subdir .. '$', exec_capture('verbose pwd'))
     command('set acd')
     command('wincmd w')
-    matches('%[autochdir%].*'..dir..'$', exec_capture('verbose pwd'))
-    command('tcd '..cwd)
-    matches('%[tabpage%].*'..dir..'$', exec_capture('verbose pwd'))
-    command('cd '..cwd)
-    matches('%[global%].*'..dir..'$', exec_capture('verbose pwd'))
-    command('lcd '..cwd)
-    matches('%[window%].*'..dir..'$', exec_capture('verbose pwd'))
+    matches('%[autochdir%].*' .. dir .. '$', exec_capture('verbose pwd'))
+    command('tcd ' .. cwd)
+    matches('%[tabpage%].*' .. dir .. '$', exec_capture('verbose pwd'))
+    command('cd ' .. cwd)
+    matches('%[global%].*' .. dir .. '$', exec_capture('verbose pwd'))
+    command('lcd ' .. cwd)
+    matches('%[window%].*' .. dir .. '$', exec_capture('verbose pwd'))
     command('edit')
-    matches('%[autochdir%].*'..dir..'$', exec_capture('verbose pwd'))
+    matches('%[autochdir%].*' .. dir .. '$', exec_capture('verbose pwd'))
     command('enew')
     command('wincmd w')
-    matches('%[autochdir%].*'..dir..'/'..subdir..'$', exec_capture('verbose pwd'))
+    matches('%[autochdir%].*' .. dir .. '/' .. subdir .. '$', exec_capture('verbose pwd'))
     command('wincmd w')
-    matches('%[window%].*'..dir..'$', exec_capture('verbose pwd'))
+    matches('%[window%].*' .. dir .. '$', exec_capture('verbose pwd'))
     command('wincmd w')
-    matches('%[autochdir%].*'..dir..'/'..subdir..'$', exec_capture('verbose pwd'))
+    matches('%[autochdir%].*' .. dir .. '/' .. subdir .. '$', exec_capture('verbose pwd'))
     command('set noacd')
-    matches('%[autochdir%].*'..dir..'/'..subdir..'$', exec_capture('verbose pwd'))
+    matches('%[autochdir%].*' .. dir .. '/' .. subdir .. '$', exec_capture('verbose pwd'))
     command('wincmd w')
-    matches('%[window%].*'..dir..'$', exec_capture('verbose pwd'))
-    command('cd '..cwd)
-    matches('%[global%].*'..dir..'$', exec_capture('verbose pwd'))
+    matches('%[window%].*' .. dir .. '$', exec_capture('verbose pwd'))
+    command('cd ' .. cwd)
+    matches('%[global%].*' .. dir .. '$', exec_capture('verbose pwd'))
     command('wincmd w')
-    matches('%[window%].*'..dir..'/'..subdir..'$', exec_capture('verbose pwd'))
+    matches('%[window%].*' .. dir .. '/' .. subdir .. '$', exec_capture('verbose pwd'))
   end)
 end)