1 files changed, 23 insertions, 21 deletions
diff --git a/test/functional/lua/commands_spec.lua b/test/functional/lua/commands_spec.lua
index f2a1b7dede..2e0d0ea899 100644
--- a/test/functional/lua/commands_spec.lua
+++ b/test/functional/lua/commands_spec.lua
@@ -15,14 +15,14 @@ local command = helpers.command
 local exc_exec = helpers.exc_exec
 local pcall_err = helpers.pcall_err
 local write_file = helpers.write_file
-local redir_exec = helpers.redir_exec
+local exec_capture = helpers.exec_capture
 local curbufmeths = helpers.curbufmeths
 
 before_each(clear)
 
 describe(':lua command', function()
   it('works', function()
-    eq('', redir_exec(
+    eq('', exec_capture(
       'lua vim.api.nvim_buf_set_lines(1, 1, 2, false, {"TEST"})'))
     eq({'', 'TEST'}, curbufmeths.get_lines(0, 100, false))
     source(dedent([[
@@ -67,18 +67,19 @@ describe(':lua command', function()
     eq({'', 'ETTS', 'TTSE', 'STTE'}, curbufmeths.get_lines(0, 100, false))
   end)
   it('preserves global and not preserves local variables', function()
-    eq('', redir_exec('lua gvar = 42'))
-    eq('', redir_exec('lua local lvar = 100500'))
+    eq('', exec_capture('lua gvar = 42'))
+    eq('', exec_capture('lua local lvar = 100500'))
     eq(NIL, funcs.luaeval('lvar'))
     eq(42, funcs.luaeval('gvar'))
   end)
   it('works with long strings', function()
     local s = ('x'):rep(100500)
 
-    eq('\nE5107: Error loading lua [string ":lua"]:1: unfinished string near \'<eof>\'', redir_exec(('lua vim.api.nvim_buf_set_lines(1, 1, 2, false, {"%s})'):format(s)))
+    eq('Vim(lua):E5107: Error loading lua [string ":lua"]:0: unfinished string near \'<eof>\'',
+      pcall_err(command, ('lua vim.api.nvim_buf_set_lines(1, 1, 2, false, {"%s})'):format(s)))
     eq({''}, curbufmeths.get_lines(0, -1, false))
 
-    eq('', redir_exec(('lua vim.api.nvim_buf_set_lines(1, 1, 2, false, {"%s"})'):format(s)))
+    eq('', exec_capture(('lua vim.api.nvim_buf_set_lines(1, 1, 2, false, {"%s"})'):format(s)))
     eq({'', s}, curbufmeths.get_lines(0, -1, false))
   end)
 
@@ -144,34 +145,34 @@ end)
 describe(':luado command', function()
   it('works', function()
     curbufmeths.set_lines(0, 1, false, {"ABC", "def", "gHi"})
-    eq('', redir_exec('luado lines = (lines or {}) lines[#lines + 1] = {linenr, line}'))
+    eq('', exec_capture('luado lines = (lines or {}) lines[#lines + 1] = {linenr, line}'))
     eq({'ABC', 'def', 'gHi'}, curbufmeths.get_lines(0, -1, false))
     eq({{1, 'ABC'}, {2, 'def'}, {3, 'gHi'}}, funcs.luaeval('lines'))
 
     -- Automatic transformation of numbers
-    eq('', redir_exec('luado return linenr'))
+    eq('', exec_capture('luado return linenr'))
     eq({'1', '2', '3'}, curbufmeths.get_lines(0, -1, false))
 
-    eq('', redir_exec('luado return ("<%02x>"):format(line:byte())'))
+    eq('', exec_capture('luado return ("<%02x>"):format(line:byte())'))
     eq({'<31>', '<32>', '<33>'}, curbufmeths.get_lines(0, -1, false))
   end)
   it('stops processing lines when suddenly out of lines', function()
     curbufmeths.set_lines(0, 1, false, {"ABC", "def", "gHi"})
-    eq('', redir_exec('2,$luado runs = ((runs or 0) + 1) vim.api.nvim_command("%d")'))
+    eq('', exec_capture('2,$luado runs = ((runs or 0) + 1) vim.api.nvim_command("%d")'))
     eq({''}, curbufmeths.get_lines(0, -1, false))
     eq(1, funcs.luaeval('runs'))
   end)
   it('works correctly when changing lines out of range', function()
     curbufmeths.set_lines(0, 1, false, {"ABC", "def", "gHi"})
-    eq('\nE322: line number out of range: 1 past the end\nE320: Cannot find line 2',
-       redir_exec('2,$luado vim.api.nvim_command("%d") return linenr'))
+    eq('Vim(luado):E322: line number out of range: 1 past the end',
+       pcall_err(command, '2,$luado vim.api.nvim_command("%d") return linenr'))
     eq({''}, curbufmeths.get_lines(0, -1, false))
   end)
   it('fails on errors', function()
-    eq([[Vim(luado):E5109: Error loading lua: [string ":luado"]:1: unexpected symbol near ')']],
-       exc_exec('luado ()'))
-    eq([[Vim(luado):E5111: Error calling lua: [string ":luado"]:1: attempt to perform arithmetic on global 'liness' (a nil value)]],
-       exc_exec('luado return liness + 1'))
+    eq([[Vim(luado):E5109: Error loading lua: [string ":luado"]:0: unexpected symbol near ')']],
+       pcall_err(command, 'luado ()'))
+    eq([[Vim(luado):E5111: Error calling lua: [string ":luado"]:0: attempt to perform arithmetic on global 'liness' (a nil value)]],
+       pcall_err(command, 'luado return liness + 1'))
   end)
   it('works with NULL errors', function()
     eq([=[Vim(luado):E5111: Error calling lua: [NULL]]=],
@@ -179,17 +180,18 @@ describe(':luado command', function()
   end)
   it('fails in sandbox when needed', function()
     curbufmeths.set_lines(0, 1, false, {"ABC", "def", "gHi"})
-    eq('\nE48: Not allowed in sandbox: sandbox luado runs = (runs or 0) + 1',
-       redir_exec('sandbox luado runs = (runs or 0) + 1'))
+    eq('Vim(luado):E48: Not allowed in sandbox',
+       pcall_err(command, 'sandbox luado runs = (runs or 0) + 1'))
     eq(NIL, funcs.luaeval('runs'))
   end)
   it('works with long strings', function()
     local s = ('x'):rep(100500)
 
-    eq('\nE5109: Error loading lua: [string ":luado"]:1: unfinished string near \'<eof>\'', redir_exec(('luado return "%s'):format(s)))
+    eq('Vim(luado):E5109: Error loading lua: [string ":luado"]:0: unfinished string near \'<eof>\'',
+      pcall_err(command, ('luado return "%s'):format(s)))
     eq({''}, curbufmeths.get_lines(0, -1, false))
 
-    eq('', redir_exec(('luado return "%s"'):format(s)))
+    eq('', exec_capture(('luado return "%s"'):format(s)))
     eq({s}, curbufmeths.get_lines(0, -1, false))
   end)
 end)
@@ -207,7 +209,7 @@ describe(':luafile', function()
         vim.api.nvim_buf_set_lines(1, 2, 3, false, {"TTSE"})
         vim.api.nvim_buf_set_lines(1, 3, 4, false, {"STTE"})
     ]])
-    eq('', redir_exec('luafile ' .. fname))
+    eq('', exec_capture('luafile ' .. fname))
     eq({'', 'ETTS', 'TTSE', 'STTE'}, curbufmeths.get_lines(0, 100, false))
   end)