summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-06-26 03:54:08 +0200
committerBram Moolenaar <Bram@vim.org>2019-06-26 03:54:08 +0200
commit53a95d65840e9d48844fa0798f198eca765176e8 (patch)
tree1720faf98d6ddfe9db2165b8970ec7317dd4e431
parent68acb41f990405cb5ccd33fcba71a5d499c82974 (diff)
patch 8.1.1598: update to test file missingv8.1.1598
Problem: Update to test file missing. Solution: Update the popup window test file.
-rw-r--r--src/testdir/test_popupwin.vim19
-rw-r--r--src/version.c2
2 files changed, 21 insertions, 0 deletions
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index b6cef00370..f65abe46e2 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -134,6 +134,7 @@ func Test_popup_with_border_and_padding()
\ 'core_width': 12,
\ 'height': 3,
\ 'core_height': 1,
+ \ 'firstline': 1,
\ 'scrollbar': 0,
\ 'visible': 1}
let winid = popup_create('hello border', {'line': 2, 'col': 3, 'border': []})",
@@ -173,6 +174,7 @@ func Test_popup_with_border_and_padding()
\ 'height': 5,
\ 'scrollbar': 0,
\ 'core_height': 1,
+ \ 'firstline': 1,
\ 'visible': 1}, popup_getpos(winid))
call popup_clear()
@@ -1426,6 +1428,13 @@ func Test_popup_scrollbar()
\ 'minwidth': 8,
\ 'maxheight': 4,
\ })
+ func ScrollUp()
+ call feedkeys("\<F3>\<ScrollWheelUp>", "xt")
+ endfunc
+ func ScrollDown()
+ call feedkeys("\<F3>\<ScrollWheelDown>", "xt")
+ endfunc
+ map <silent> <F3> :call test_setmouse(5, 36)<CR>
END
call writefile(lines, 'XtestPopupScroll')
let buf = RunVimInTerminal('-S XtestPopupScroll', {'rows': 10})
@@ -1440,6 +1449,16 @@ func Test_popup_scrollbar()
call term_sendkeys(buf, ":call popup_setoptions(winid, {'firstline': 9})\<CR>")
call VerifyScreenDump(buf, 'Test_popupwin_scroll_4', {})
+ call term_sendkeys(buf, ":call ScrollUp()\<CR>")
+ call VerifyScreenDump(buf, 'Test_popupwin_scroll_5', {})
+
+ call term_sendkeys(buf, ":call ScrollDown()\<CR>")
+ call VerifyScreenDump(buf, 'Test_popupwin_scroll_6', {})
+
+ call term_sendkeys(buf, ":call ScrollDown()\<CR>")
+ call term_sendkeys(buf, ":call ScrollDown()\<CR>")
+ call VerifyScreenDump(buf, 'Test_popupwin_scroll_7', {})
+
" clean up
call StopVimInTerminal(buf)
call delete('XtestPopupScroll')
diff --git a/src/version.c b/src/version.c
index b4d568c6d0..f74cb66db6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1598,
+/**/
1597,
/**/
1596,