From 2afbce7651f79b0626ebeae3688274ce18ac2920 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 19 Sep 2021 02:29:37 -0700
Subject: refactor(tests): remove redir_exec #15718

Problem
- `redir_exec` is obsolete, but it keeps getting used in new tests
  because people copy existing tests.
- Disadvantages of `redir_exec`:
  - Captures extra junk before the actual error/message that we _want_ to test.
  - Does not fail on error, unlike e.g. `command()`.

Solution
- Use new functions like `nvim_exec` and `pcall_err`.
---
 test/functional/vimscript/null_spec.lua | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'test/functional/vimscript/null_spec.lua')

diff --git a/test/functional/vimscript/null_spec.lua b/test/functional/vimscript/null_spec.lua
index bc88e6c8b3..7ecbcd2fd6 100644
--- a/test/functional/vimscript/null_spec.lua
+++ b/test/functional/vimscript/null_spec.lua
@@ -1,7 +1,6 @@
 local helpers = require('test.functional.helpers')(after_each)
 
 local curbufmeths = helpers.curbufmeths
-local redir_exec = helpers.redir_exec
 local exc_exec = helpers.exc_exec
 local command = helpers.command
 local clear = helpers.clear
@@ -9,6 +8,19 @@ local meths = helpers.meths
 local funcs = helpers.funcs
 local eq = helpers.eq
 
+local function redir_exec(cmd)
+  meths.set_var('__redir_exec_cmd', cmd)
+  command([[
+    redir => g:__redir_exec_output
+      silent! execute g:__redir_exec_cmd
+    redir END
+  ]])
+  local ret = meths.get_var('__redir_exec_output')
+  meths.del_var('__redir_exec_output')
+  meths.del_var('__redir_exec_cmd')
+  return ret
+end
+
 describe('NULL', function()
   before_each(function()
     clear()
-- 
cgit