From c8f310825cf92da2feb25a7298998fcd1da5a769 Mon Sep 17 00:00:00 2001
From: Björn Linse <bjorn.linse@gmail.com>
Date: Sun, 3 Mar 2019 10:26:11 +0100
Subject: api: add nvim_win_close() to close window by id

---
 test/functional/api/window_spec.lua | 37 +++++++++++++++++++++++++++++++++++++
 test/functional/ui/float_spec.lua   | 31 +++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)

(limited to 'test')

diff --git a/test/functional/api/window_spec.lua b/test/functional/api/window_spec.lua
index 4496e1f644..4ff299cd18 100644
--- a/test/functional/api/window_spec.lua
+++ b/test/functional/api/window_spec.lua
@@ -286,4 +286,41 @@ describe('API/win', function()
       ok(not window('is_valid', win))
     end)
   end)
+
+  describe('close', function()
+    it('can close current window', function()
+      local oldwin = meths.get_current_win()
+      command('split')
+      local newwin = meths.get_current_win()
+      meths.win_close(newwin,false)
+      eq({oldwin}, meths.list_wins())
+    end)
+
+    it('can close noncurrent window', function()
+      local oldwin = meths.get_current_win()
+      command('split')
+      local newwin = meths.get_current_win()
+      meths.win_close(oldwin,false)
+      eq({newwin}, meths.list_wins())
+    end)
+
+    it('handles changed buffer', function()
+      local oldwin = meths.get_current_win()
+      insert('text')
+      command('new')
+      local newwin = meths.get_current_win()
+      eq({false,"Vim:E37: No write since last change (add ! to override)"},
+         meth_pcall(meths.win_close, oldwin,false))
+      eq({newwin,oldwin}, meths.list_wins())
+    end)
+
+    it('handles changed buffer with force', function()
+      local oldwin = meths.get_current_win()
+      insert('text')
+      command('new')
+      local newwin = meths.get_current_win()
+      meths.win_close(oldwin,true)
+      eq({newwin}, meths.list_wins())
+    end)
+  end)
 end)
diff --git a/test/functional/ui/float_spec.lua b/test/functional/ui/float_spec.lua
index 0d0ae60ce9..784c2d98f5 100644
--- a/test/functional/ui/float_spec.lua
+++ b/test/functional/ui/float_spec.lua
@@ -118,6 +118,37 @@ describe('floating windows', function()
                                                   |
         ]])
       end
+
+      meths.win_close(win, false)
+      if multigrid then
+        screen:expect([[
+        ## grid 1
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+          [2:----------------------------------------]|
+                                                  |
+        ## grid 2
+          ^                                        |
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+        ]])
+      else
+        screen:expect([[
+          ^                                        |
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+          {0:~                                       }|
+                                                  |
+        ]])
+      end
     end)
 
     it('API has proper error messages', function()
-- 
cgit