4 files changed, 57 insertions, 7 deletions
diff --git a/test/functional/api/buffer_spec.lua b/test/functional/api/buffer_spec.lua
index 2cc803da52..da755802a7 100644
--- a/test/functional/api/buffer_spec.lua
+++ b/test/functional/api/buffer_spec.lua
@@ -4,6 +4,7 @@ local clear, nvim, buffer = helpers.clear, helpers.nvim, helpers.buffer
 local curbuf, curwin, eq = helpers.curbuf, helpers.curwin, helpers.eq
 local curbufmeths, ok = helpers.curbufmeths, helpers.ok
 local funcs, request = helpers.funcs, helpers.request
+local NIL = helpers.NIL
 
 describe('buffer_* functions', function()
   before_each(clear)
@@ -250,6 +251,21 @@ describe('buffer_* functions', function()
       curbufmeths.del_var('lua')
       eq(0, funcs.exists('b:lua'))
     end)
+
+    it('buffer_set_var returns the old value', function()
+      local val1 = {1, 2, {['3'] = 1}}
+      local val2 = {4, 7}
+      eq(NIL, request('buffer_set_var', 0, 'lua', val1))
+      eq(val1, request('buffer_set_var', 0, 'lua', val2))
+    end)
+
+    it('buffer_del_var returns the old value', function()
+      local val1 = {1, 2, {['3'] = 1}}
+      local val2 = {4, 7}
+      eq(NIL,  request('buffer_set_var', 0, 'lua', val1))
+      eq(val1, request('buffer_set_var', 0, 'lua', val2))
+      eq(val2, request('buffer_del_var', 0, 'lua'))
+    end)
   end)
 
   describe('{get,set}_option', function()
diff --git a/test/functional/api/tabpage_spec.lua b/test/functional/api/tabpage_spec.lua
index 7b97c7f067..5bb8f27223 100644
--- a/test/functional/api/tabpage_spec.lua
+++ b/test/functional/api/tabpage_spec.lua
@@ -5,6 +5,8 @@ local clear, nvim, tabpage, curtab, eq, ok =
   helpers.ok
 local curtabmeths = helpers.curtabmeths
 local funcs = helpers.funcs
+local request = helpers.request
+local NIL = helpers.NIL
 
 describe('tabpage_* functions', function()
   before_each(clear)
@@ -32,6 +34,21 @@ describe('tabpage_* functions', function()
       curtabmeths.del_var('lua')
       eq(0, funcs.exists('t:lua'))
     end)
+
+    it('tabpage_set_var returns the old value', function()
+      local val1 = {1, 2, {['3'] = 1}}
+      local val2 = {4, 7}
+      eq(NIL, request('tabpage_set_var', 0, 'lua', val1))
+      eq(val1, request('tabpage_set_var', 0, 'lua', val2))
+    end)
+
+    it('tabpage_del_var returns the old value', function()
+      local val1 = {1, 2, {['3'] = 1}}
+      local val2 = {4, 7}
+      eq(NIL,  request('tabpage_set_var', 0, 'lua', val1))
+      eq(val1, request('tabpage_set_var', 0, 'lua', val2))
+      eq(val2, request('tabpage_del_var', 0, 'lua'))
+    end)
   end)
 
   describe('is_valid', function()
diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua
index 351094567a..0a2fd18db2 100644
--- a/test/functional/api/vim_spec.lua
+++ b/test/functional/api/vim_spec.lua
@@ -88,19 +88,19 @@ describe('vim_* functions', function()
       eq(0, funcs.exists('g:lua'))
     end)
 
-    it('set_var returns the old value', function()
+    it('vim_set_var returns the old value', function()
       local val1 = {1, 2, {['3'] = 1}}
       local val2 = {4, 7}
-      eq(NIL, nvim('set_var', 'lua', val1))
-      eq(val1, nvim('set_var', 'lua', val2))
+      eq(NIL, request('vim_set_var', 'lua', val1))
+      eq(val1, request('vim_set_var', 'lua', val2))
     end)
 
-    it('del_var returns the old value', function()
+    it('vim_del_var returns the old value', function()
       local val1 = {1, 2, {['3'] = 1}}
       local val2 = {4, 7}
-      eq(NIL, meths.set_var('lua', val1))
-      eq(val1, meths.set_var('lua', val2))
-      eq(val2, meths.del_var('lua'))
+      eq(NIL,  request('vim_set_var', 'lua', val1))
+      eq(val1, request('vim_set_var', 'lua', val2))
+      eq(val2, request('vim_del_var', 'lua'))
     end)
 
     it('truncates values with NULs in them', function()
diff --git a/test/functional/api/window_spec.lua b/test/functional/api/window_spec.lua
index d90323181c..97abcc1e9e 100644
--- a/test/functional/api/window_spec.lua
+++ b/test/functional/api/window_spec.lua
@@ -7,6 +7,8 @@ local clear, nvim, curbuf, curbuf_contents, window, curwin, eq, neq,
 local wait = helpers.wait
 local curwinmeths = helpers.curwinmeths
 local funcs = helpers.funcs
+local request = helpers.request
+local NIL = helpers.NIL
 
 -- check if str is visible at the beginning of some line
 local function is_visible(str)
@@ -137,6 +139,21 @@ describe('window_* functions', function()
       curwinmeths.del_var('lua')
       eq(0, funcs.exists('w:lua'))
     end)
+
+    it('window_set_var returns the old value', function()
+      local val1 = {1, 2, {['3'] = 1}}
+      local val2 = {4, 7}
+      eq(NIL, request('window_set_var', 0, 'lua', val1))
+      eq(val1, request('window_set_var', 0, 'lua', val2))
+    end)
+
+    it('window_del_var returns the old value', function()
+      local val1 = {1, 2, {['3'] = 1}}
+      local val2 = {4, 7}
+      eq(NIL,  request('window_set_var', 0, 'lua', val1))
+      eq(val1, request('window_set_var', 0, 'lua', val2))
+      eq(val2, request('window_del_var', 0, 'lua'))
+    end)
   end)
 
   describe('{get,set}_option', function()