diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-08-06 02:44:15 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-08-06 04:22:45 +0200 |
| commit | 3827d5bc713d9ed149bc793f411debb5b89a4eba (patch) | |
| tree | fc61484a30532ef89f24c5b60534dccc56408d17 /test/functional/ui | |
| parent | d801ce70c1fb8dd8b3735ca9e06158aaf48203ba (diff) | |
| download | rneovim-3827d5bc713d9ed149bc793f411debb5b89a4eba.tar.gz rneovim-3827d5bc713d9ed149bc793f411debb5b89a4eba.tar.bz2 rneovim-3827d5bc713d9ed149bc793f411debb5b89a4eba.zip | |
input: skip dialogs if no UI is active
Treat dialogs in the same way as "silent mode" (`nvim -es`).
References #1984
References #3901
Diffstat (limited to 'test/functional/ui')
| -rw-r--r-- | test/functional/ui/wildmode_spec.lua | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/test/functional/ui/wildmode_spec.lua b/test/functional/ui/wildmode_spec.lua index 209b0bdfec..41a751c284 100644 --- a/test/functional/ui/wildmode_spec.lua +++ b/test/functional/ui/wildmode_spec.lua @@ -1,7 +1,7 @@ local helpers = require('test.functional.helpers')(after_each) local Screen = require('test.functional.ui.screen') local clear, feed, command = helpers.clear, helpers.feed, helpers.command -local iswin, set_shell_powershell = helpers.iswin, helpers.set_shell_powershell +local iswin = helpers.iswin local funcs = helpers.funcs local eq = helpers.eq local eval = helpers.eval @@ -124,12 +124,9 @@ describe("'wildmenu'", function() -- must wait the full timeout. So make it reasonable. screen.timeout = 1000 - if iswin() then - set_shell_powershell() - else - command('set shell=sh') + if not iswin() then + command('set shell=sh') -- Need a predictable "$" prompt. end - command('set laststatus=0') command('vsplit') command('term') @@ -137,7 +134,7 @@ describe("'wildmenu'", function() -- Check for a shell prompt to verify that the terminal loaded. retry(nil, nil, function() if iswin() then - eq('PS', eval("matchstr(join(getline(1, '$')), 'PS')")) + eq('Microsoft', eval("matchstr(join(getline(1, '$')), 'Microsoft')")) else eq('$', eval([[matchstr(getline(1), '\$')]])) end |