1 files changed, 34 insertions, 4 deletions
diff --git a/test/functional/api/window_spec.lua b/test/functional/api/window_spec.lua
index bb72b63b6c..11755a9d97 100644
--- a/test/functional/api/window_spec.lua
+++ b/test/functional/api/window_spec.lua
@@ -1,8 +1,9 @@
 local helpers = require('test.functional.helpers')(after_each)
 local clear, nvim, curbuf, curbuf_contents, window, curwin, eq, neq,
-  ok, feed, insert, eval = helpers.clear, helpers.nvim, helpers.curbuf,
+  ok, feed, insert, eval, tabpage = helpers.clear, helpers.nvim, helpers.curbuf,
   helpers.curbuf_contents, helpers.window, helpers.curwin, helpers.eq,
-  helpers.neq, helpers.ok, helpers.feed, helpers.insert, helpers.eval
+  helpers.neq, helpers.ok, helpers.feed, helpers.insert, helpers.eval,
+  helpers.tabpage
 local poke_eventloop = helpers.poke_eventloop
 local curwinmeths = helpers.curwinmeths
 local funcs = helpers.funcs
@@ -11,6 +12,7 @@ local NIL = helpers.NIL
 local meths = helpers.meths
 local command = helpers.command
 local pcall_err = helpers.pcall_err
+local assert_alive = helpers.assert_alive
 
 -- check if str is visible at the beginning of some line
 local function is_visible(str)
@@ -206,7 +208,7 @@ describe('API/win', function()
     end)
   end)
 
-  describe('{get,set}_option', function()
+  describe('nvim_win_get_option, nvim_win_set_option', function()
     it('works', function()
       curwin('set_option', 'colorcolumn', '4,3')
       eq('4,3', curwin('get_option', 'colorcolumn'))
@@ -224,6 +226,18 @@ describe('API/win', function()
         pcall_err(curwin, 'get_option', 'statusline'))
       eq('', eval('&l:statusline')) -- confirm local value was not copied
     end)
+
+    it('after switching windows #15390', function()
+      nvim('command', 'tabnew')
+      local tab1 = unpack(nvim('list_tabpages'))
+      local win1 = unpack(tabpage('list_wins', tab1))
+      window('set_option', win1, 'statusline', 'window-status')
+      nvim('command', 'split')
+      nvim('command', 'wincmd J')
+      nvim('command', 'wincmd j')
+      eq('window-status', window('get_option', win1, 'statusline'))
+      assert_alive()
+    end)
   end)
 
   describe('get_position', function()
@@ -311,7 +325,8 @@ describe('API/win', function()
       eq({newwin}, meths.list_wins())
     end)
 
-    it('handles changed buffer', function()
+    it("handles changed buffer when 'hidden' is unset", function()
+      command('set nohidden')
       local oldwin = meths.get_current_win()
       insert('text')
       command('new')
@@ -346,6 +361,21 @@ describe('API/win', function()
       eq(2, #meths.list_wins())
       eq('', funcs.getcmdwintype())
     end)
+
+    it('closing current (float) window of another tabpage #15313', function()
+      command('tabedit')
+      eq(2, eval('tabpagenr()'))
+      local win = meths.open_win(0, true, {
+        relative='editor', row=10, col=10, width=50, height=10
+      })
+      local tab = eval('tabpagenr()')
+      command('tabprevious')
+      eq(1, eval('tabpagenr()'))
+      meths.win_close(win, false)
+
+      eq(1001, meths.tabpage_get_win(tab).id)
+      assert_alive()
+    end)
   end)
 
   describe('hide', function()