Merge branch 'master' into s-dash-stdin

1 files changed, 8 insertions, 7 deletions

diff --git a/test/functional/ex_cmds/wundo_spec.lua b/test/functional/ex_cmds/wundo_spec.lua
index e1216fa5d4..b6fcae0cf4 100644
--- a/test/functional/ex_cmds/wundo_spec.lua
+++ b/test/functional/ex_cmds/wundo_spec.lua
@@ -1,20 +1,21 @@
 -- Specs for :wundo and underlying functions
 
 local helpers = require('test.functional.helpers')(after_each)
-local execute, clear, eval, feed, spawn, nvim_prog, set_session =
-  helpers.execute, helpers.clear, helpers.eval, helpers.feed, helpers.spawn,
+local command, clear, eval, spawn, nvim_prog, set_session =
+  helpers.command, helpers.clear, helpers.eval, helpers.spawn,
   helpers.nvim_prog, helpers.set_session
 
 
 describe(':wundo', function()
   before_each(clear)
+  after_each(function()
+    os.remove(eval('getcwd()') .. '/foo')
+  end)
 
   it('safely fails on new, non-empty buffer', function()
-    feed('iabc<esc>')
-    execute('wundo foo') -- This should not segfault. #1027
+    command('normal! iabc')
+    command('wundo foo') -- This should not segfault. #1027
     --TODO: check messages for error message
-
-    os.remove(eval('getcwd()') .. '/foo') --cleanup
   end)
 end)
 
@@ -23,7 +24,7 @@ describe('u_* functions', function()
     local session = spawn({nvim_prog, '-u', 'NONE', '-i', 'NONE', '--embed',
                            '-c', 'set undodir=. undofile'})
     set_session(session)
-    execute('echo "True"')  -- Should not error out due to crashed Neovim
+    command('echo "True"')  -- Should not error out due to crashed Neovim
     session:close()
   end)
 end)