diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2018-02-06 22:58:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-06 22:58:38 +0100 |
| commit | 2a4c9c6e4573ebeaaf5d30aeb2c8a9ce2ecab0d5 (patch) | |
| tree | a2ec5e3873226f665f1e809d415c46539811173e /test/functional/ui | |
| parent | 0851057a8deaa1197bd0af22babb62c1146d836c (diff) | |
| parent | 6744f48d884902483f95c9b89877da36032e2677 (diff) | |
| download | rneovim-2a4c9c6e4573ebeaaf5d30aeb2c8a9ce2ecab0d5.tar.gz rneovim-2a4c9c6e4573ebeaaf5d30aeb2c8a9ce2ecab0d5.tar.bz2 rneovim-2a4c9c6e4573ebeaaf5d30aeb2c8a9ce2ecab0d5.zip | |
Merge pull request #7844 from bfredl/shellout
shell: use msg functions for :!cmd so UTF-8 and binary is supported.
Diffstat (limited to 'test/functional/ui')
| -rw-r--r-- | test/functional/ui/bufhl_spec.lua | 15 | ||||
| -rw-r--r-- | test/functional/ui/output_spec.lua | 4 |
2 files changed, 6 insertions, 13 deletions
diff --git a/test/functional/ui/bufhl_spec.lua b/test/functional/ui/bufhl_spec.lua index 091c45596d..5b38921e50 100644 --- a/test/functional/ui/bufhl_spec.lua +++ b/test/functional/ui/bufhl_spec.lua @@ -2,11 +2,11 @@ local helpers = require('test.functional.helpers')(after_each) local Screen = require('test.functional.ui.screen') local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert -local command, request, neq = helpers.command, helpers.request, helpers.neq +local command, neq = helpers.command, helpers.neq +local curbufmeths = helpers.curbufmeths describe('Buffer highlighting', function() local screen - local curbuf before_each(function() clear() @@ -25,21 +25,14 @@ describe('Buffer highlighting', function() [9] = {foreground = Screen.colors.SlateBlue, underline = true}, [10] = {foreground = Screen.colors.Red} }) - curbuf = request('nvim_get_current_buf') end) after_each(function() screen:detach() end) - local function add_hl(...) - return request('nvim_buf_add_highlight', curbuf, ...) - end - - local function clear_hl(...) - return request('nvim_buf_clear_highlight', curbuf, ...) - end - + local add_hl = curbufmeths.add_highlight + local clear_hl = curbufmeths.clear_highlight it('works', function() insert([[ diff --git a/test/functional/ui/output_spec.lua b/test/functional/ui/output_spec.lua index c6d564e8dc..da3f474e08 100644 --- a/test/functional/ui/output_spec.lua +++ b/test/functional/ui/output_spec.lua @@ -33,8 +33,8 @@ describe("shell command :!", function() {4:~ }| {4:~ }| {4:~ }| + {4:~ }| :!printf foo; sleep 200 | - | foo | {3:-- TERMINAL --} | ]]) @@ -56,11 +56,11 @@ describe("shell command :!", function() -- Final chunk of output should always be displayed, never skipped. -- (Throttling is non-deterministic, this test is merely a sanity check.) screen:expect([[ - XXXXXXXXXX 2996 | XXXXXXXXXX 2997 | XXXXXXXXXX 2998 | XXXXXXXXXX 2999 | XXXXXXXXXX 3000 | + | {10:Press ENTER or type command to continue}{1: } | {3:-- TERMINAL --} | ]]) |