diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/functional/core/startup_spec.lua | 4 | ||||
| -rw-r--r-- | test/functional/ex_cmds/menu_spec.lua | 3 | ||||
| -rw-r--r-- | test/functional/ui/mouse_spec.lua | 2 | ||||
| -rw-r--r-- | test/functional/ui/options_spec.lua | 11 | ||||
| -rw-r--r-- | test/functional/ui/popupmenu_spec.lua | 2 | ||||
| -rw-r--r-- | test/functional/ui/statusline_spec.lua | 2 |
6 files changed, 15 insertions, 9 deletions
diff --git a/test/functional/core/startup_spec.lua b/test/functional/core/startup_spec.lua index 31aa873aa6..51ab0e6382 100644 --- a/test/functional/core/startup_spec.lua +++ b/test/functional/core/startup_spec.lua @@ -524,8 +524,8 @@ describe('sysinit', function() screen:expect([[ ^ | Entering Debug mode. Type "cont" to continue. | - pre-vimrc command line | - cmd: set noruler | + nvim_exec() | + cmd: aunmenu * | > | <" -u NONE -i NONE --cmd "set noruler" -D 1,1 All| | diff --git a/test/functional/ex_cmds/menu_spec.lua b/test/functional/ex_cmds/menu_spec.lua index 0cd32df27c..b9ed32c328 100644 --- a/test/functional/ex_cmds/menu_spec.lua +++ b/test/functional/ex_cmds/menu_spec.lua @@ -64,6 +64,8 @@ describe('menu_get', function() before_each(function() clear() command([=[ + aunmenu * + nnoremenu &Test.Test inormal<ESC> inoremenu Test.Test insert vnoremenu Test.Test x @@ -396,6 +398,7 @@ describe('menu_get', function() before_each(function() clear() + command('aunmenu *') end) it('returns <keycode> representation of special keys', function() diff --git a/test/functional/ui/mouse_spec.lua b/test/functional/ui/mouse_spec.lua index e5284894cb..69b0d1ecec 100644 --- a/test/functional/ui/mouse_spec.lua +++ b/test/functional/ui/mouse_spec.lua @@ -32,7 +32,7 @@ describe('ui/mouse/input', function() [6] = {foreground = Screen.colors.Grey100, background = Screen.colors.Red}, [7] = {bold = true, foreground = Screen.colors.SeaGreen4}, }) - command("set display-=msgsep") + command("set display-=msgsep mousemodel=extend") feed('itesting<cr>mouse<cr>support and selection<esc>') screen:expect([[ testing | diff --git a/test/functional/ui/options_spec.lua b/test/functional/ui/options_spec.lua index 346a64c63b..c2b0bcdb64 100644 --- a/test/functional/ui/options_spec.lua +++ b/test/functional/ui/options_spec.lua @@ -63,17 +63,18 @@ describe('UI receives option updates', function() end screen:attach() screen:expect(function() - eq({'mouse_off'}, evs) + eq({'mouse_on'}, evs) end) - command("set mouse=nvi") + command("set mouse=") + command("set mouse&") screen:expect(function() - eq({'mouse_off','mouse_on'}, evs) + eq({'mouse_on','mouse_off', 'mouse_on'}, evs) end) screen:detach() - eq({'mouse_off','mouse_on'}, evs) + eq({'mouse_on','mouse_off', 'mouse_on'}, evs) screen:attach() screen:expect(function() - eq({'mouse_off','mouse_on','mouse_on'}, evs) + eq({'mouse_on','mouse_off','mouse_on', 'mouse_on'}, evs) end) end) diff --git a/test/functional/ui/popupmenu_spec.lua b/test/functional/ui/popupmenu_spec.lua index 0cd991756c..7b0005bcf1 100644 --- a/test/functional/ui/popupmenu_spec.lua +++ b/test/functional/ui/popupmenu_spec.lua @@ -2367,6 +2367,7 @@ describe('builtin popupmenu', function() call setline(1, 'popup menu test') set mouse=a mousemodel=popup + aunmenu PopUp menu PopUp.foo :let g:menustr = 'foo'<CR> menu PopUp.bar :let g:menustr = 'bar'<CR> menu PopUp.baz :let g:menustr = 'baz'<CR> @@ -2554,6 +2555,7 @@ describe('builtin popupmenu with ui/ext_multigrid', function() call setline(1, 'popup menu test') set mouse=a mousemodel=popup + aunmenu PopUp menu PopUp.foo :let g:menustr = 'foo'<CR> menu PopUp.bar :let g:menustr = 'bar'<CR> menu PopUp.baz :let g:menustr = 'baz'<CR> diff --git a/test/functional/ui/statusline_spec.lua b/test/functional/ui/statusline_spec.lua index 82e669856f..1e1066d48a 100644 --- a/test/functional/ui/statusline_spec.lua +++ b/test/functional/ui/statusline_spec.lua @@ -17,7 +17,7 @@ describe('statusline clicks', function() clear() screen = Screen.new(40, 8) screen:attach() - command('set laststatus=2') + command('set laststatus=2 mousemodel=extend') exec([=[ function! MyClickFunc(minwid, clicks, button, mods) let mods = trim(a:mods) |