test: add tests for #13549 #20285 #20290

2 files changed, 48 insertions, 0 deletions

diff --git a/test/functional/editor/tabpage_spec.lua b/test/functional/editor/tabpage_spec.lua
index 849a02c28b..01779a9a92 100644
--- a/test/functional/editor/tabpage_spec.lua
+++ b/test/functional/editor/tabpage_spec.lua
@@ -9,6 +9,9 @@ local feed = helpers.feed
 local eval = helpers.eval
 local exec = helpers.exec
 local funcs = helpers.funcs
+local meths = helpers.meths
+local curwin = helpers.curwin
+local assert_alive = helpers.assert_alive
 
 describe('tabpage', function()
   before_each(clear)
@@ -54,6 +57,45 @@ describe('tabpage', function()
     neq(999, eval('g:win_closed'))
   end)
 
+  it('no segfault with strange WinClosed autocommand #20290', function()
+    pcall(exec, [[
+      set nohidden
+      edit Xa
+      split Xb
+      tab split
+      new
+      autocmd WinClosed * tabprev | bwipe!
+      close
+    ]])
+    assert_alive()
+  end)
+
+  it('nvim_win_close and nvim_win_hide update tabline #20285', function()
+    eq(1, #meths.list_tabpages())
+    eq({1, 1}, funcs.win_screenpos(0))
+    local win1 = curwin().id
+
+    command('tabnew')
+    eq(2, #meths.list_tabpages())
+    eq({2, 1}, funcs.win_screenpos(0))
+    local win2 = curwin().id
+
+    meths.win_close(win1, true)
+    eq(win2, curwin().id)
+    eq(1, #meths.list_tabpages())
+    eq({1, 1}, funcs.win_screenpos(0))
+
+    command('tabnew')
+    eq(2, #meths.list_tabpages())
+    eq({2, 1}, funcs.win_screenpos(0))
+    local win3 = curwin().id
+
+    meths.win_close(win2, true)
+    eq(win3, curwin().id)
+    eq(1, #meths.list_tabpages())
+    eq({1, 1}, funcs.win_screenpos(0))
+  end)
+
   it('switching tabpage after setting laststatus=3 #19591', function()
     local screen = Screen.new(40, 8)
     screen:set_default_attr_ids({
diff --git a/test/functional/terminal/buffer_spec.lua b/test/functional/terminal/buffer_spec.lua
index 23430a620b..9d10f43ec6 100644
--- a/test/functional/terminal/buffer_spec.lua
+++ b/test/functional/terminal/buffer_spec.lua
@@ -4,6 +4,7 @@ local assert_alive = helpers.assert_alive
 local feed, clear, nvim = helpers.feed, helpers.clear, helpers.nvim
 local poke_eventloop = helpers.poke_eventloop
 local eval, feed_command, source = helpers.eval, helpers.feed_command, helpers.source
+local pcall_err = helpers.pcall_err
 local eq, neq = helpers.eq, helpers.neq
 local meths = helpers.meths
 local retry = helpers.retry
@@ -339,6 +340,11 @@ describe(':terminal buffer', function()
     ]]}
     eq('t', funcs.mode(1))
   end)
+
+  it('writing to an existing file with :w fails #13549', function()
+    eq('Vim(write):E13: File exists (add ! to override)',
+       pcall_err(command, 'write test/functional/fixtures/tty-test.c'))
+  end)
 end)
 
 describe('No heap-buffer-overflow when using', function()