aboutsummaryrefslogtreecommitdiff
path: root/test/functional
diff options
context:
space:
mode:
authorbfredl <bjorn.linse@gmail.com>2022-09-13 12:56:30 +0200
committerbfredl <bjorn.linse@gmail.com>2022-09-15 12:13:43 +0200
commit708bd686516b420c2b65f4bc4d2c58fe43fb945e (patch)
treedceae7b5fc616d7cfec138e5291d664ec7ba451e /test/functional
parentbf6de51f55c1b812342c7d4e88c65a7cae7fe97f (diff)
downloadrneovim-708bd686516b420c2b65f4bc4d2c58fe43fb945e.tar.gz
rneovim-708bd686516b420c2b65f4bc4d2c58fe43fb945e.tar.bz2
rneovim-708bd686516b420c2b65f4bc4d2c58fe43fb945e.zip
feat(ui): use msg_grid based implementation for cmdheight=0
Diffstat (limited to 'test/functional')
-rw-r--r--test/functional/ui/cmdline_spec.lua20
-rw-r--r--test/functional/vimscript/timer_spec.lua12
2 files changed, 16 insertions, 16 deletions
diff --git a/test/functional/ui/cmdline_spec.lua b/test/functional/ui/cmdline_spec.lua
index db13647cc6..40dee4186b 100644
--- a/test/functional/ui/cmdline_spec.lua
+++ b/test/functional/ui/cmdline_spec.lua
@@ -1022,7 +1022,7 @@ describe('cmdheight=0', function()
~ |
:^ |
]]}
- eq(1, eval('&cmdheight'))
+ eq(0, eval('&cmdheight'))
feed('<cr>')
screen:expect{grid=[[
^ |
@@ -1040,11 +1040,11 @@ describe('cmdheight=0', function()
screen:expect{grid=[[
|
~ |
- ~ |
- ~ |
+ |
+ :call input("foo >") |
foo >^ |
]]}
- eq(1, eval('&cmdheight'))
+ eq(0, eval('&cmdheight'))
feed('<cr>')
screen:expect{grid=[[
^ |
@@ -1060,8 +1060,8 @@ describe('cmdheight=0', function()
command("set cmdheight=0 noruler laststatus=3 winbar=foo")
feed(':split<CR>')
screen:expect{grid=[[
- foo |
|
+ :split |
E36: Not enough room |
Press ENTER or type comma|
nd to continue^ |
@@ -1079,7 +1079,7 @@ describe('cmdheight=0', function()
foo |
|
~ |
- [No Name] |
+ ~ |
:^ |
]]}
feed('<Esc>')
@@ -1103,8 +1103,8 @@ describe('cmdheight=0', function()
~ |
~ |
~ |
- recording @q |
- ]], showmode={}}
+ ~ |
+ ]]}
feed('q')
screen:expect{grid=[[
^ |
@@ -1112,7 +1112,7 @@ describe('cmdheight=0', function()
~ |
~ |
~ |
- ]], showmode={}}
+ ]], unchanged=true}
end)
it("when substitute text", function()
@@ -1131,7 +1131,7 @@ describe('cmdheight=0', function()
foo |
~ |
~ |
- [No Name] [+] |
+ ~ |
replace wi...q/l/^E/^Y)?^ |
]]}
diff --git a/test/functional/vimscript/timer_spec.lua b/test/functional/vimscript/timer_spec.lua
index 5463cfb234..1818a71ea2 100644
--- a/test/functional/vimscript/timer_spec.lua
+++ b/test/functional/vimscript/timer_spec.lua
@@ -131,34 +131,34 @@ describe('timers', function()
nvim_async("command", "call timer_start("..load_adjust(100)..", 'AddItem', {'repeat': -1})")
screen:expect([[
- ITEM 1 |
+ ^ITEM 1 |
ITEM 2 |
{1:~ }|
{1:~ }|
{1:~ }|
- ^ |
+ |
]])
nvim_async("command", "let g:cont = 1")
screen:expect([[
- ITEM 1 |
+ ^ITEM 1 |
ITEM 2 |
ITEM 3 |
{1:~ }|
{1:~ }|
- ^ |
+ |
]])
feed("3")
eq(51, eval("g:c2"))
- screen:expect([[
+ screen:expect{grid=[[
^ITEM 1 |
ITEM 2 |
ITEM 3 |
{1:~ }|
{1:~ }|
|
- ]])
+ ]], unchanged=true}
end)
it('can be stopped', function()