aboutsummaryrefslogtreecommitdiff
path: root/test/functional/ui/embed_spec.lua
diff options
context:
space:
mode:
authorBjörn Linse <bjorn.linse@gmail.com>2018-09-22 10:20:23 +0200
committerGitHub <noreply@github.com>2018-09-22 10:20:23 +0200
commitc236e80cf3dfae6df5c43ecfb19c7629c9884f7b (patch)
tree426eb0f7525621d9760bb2cbf394d5c42b691775 /test/functional/ui/embed_spec.lua
parent7f990741f7018b5e52833f2da6913b97c6d2d5ee (diff)
parent4da5cb38d396d76d8072815d150725f7c9a85078 (diff)
downloadrneovim-c236e80cf3dfae6df5c43ecfb19c7629c9884f7b.tar.gz
rneovim-c236e80cf3dfae6df5c43ecfb19c7629c9884f7b.tar.bz2
rneovim-c236e80cf3dfae6df5c43ecfb19c7629c9884f7b.zip
Merge pull request #9024 from bfredl/embed_ui2
always wait for UI with --embed, unless --headless is supplied
Diffstat (limited to 'test/functional/ui/embed_spec.lua')
-rw-r--r--test/functional/ui/embed_spec.lua16
1 files changed, 3 insertions, 13 deletions
diff --git a/test/functional/ui/embed_spec.lua b/test/functional/ui/embed_spec.lua
index afe4db66b3..6a5227803d 100644
--- a/test/functional/ui/embed_spec.lua
+++ b/test/functional/ui/embed_spec.lua
@@ -3,18 +3,12 @@ local Screen = require('test.functional.ui.screen')
local feed = helpers.feed
local eq = helpers.eq
-local spawn, set_session = helpers.spawn, helpers.set_session
-local nvim_prog, nvim_set = helpers.nvim_prog, helpers.nvim_set
-local merge_args, prepend_argv = helpers.merge_args, helpers.prepend_argv
+local clear = helpers.clear
local function test_embed(ext_newgrid)
- local session, screen
+ local screen
local function startup(...)
- local nvim_argv = {nvim_prog, '-u', 'NONE', '-i', 'NONE',
- '--cmd', nvim_set, '--embed'}
- nvim_argv = merge_args(prepend_argv, nvim_argv, {...})
- session = spawn(nvim_argv)
- set_session(session)
+ clear{headless=false, args={...}}
-- attach immediately after startup, for early UI
screen = Screen.new(60, 8)
@@ -26,10 +20,6 @@ local function test_embed(ext_newgrid)
})
end
- after_each(function()
- session:close()
- end)
-
it('can display errors', function()
startup('--cmd', 'echoerr invalid+')
screen:expect([[