1 files changed, 15 insertions, 19 deletions
diff --git a/test/functional/ex_getln/history_spec.lua b/test/functional/ex_getln/history_spec.lua
index c3ef56c8ad..532c81dab9 100644
--- a/test/functional/ex_getln/history_spec.lua
+++ b/test/functional/ex_getln/history_spec.lua
@@ -1,40 +1,36 @@
 local helpers = require('test.functional.helpers')
-local clear, nvim, call, eq =
-  helpers.clear, helpers.nvim, helpers.call, helpers.eq
+local clear, meths, funcs, eq =
+  helpers.clear, helpers.meths, helpers.funcs, helpers.eq
 
 describe('history support code', function()
   before_each(clear)
 
-  local histadd = function(...) return call('histadd', ...) end
-  local histget = function(...) return call('histget', ...) end
-  local histdel = function(...) return call('histdel', ...) end
-
   it('correctly clears start of the history', function()
     -- Regression test: check absense of the memory leak when clearing start of 
     -- the history using ex_getln.c/clr_history().
-    eq(1, histadd(':', 'foo'))
-    eq(1, histdel(':'))
-    eq('', histget(':', -1))
+    eq(1, funcs.histadd(':', 'foo'))
+    eq(1, funcs.histdel(':'))
+    eq('', funcs.histget(':', -1))
   end)
 
   it('correctly clears end of the history', function()
     -- Regression test: check absense of the memory leak when clearing end of 
     -- the history using ex_getln.c/clr_history().
-    nvim('set_option', 'history', 1)
-    eq(1, histadd(':', 'foo'))
-    eq(1, histdel(':'))
-    eq('', histget(':', -1))
+    meths.set_option('history', 1)
+    eq(1, funcs.histadd(':', 'foo'))
+    eq(1, funcs.histdel(':'))
+    eq('', funcs.histget(':', -1))
   end)
 
   it('correctly removes item from history', function()
     -- Regression test: check that ex_getln.c/del_history_idx() correctly clears 
     -- history index after removing history entry. If it does not then deleting 
     -- history will result in a double free.
-    eq(1, histadd(':', 'foo'))
-    eq(1, histadd(':', 'bar'))
-    eq(1, histadd(':', 'baz'))
-    eq(1, histdel(':', -2))
-    eq(1, histdel(':'))
-    eq('', histget(':', -1))
+    eq(1, funcs.histadd(':', 'foo'))
+    eq(1, funcs.histadd(':', 'bar'))
+    eq(1, funcs.histadd(':', 'baz'))
+    eq(1, funcs.histdel(':', -2))
+    eq(1, funcs.histdel(':'))
+    eq('', funcs.histget(':', -1))
   end)
 end)