aboutsummaryrefslogtreecommitdiff
path: root/test/functional/terminal/helpers.lua
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2017-04-10 19:12:56 +0300
committerZyX <kp-pav@yandex.ru>2017-04-10 19:12:56 +0300
commit22fb9d8d25f5354bb878b953ba49b439961c8476 (patch)
treed3c21e80d09f7b1cf1a7c525643c2e20fb5a925e /test/functional/terminal/helpers.lua
parentacc52a953b99f78435c34337b8ca9b6716a057a1 (diff)
parent9aface8c4d1edd25d4fed3e099e3c2c02b0a282a (diff)
downloadrneovim-22fb9d8d25f5354bb878b953ba49b439961c8476.tar.gz
rneovim-22fb9d8d25f5354bb878b953ba49b439961c8476.tar.bz2
rneovim-22fb9d8d25f5354bb878b953ba49b439961c8476.zip
Merge branch 'master' into 1476-changes
Diffstat (limited to 'test/functional/terminal/helpers.lua')
-rw-r--r--test/functional/terminal/helpers.lua8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/functional/terminal/helpers.lua b/test/functional/terminal/helpers.lua
index 934c01e3bf..3b04d17705 100644
--- a/test/functional/terminal/helpers.lua
+++ b/test/functional/terminal/helpers.lua
@@ -1,7 +1,7 @@
local helpers = require('test.functional.helpers')(nil)
local Screen = require('test.functional.ui.screen')
local nvim_dir = helpers.nvim_dir
-local execute, nvim = helpers.execute, helpers.nvim
+local feed_command, nvim = helpers.feed_command, helpers.nvim
local function feed_data(data)
nvim('set_var', 'term_data', data)
@@ -58,15 +58,15 @@ local function screen_setup(extra_rows, command, cols)
screen:attach({rgb=false})
- execute('enew | call termopen('..command..')')
+ feed_command('enew | call termopen('..command..')')
nvim('input', '<CR>')
local vim_errmsg = nvim('eval', 'v:errmsg')
if vim_errmsg and "" ~= vim_errmsg then
error(vim_errmsg)
end
- execute('setlocal scrollback=10')
- execute('startinsert')
+ feed_command('setlocal scrollback=10')
+ feed_command('startinsert')
-- tty-test puts the terminal into raw mode and echoes input. Tests work by
-- feeding termcodes to control the display and asserting by screen:expect.