functests: Replace execute with either command or feed_command

Hope this will make people using feed_command less likely: this hides bugs.
Already found at least two:

1. msgpackparse() will show internal error: hash_add() in case of duplicate
   keys, though it will still work correctly. Currently silenced.
2. ttimeoutlen was spelled incorrectly, resulting in option not being set when
   expected. Test was still functioning somehow though. Currently fixed.

1 files changed, 33 insertions, 33 deletions

diff --git a/test/functional/legacy/031_close_commands_spec.lua b/test/functional/legacy/031_close_commands_spec.lua
index d41eadaa00..64c67c9882 100644
--- a/test/functional/legacy/031_close_commands_spec.lua
+++ b/test/functional/legacy/031_close_commands_spec.lua
@@ -16,7 +16,7 @@ local clear = helpers.clear
 local source = helpers.source
 local insert = helpers.insert
 local expect = helpers.expect
-local execute = helpers.execute
+local feed_command = helpers.feed_command
 
 describe('Commands that close windows and/or buffers', function()
   local function cleanup()
@@ -38,40 +38,40 @@ describe('Commands that close windows and/or buffers', function()
     feed('GA 1<Esc>:$w! Xtest1<CR>')
     feed('$r2:$w! Xtest2<CR>')
     feed('$r3:$w! Xtest3<CR>')
-    execute('n! Xtest1 Xtest2')
+    feed_command('n! Xtest1 Xtest2')
     feed('A 1<Esc>:set hidden<CR>')
 
     -- Test for working :n when hidden set
-    execute('n')
+    feed_command('n')
     expect('testtext 2')
 
     -- Test for failing :rew when hidden not set
-    execute('set nohidden')
+    feed_command('set nohidden')
     feed('A 2<Esc>:rew<CR>')
     expect('testtext 2 2')
 
     -- Test for working :rew when hidden set
-    execute('set hidden')
-    execute('rew')
+    feed_command('set hidden')
+    feed_command('rew')
     expect('testtext 1 1')
 
     -- Test for :all keeping a buffer when it's modified
-    execute('set nohidden')
+    feed_command('set nohidden')
     feed('A 1<Esc>:sp<CR>')
-    execute('n Xtest2 Xtest3')
-    execute('all')
-    execute('1wincmd w')
+    feed_command('n Xtest2 Xtest3')
+    feed_command('all')
+    feed_command('1wincmd w')
     expect('testtext 1 1 1')
 
     -- Test abandoning changed buffer, should be unloaded even when 'hidden' set
-    execute('set hidden')
+    feed_command('set hidden')
     feed('A 1<Esc>:q!<CR>')
     expect('testtext 2 2')
-    execute('unhide')
+    feed_command('unhide')
     expect('testtext 2 2')
 
     -- Test ":hide" hides anyway when 'hidden' not set
-    execute('set nohidden')
+    feed_command('set nohidden')
     feed('A 2<Esc>:hide<CR>')
     expect('testtext 3')
 
@@ -80,42 +80,42 @@ describe('Commands that close windows and/or buffers', function()
     expect('testtext 3 3')
 
     -- Test ":edit" working in modified buffer when 'hidden' set
-    execute('set hidden')
-    execute('e Xtest1')
+    feed_command('set hidden')
+    feed_command('e Xtest1')
     expect('testtext 1')
 
     -- Test ":close" not hiding when 'hidden' not set in modified buffer
-    execute('sp Xtest3')
-    execute('set nohidden')
+    feed_command('sp Xtest3')
+    feed_command('set nohidden')
     feed('A 3<Esc>:close<CR>')
     expect('testtext 3 3 3')
 
     -- Test ":close!" does hide when 'hidden' not set in modified buffer
     feed('A 3<Esc>:close!<CR>')
-    execute('set nohidden')
+    feed_command('set nohidden')
     expect('testtext 1')
 
     -- Test ":all!" hides changed buffer
-    execute('sp Xtest4')
+    feed_command('sp Xtest4')
     feed('GA 4<Esc>:all!<CR>')
-    execute('1wincmd w')
+    feed_command('1wincmd w')
     expect('testtext 2 2 2')
 
     -- Test ":q!" and hidden buffer.
-    execute('bw! Xtest1 Xtest2 Xtest3 Xtest4')
-    execute('sp Xtest1')
-    execute('wincmd w')
-    execute('bw!')
-    execute('set modified')
-    execute('bot sp Xtest2')
-    execute('set modified')
-    execute('bot sp Xtest3')
-    execute('set modified')
-    execute('wincmd t')
-    execute('hide')
-    execute('q!')
+    feed_command('bw! Xtest1 Xtest2 Xtest3 Xtest4')
+    feed_command('sp Xtest1')
+    feed_command('wincmd w')
+    feed_command('bw!')
+    feed_command('set modified')
+    feed_command('bot sp Xtest2')
+    feed_command('set modified')
+    feed_command('bot sp Xtest3')
+    feed_command('set modified')
+    feed_command('wincmd t')
+    feed_command('hide')
+    feed_command('q!')
     expect('testtext 3')
-    execute('q!')
+    feed_command('q!')
     feed('<CR>')
     expect('testtext 1')
     source([[