diff options
Diffstat (limited to 'test/functional/terminal')
| -rw-r--r-- | test/functional/terminal/api_spec.lua | 2 | ||||
| -rw-r--r-- | test/functional/terminal/highlight_spec.lua | 2 | ||||
| -rw-r--r-- | test/functional/terminal/tui_spec.lua | 15 |
3 files changed, 11 insertions, 8 deletions
diff --git a/test/functional/terminal/api_spec.lua b/test/functional/terminal/api_spec.lua index 68082ba4fa..117a5b74b7 100644 --- a/test/functional/terminal/api_spec.lua +++ b/test/functional/terminal/api_spec.lua @@ -15,7 +15,7 @@ describe('api', function() '-u', 'NONE', '-i', 'NONE', '--cmd', 'colorscheme vim', - '--cmd', helpers.nvim_set, + '--cmd', helpers.nvim_set .. ' notermguicolors', }) end) after_each(function() diff --git a/test/functional/terminal/highlight_spec.lua b/test/functional/terminal/highlight_spec.lua index 2ac45771d4..4754d14052 100644 --- a/test/functional/terminal/highlight_spec.lua +++ b/test/functional/terminal/highlight_spec.lua @@ -143,7 +143,7 @@ it(':terminal highlight has lower precedence than editor #9964', function() screen:attach({rgb=true}) -- Child nvim process in :terminal (with cterm colors). funcs.termopen({ - nvim_prog_abs(), '-n', '-u', 'NORC', '-i', 'NONE', '--cmd', nvim_set, + nvim_prog_abs(), '-n', '-u', 'NORC', '-i', 'NONE', '--cmd', nvim_set .. ' notermguicolors', '+hi Normal ctermfg=Blue ctermbg=Yellow', '+norm! ichild nvim', '+norm! oline 2', diff --git a/test/functional/terminal/tui_spec.lua b/test/functional/terminal/tui_spec.lua index a3043ab470..bcd2122cc7 100644 --- a/test/functional/terminal/tui_spec.lua +++ b/test/functional/terminal/tui_spec.lua @@ -43,7 +43,7 @@ describe('TUI', function() '--listen', child_server, '-u', 'NONE', '-i', 'NONE', - '--cmd', string.format('%s laststatus=2 background=dark', nvim_set), + '--cmd', nvim_set .. ' notermguicolors laststatus=2 background=dark', '--cmd', 'colorscheme vim' }) screen:expect([[ @@ -2213,11 +2213,13 @@ describe("TUI 't_Co' (terminal colors)", function() local function assert_term_colors(term, colorterm, maxcolors) clear({env={TERM=term}, args={}}) + -- Allow overriding $COLORTERM in :terminal + command('set notermguicolors') screen = thelpers.setup_child_nvim({ '-u', 'NONE', '-i', 'NONE', '--cmd', 'colorscheme vim', - '--cmd', nvim_set, + '--cmd', nvim_set .. ' notermguicolors', }, { env = { LANG = 'C', @@ -2495,7 +2497,7 @@ describe("TUI 'term' option", function() screen = thelpers.setup_child_nvim({ '-u', 'NONE', '-i', 'NONE', - '--cmd', nvim_set, + '--cmd', nvim_set .. ' notermguicolors', }, { env = { LANG = 'C', @@ -2555,7 +2557,7 @@ describe("TUI", function() '-u', 'NONE', '-i', 'NONE', '--cmd', 'colorscheme vim', - '--cmd', nvim_set, + '--cmd', nvim_set .. ' notermguicolors', extra_args, }, { env = { @@ -2753,7 +2755,7 @@ describe("TUI as a client", function() '-u', 'NONE', '-i', 'NONE', '--cmd', 'colorscheme vim', - '--cmd', string.format('%s laststatus=2 background=dark', nvim_set), + '--cmd', nvim_set .. ' notermguicolors laststatus=2 background=dark', }) feed_data("iHello, World") @@ -2819,6 +2821,7 @@ describe("TUI as a client", function() set_session(server) local server_pipe = meths.get_vvar('servername') server:request('nvim_input', 'iHalloj!<Esc>') + server:request('nvim_command', 'set notermguicolors') set_session(client_super) local screen_client = thelpers.setup_child_nvim({ @@ -2887,7 +2890,7 @@ describe("TUI as a client", function() '-u', 'NONE', '-i', 'NONE', '--cmd', 'colorscheme vim', - '--cmd', string.format('%s laststatus=2 background=dark', nvim_set), + '--cmd', nvim_set .. ' notermguicolors laststatus=2 background=dark', }) screen_server:expect{grid=[[ {1: } | |