From a5b915e56c58b64234f3110b0b208e42d6a7229c Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Fri, 9 Aug 2019 22:29:34 -0400 Subject: [PATCH 1/3] test: win: enable output_spec test --- test/functional/ui/output_spec.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/functional/ui/output_spec.lua b/test/functional/ui/output_spec.lua index 24bf66e2d8..4a0e7ccad0 100644 --- a/test/functional/ui/output_spec.lua +++ b/test/functional/ui/output_spec.lua @@ -12,8 +12,6 @@ local command = helpers.command local nvim_dir = helpers.nvim_dir describe("shell command :!", function() - if helpers.pending_win32(pending) then return end - local screen before_each(function() clear() @@ -36,6 +34,7 @@ describe("shell command :!", function() end) it("displays output without LF/EOF. #4646 #4569 #3772", function() + if helpers.pending_win32(pending) then return end -- NOTE: We use a child nvim (within a :term buffer) -- to avoid triggering a UI flush. child_session.feed_data(":!printf foo; sleep 200\n") From cb11de18a20230fc20adfcd7922081d68f8ae9eb Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Sat, 10 Aug 2019 21:57:45 -0400 Subject: [PATCH 2/3] test: win: enable WinEnter terminal test --- test/functional/terminal/window_split_tab_spec.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/test/functional/terminal/window_split_tab_spec.lua b/test/functional/terminal/window_split_tab_spec.lua index ad70b3d14f..7b49a38e77 100644 --- a/test/functional/terminal/window_split_tab_spec.lua +++ b/test/functional/terminal/window_split_tab_spec.lua @@ -37,7 +37,6 @@ describe(':terminal', function() end) it('does not change size on WinEnter', function() - if helpers.pending_win32(pending) then return end feed('') feed('k') feed_command('2split') From 47d679c0c24765b7bd6808dc720f5f59f47cc0b8 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Sun, 11 Aug 2019 08:28:19 -0400 Subject: [PATCH 3/3] tests: win: enable buffer focus test --- test/functional/terminal/buffer_spec.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/functional/terminal/buffer_spec.lua b/test/functional/terminal/buffer_spec.lua index e598c325a8..1763574bf9 100644 --- a/test/functional/terminal/buffer_spec.lua +++ b/test/functional/terminal/buffer_spec.lua @@ -158,14 +158,15 @@ describe(':terminal buffer', function() end) it('handles loss of focus gracefully', function() - if helpers.pending_win32(pending) then return end -- Change the statusline to avoid printing the file name, which varies. nvim('set_option', 'statusline', '==========') feed_command('set laststatus=0') -- Save the buffer number of the terminal for later testing. local tbuf = eval('bufnr("%")') - + local exitcmd = helpers.iswin() + and "['cmd', '/c', 'exit']" + or "['sh', '-c', 'exit']" source([[ function! SplitWindow(id, data, event) new @@ -173,7 +174,7 @@ describe(':terminal buffer', function() endfunction startinsert - call jobstart(['sh', '-c', 'exit'], {'on_exit': function("SplitWindow")}) + call jobstart(]]..exitcmd..[[, {'on_exit': function("SplitWindow")}) call feedkeys("\", 't') " vim will expect , but be exited out of " the terminal before it can be entered. ]])