commit 8caef443b2a71b937061399a216bcfa854aed33d
author Bram Moolenaar <Bram@vim.org> Sat May 04 17:30:04 2019 +0200
committer Bram Moolenaar <Bram@vim.org> Sat May 04 17:30:04 2019 +0200
tree 68df8f4f8cc0dfe1e1d1e5907c9ed8d6fcacfcef
parent bedf091a951bdcd5f9f13839c0aaf2e395a635f6

patch 8.1.1266: winbar test doesn't test enough

Problem:    Winbar test doesn't test enough.
Solution:   Check that the WinBar actually shows up.  Correct check for clicks
            with no effect. (Ben Jackson, closes #4338)

src/testdir/test_winbar.vim

diff --git a/src/testdir/test_winbar.vim b/src/testdir/test_winbar.vim
index fd44ac9..ada8f6b 100644
--- a/src/testdir/test_winbar.vim
+++ b/src/testdir/test_winbar.vim
@@ -4,10 +4,15 @@
   finish
 endif
 
+source shared.vim
+
 func Test_add_remove_menu()
   new
   amenu 1.10 WinBar.Next :let g:did_next = 11<CR>
   amenu 1.20 WinBar.Cont :let g:did_cont = 12<CR>
+  redraw
+  call assert_match('Next    Cont', Screenline(1))
+
   emenu WinBar.Next
   call assert_equal(11, g:did_next)
   emenu WinBar.Cont
@@ -28,6 +33,7 @@
   amenu 1.20 WinBar.Cont :let g:did_cont = 12<CR>
   amenu 1.30 WinBar.Close :close<CR>
   redraw
+  call assert_match('Next    Cont    Close', Screenline(1))
 
   let save_mouse = &mouse
   set mouse=a
@@ -38,7 +44,7 @@
   let g:did_next = 0
   let g:did_cont = 0
   for col in [1, 8, 9, 16, 17, 25, 26]
-    call test_setmouse(1, 1)
+    call test_setmouse(1, col)
     call feedkeys("\<LeftMouse>", "xt")
     call assert_equal(0, g:did_next, 'col ' .. col)
     call assert_equal(0, g:did_cont, 'col ' .. col)

src/version.c

diff --git a/src/version.c b/src/version.c
index 3edde60..8458a81 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1266,
+/**/
     1265,
 /**/
     1264,