aboutsummaryrefslogtreecommitdiff
path: root/test/functional/vimscript/input_spec.lua
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-08-23 10:38:53 +0800
committerGitHub <noreply@github.com>2022-08-23 10:38:53 +0800
commitd5328ea408d93d53b46417a65ca3b2fc99ab64b6 (patch)
tree0352a53acec92b8073dc58f180f52b821aceaeb3 /test/functional/vimscript/input_spec.lua
parent48a4657aee76e41d097b0730c91bcca78b5bc9c7 (diff)
downloadrneovim-d5328ea408d93d53b46417a65ca3b2fc99ab64b6.tar.gz
rneovim-d5328ea408d93d53b46417a65ca3b2fc99ab64b6.tar.bz2
rneovim-d5328ea408d93d53b46417a65ca3b2fc99ab64b6.zip
vim-patch:8.2.0522: several errors are not tested for (#19901)
Problem: Several errors are not tested for. Solution: Add tests. (Yegappan Lakshmanan, closes vim/vim#5892) https://github.com/vim/vim/commit/ee4e0c1e9a81cb5d96e0060203a9033c2f28588e Omit Test_range() change: reverted in patch 8.2.0615. Cherry-pick Test_z_no_space_before_xxx() from patch 8.2.0195. Cherry-pick Test_reverse_sort_uniq() change from patch 8.2.0183. Make uniq() error behavior consistent with sort(). Cherry-pick Test_set_ttytype() change from patch 8.1.1826. Cherry-pick quickfix checks from patch 8.1.2373 to test_preview.vim. Test_viminfo_error() is applicable. Cherry-pick E1058 from patch 8.2.0149 and port Test_deep_nest() to Lua.
Diffstat (limited to 'test/functional/vimscript/input_spec.lua')
-rw-r--r--test/functional/vimscript/input_spec.lua20
1 files changed, 10 insertions, 10 deletions
diff --git a/test/functional/vimscript/input_spec.lua b/test/functional/vimscript/input_spec.lua
index d6ab71b7d5..f50b39c2c5 100644
--- a/test/functional/vimscript/input_spec.lua
+++ b/test/functional/vimscript/input_spec.lua
@@ -455,24 +455,24 @@ describe('confirm()', function()
meths.set_option('more', false) -- Avoid hit-enter prompt
meths.set_option('laststatus', 2)
-- screen:expect() calls are needed to avoid feeding input too early
- screen:expect({any = 'No Name'})
+ screen:expect({any = '%[No Name%]'})
async_meths.command([[let a = confirm('Press O to proceed')]])
screen:expect({any = '{CONFIRM:.+: }'})
feed('o')
- screen:expect({any = 'No Name'})
+ screen:expect({any = '%[No Name%]'})
eq(1, meths.get_var('a'))
- async_meths.command([[let a = confirm('Are you sure?', "&Yes\n&No")]])
+ async_meths.command([[let a = 'Are you sure?'->confirm("&Yes\n&No")]])
screen:expect({any = '{CONFIRM:.+: }'})
feed('y')
- screen:expect({any = 'No Name'})
+ screen:expect({any = '%[No Name%]'})
eq(1, meths.get_var('a'))
async_meths.command([[let a = confirm('Are you sure?', "&Yes\n&No")]])
screen:expect({any = '{CONFIRM:.+: }'})
feed('n')
- screen:expect({any = 'No Name'})
+ screen:expect({any = '%[No Name%]'})
eq(2, meths.get_var('a'))
-- Not possible to match Vim's CTRL-C test here as CTRL-C always sets got_int in Nvim.
@@ -481,26 +481,26 @@ describe('confirm()', function()
async_meths.command([[let a = confirm('Are you sure?', "&Yes\n&No")]])
screen:expect({any = '{CONFIRM:.+: }'})
feed('<Esc>')
- screen:expect({any = 'No Name'})
+ screen:expect({any = '%[No Name%]'})
eq(0, meths.get_var('a'))
-- Default choice is returned when pressing <CR>.
async_meths.command([[let a = confirm('Are you sure?', "&Yes\n&No")]])
screen:expect({any = '{CONFIRM:.+: }'})
feed('<CR>')
- screen:expect({any = 'No Name'})
+ screen:expect({any = '%[No Name%]'})
eq(1, meths.get_var('a'))
async_meths.command([[let a = confirm('Are you sure?', "&Yes\n&No", 2)]])
screen:expect({any = '{CONFIRM:.+: }'})
feed('<CR>')
- screen:expect({any = 'No Name'})
+ screen:expect({any = '%[No Name%]'})
eq(2, meths.get_var('a'))
async_meths.command([[let a = confirm('Are you sure?', "&Yes\n&No", 0)]])
screen:expect({any = '{CONFIRM:.+: }'})
feed('<CR>')
- screen:expect({any = 'No Name'})
+ screen:expect({any = '%[No Name%]'})
eq(0, meths.get_var('a'))
-- Test with the {type} 4th argument
@@ -508,7 +508,7 @@ describe('confirm()', function()
async_meths.command(([[let a = confirm('Are you sure?', "&Yes\n&No", 1, '%s')]]):format(type))
screen:expect({any = '{CONFIRM:.+: }'})
feed('y')
- screen:expect({any = 'No Name'})
+ screen:expect({any = '%[No Name%]'})
eq(1, meths.get_var('a'))
end