diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-08-09 23:31:53 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2019-09-01 09:03:46 -0700 |
| commit | f63d952ca289430fe729b5fc133b2143b91cd24b (patch) | |
| tree | 8ef4eab6aa99c0b548cb776d542b6ac0a5a69cf6 | |
| parent | 641c5b3f08076b305e9ae5f9a8843d2647053da0 (diff) | |
| download | rneovim-f63d952ca289430fe729b5fc133b2143b91cd24b.tar.gz rneovim-f63d952ca289430fe729b5fc133b2143b91cd24b.tar.bz2 rneovim-f63d952ca289430fe729b5fc133b2143b91cd24b.zip | |
test: use shell-test (avoid system shell)
| -rw-r--r-- | test/functional/terminal/ex_terminal_spec.lua | 6 | ||||
| -rw-r--r-- | test/functional/ui/wildmode_spec.lua | 18 |
2 files changed, 5 insertions, 19 deletions
diff --git a/test/functional/terminal/ex_terminal_spec.lua b/test/functional/terminal/ex_terminal_spec.lua index 591e6340cf..b0019d2d37 100644 --- a/test/functional/terminal/ex_terminal_spec.lua +++ b/test/functional/terminal/ex_terminal_spec.lua @@ -27,11 +27,7 @@ describe(':terminal', function() echomsg "msg3" ]]) -- Invoke a command that emits frequent terminal activity. - if iswin() then - feed_command([[terminal for /L \%I in (1,0,2) do echo \%I]]) - else - feed_command([[terminal while true; do echo X; done]]) - end + feed([[:terminal "]]..nvim_dir..[[/shell-test" REP 9999 !terminal_output!<cr>]]) feed([[<C-\><C-N>]]) wait() -- Wait for some terminal activity. diff --git a/test/functional/ui/wildmode_spec.lua b/test/functional/ui/wildmode_spec.lua index 914256224f..738466ae2b 100644 --- a/test/functional/ui/wildmode_spec.lua +++ b/test/functional/ui/wildmode_spec.lua @@ -7,6 +7,7 @@ local funcs = helpers.funcs local eq = helpers.eq local eval = helpers.eval local retry = helpers.retry +local nvim_dir = helpers.nvim_dir describe("'wildmenu'", function() local screen @@ -83,13 +84,8 @@ describe("'wildmenu'", function() it('is preserved during :terminal activity', function() command('set wildmenu wildmode=full') command('set scrollback=4') - if iswin() then - feed([[:terminal for /L \%I in (1,1,5000) do @(echo foo & echo foo & echo foo)<cr>]]) - else - feed([[:terminal for i in $(seq 1 5000); do printf 'foo\nfoo\nfoo\n'; sleep 0.1; done<cr>]]) - end - - feed([[<C-\><C-N>gg]]) + feed([[:terminal "]]..nvim_dir..[[/shell-test" REP 5000 !terminal_output!<cr>]]) + feed('G') -- Follow :terminal output. feed([[:sign <Tab>]]) -- Invoke wildmenu. -- NB: in earlier versions terminal output was redrawn during cmdline mode. -- For now just assert that the screen remains unchanged. @@ -114,13 +110,7 @@ describe("'wildmenu'", function() -- Exiting cmdline should show the buffer. feed([[<C-\><C-N>]]) - screen:expect([[ - ^foo | - foo | - foo | - foo | - | - ]]) + screen:expect{any=[[!terminal_output!]]} end) it('ignores :redrawstatus called from a timer #7108', function() |