Merge remote-tracking branch 'upstream/master' into aucmd_textputpost

1 files changed, 12 insertions, 11 deletions

diff --git a/test/functional/ex_cmds/make_spec.lua b/test/functional/ex_cmds/make_spec.lua
index d82f59ddf9..dd47bdec58 100644
--- a/test/functional/ex_cmds/make_spec.lua
+++ b/test/functional/ex_cmds/make_spec.lua
@@ -3,40 +3,41 @@ local clear = helpers.clear
 local eval = helpers.eval
 local has_powershell = helpers.has_powershell
 local matches = helpers.matches
-local nvim = helpers.nvim
+local api = helpers.api
 local testprg = helpers.testprg
 
 describe(':make', function()
   clear()
-  before_each(function ()
+  before_each(function()
     clear()
   end)
 
   describe('with powershell', function()
     if not has_powershell() then
-      pending("not tested; powershell was not found", function() end)
+      pending('not tested; powershell was not found', function() end)
       return
     end
-    before_each(function ()
+    before_each(function()
       helpers.set_shell_powershell()
     end)
 
-    it('captures stderr & non zero exit code #14349', function ()
-      nvim('set_option_value', 'makeprg', testprg('shell-test')..' foo', {})
+    it('captures stderr & non zero exit code #14349', function()
+      api.nvim_set_option_value('makeprg', testprg('shell-test') .. ' foo', {})
       local out = eval('execute("make")')
       -- Error message is captured in the file and printed in the footer
-      matches('[\r\n]+.*[\r\n]+Unknown first argument%: foo[\r\n]+%(1 of 1%)%: Unknown first argument%: foo', out)
+      matches(
+        '[\r\n]+.*[\r\n]+Unknown first argument%: foo[\r\n]+%(1 of 1%)%: Unknown first argument%: foo',
+        out
+      )
     end)
 
-    it('captures stderr & zero exit code #14349', function ()
-      nvim('set_option_value', 'makeprg', testprg('shell-test'), {})
+    it('captures stderr & zero exit code #14349', function()
+      api.nvim_set_option_value('makeprg', testprg('shell-test'), {})
       local out = eval('execute("make")')
       -- Ensure there are no "shell returned X" messages between
       -- command and last line (indicating zero exit)
       matches('LastExitCode%s+ready [$]%s+[(]', out)
       matches('\n.*%: ready [$]', out)
     end)
-
   end)
-
 end)