diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2018-09-20 15:20:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-20 15:20:40 +0200 |
| commit | e55ebae3734068239c7070dd20ddc34b06c20a7c (patch) | |
| tree | 0c2470360fb196ba27a0aaeeca6fe077fa58f7aa /test/functional/ui/embed_spec.lua | |
| parent | 47d74bf32f3b95b28a3ef2a7840989eb9bed7480 (diff) | |
| parent | 5487624730b60426632326dde41383069754916b (diff) | |
| download | rneovim-e55ebae3734068239c7070dd20ddc34b06c20a7c.tar.gz rneovim-e55ebae3734068239c7070dd20ddc34b06c20a7c.tar.bz2 rneovim-e55ebae3734068239c7070dd20ddc34b06c20a7c.zip | |
Merge pull request #9021 from bfredl/embed_fix
startup: don't erase screen on `:hi Normal` during startup (for non-newgrid UIs)
Diffstat (limited to 'test/functional/ui/embed_spec.lua')
| -rw-r--r-- | test/functional/ui/embed_spec.lua | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/test/functional/ui/embed_spec.lua b/test/functional/ui/embed_spec.lua index 7d41567fda..afe4db66b3 100644 --- a/test/functional/ui/embed_spec.lua +++ b/test/functional/ui/embed_spec.lua @@ -2,11 +2,12 @@ local helpers = require('test.functional.helpers')(after_each) 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 -describe('--embed UI on startup', function() +local function test_embed(ext_newgrid) local session, screen local function startup(...) local nvim_argv = {nvim_prog, '-u', 'NONE', '-i', 'NONE', @@ -17,7 +18,7 @@ describe('--embed UI on startup', function() -- attach immediately after startup, for early UI screen = Screen.new(60, 8) - screen:attach() + screen:attach{ext_newgrid=ext_newgrid} screen:set_default_attr_ids({ [1] = {foreground = Screen.colors.Grey100, background = Screen.colors.Red}, [2] = {bold = true, foreground = Screen.colors.SeaGreen4}, @@ -55,7 +56,7 @@ describe('--embed UI on startup', function() ]]) end) - it("doesn't erase output when setting colors", function() + it("doesn't erase output when setting color scheme", function() startup('--cmd', 'echoerr "foo"', '--cmd', 'color default', '--cmd', 'echoerr "bar"') screen:expect([[ | @@ -68,4 +69,23 @@ describe('--embed UI on startup', function() {2:Press ENTER or type command to continue}^ | ]]) end) -end) + + it("doesn't erase output when setting Normal colors", function() + startup('--cmd', 'echoerr "foo"', '--cmd', 'hi Normal guibg=Green', '--cmd', 'echoerr "bar"') + screen:expect{grid=[[ + | + | + | + | + Error detected while processing pre-vimrc command line: | + foo | + bar | + Press ENTER or type command to continue^ | + ]], condition=function() + eq(Screen.colors.Green, screen.default_colors.rgb_bg) + end} + end) +end + +describe('--embed UI on startup (ext_newgrid=true)', function() test_embed(true) end) +describe('--embed UI on startup (ext_newgrid=false)', function() test_embed(false) end) |