diff options
| author | Daniel Hahler <git@thequod.de> | 2019-08-19 13:21:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-19 13:21:17 +0200 |
| commit | 46cb85691c18f99af70de65d0168e972b1dc57dd (patch) | |
| tree | ea5f4f74a4d0d21de13095e34ba74e8c3c557da9 | |
| parent | 2963533fe1124139a5a8992ddf8d5b197b21cd51 (diff) | |
| parent | 47d679c0c24765b7bd6808dc720f5f59f47cc0b8 (diff) | |
| download | rneovim-46cb85691c18f99af70de65d0168e972b1dc57dd.tar.gz rneovim-46cb85691c18f99af70de65d0168e972b1dc57dd.tar.bz2 rneovim-46cb85691c18f99af70de65d0168e972b1dc57dd.zip | |
Merge pull request #10626 from janlazo/test/enable
Windows: enable more tests
| -rw-r--r-- | test/functional/terminal/buffer_spec.lua | 7 | ||||
| -rw-r--r-- | test/functional/terminal/window_split_tab_spec.lua | 1 | ||||
| -rw-r--r-- | test/functional/ui/output_spec.lua | 3 |
3 files changed, 5 insertions, 6 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("\<C-\>", 't') " vim will expect <C-n>, but be exited out of " the terminal before it can be entered. ]]) 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('<c-\\><c-n>') feed('k') feed_command('2split') 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") |