aboutsummaryrefslogtreecommitdiff
path: root/test/functional/terminal/helpers.lua
diff options
context:
space:
mode:
authorBjörn Linse <bjorn.linse@gmail.com>2019-01-27 14:15:08 +0100
committerGitHub <noreply@github.com>2019-01-27 14:15:08 +0100
commit8171e96b9640c54eb67a8e5d1082f1fd6e794f23 (patch)
tree7ef2ee67b4328b7e5478a74bfccc6d5ec6eb8d38 /test/functional/terminal/helpers.lua
parentf2398a766e094d74ab19f3037872abbc97c16728 (diff)
parentde16c0bf6445f92f2b6e92ba3253d581e5562178 (diff)
downloadrneovim-8171e96b9640c54eb67a8e5d1082f1fd6e794f23.tar.gz
rneovim-8171e96b9640c54eb67a8e5d1082f1fd6e794f23.tar.bz2
rneovim-8171e96b9640c54eb67a8e5d1082f1fd6e794f23.zip
Merge pull request #9551 from bfredl/multiterm
Fix :terminal resizing, and some multigrid size cleanup
Diffstat (limited to 'test/functional/terminal/helpers.lua')
-rw-r--r--test/functional/terminal/helpers.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/functional/terminal/helpers.lua b/test/functional/terminal/helpers.lua
index 7de0152de0..18f0b9e4c1 100644
--- a/test/functional/terminal/helpers.lua
+++ b/test/functional/terminal/helpers.lua
@@ -33,7 +33,7 @@ local function disable_mouse() feed_termcode('[?1002l') end
local default_command = '["'..nvim_dir..'/tty-test'..'"]'
-local function screen_setup(extra_rows, command, cols)
+local function screen_setup(extra_rows, command, cols, opts)
extra_rows = extra_rows and extra_rows or 0
command = command and command or default_command
cols = cols and cols or 50
@@ -55,7 +55,7 @@ local function screen_setup(extra_rows, command, cols)
[10] = {foreground = 121}, -- "Press ENTER" in embedded :terminal session.
})
- screen:attach({rgb=false})
+ screen:attach(opts or {rgb=false})
feed_command('enew | call termopen('..command..')')
nvim('input', '<CR>')
@@ -69,7 +69,7 @@ local function screen_setup(extra_rows, command, cols)
-- 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.
- if command == default_command then
+ if command == default_command and opts == nil then
-- Wait for "tty ready" to be printed before each test or the terminal may
-- still be in canonical mode (will echo characters for example).
local empty_line = (' '):rep(cols)