mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-12 06:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

functests: Move wshada and sdrcmd commands to helpers

Browse Source
This commit is contained in:
ZyX
2015-08-08 14:54:47 +03:00
parent 42fbfd3aee
commit 17b5d27d85
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/functional/shada/compatibility_spec.lua
View File

@@ -3,20 +3,14 @@ local helpers = require('test.functional.helpers')
local nvim, nvim_window, nvim_curwin, nvim_command, nvim_feed, nvim_eval, eq = local nvim, nvim_window, nvim_curwin, nvim_command, nvim_feed, nvim_eval, eq =
helpers.nvim, helpers.window, helpers.curwin, helpers.command, helpers.feed, helpers.nvim, helpers.window, helpers.curwin, helpers.command, helpers.feed,
helpers.eval, helpers.eq helpers.eval, helpers.eq
local write_file = helpers.write_file
local shada_helpers = require('test.functional.shada.helpers') local shada_helpers = require('test.functional.shada.helpers')
local reset, set_additional_cmd, clear, exc_exec = local reset, set_additional_cmd, clear, exc_exec, get_shada_rw =
shada_helpers.reset, shada_helpers.set_additional_cmd, shada_helpers.reset, shada_helpers.set_additional_cmd,
shada_helpers.clear, shada_helpers.exc_exec shada_helpers.clear, shada_helpers.exc_exec,
shada_helpers.get_shada_rw
local shada_fname = 'Xtest-functional-shada-additional.shada' local wshada, sdrcmd, shada_fname = get_shada_rw('Xtest-functional-shada-compatibility.shada')
local wshada = function(text)
write_file(shada_fname, text, true)
end
local sdrcmd = function(bang)
return 'rshada' .. (bang and '!' or '') .. ' ' .. shada_fname
end
local msgpack = require('MessagePack') local msgpack = require('MessagePack')
local mpack_keys = {'type', 'timestamp', 'length', 'value'} local mpack_keys = {'type', 'timestamp', 'length', 'value'}

14
test/functional/shada/errors_spec.lua
View File

@@ -3,20 +3,14 @@ local helpers = require('test.functional.helpers')
local nvim, nvim_window, nvim_curwin, nvim_command, nvim_feed, nvim_eval, eq = local nvim, nvim_window, nvim_curwin, nvim_command, nvim_feed, nvim_eval, eq =
helpers.nvim, helpers.window, helpers.curwin, helpers.command, helpers.feed, helpers.nvim, helpers.window, helpers.curwin, helpers.command, helpers.feed,
helpers.eval, helpers.eq helpers.eval, helpers.eq
local write_file = helpers.write_file
local shada_helpers = require('test.functional.shada.helpers') local shada_helpers = require('test.functional.shada.helpers')
local reset, set_additional_cmd, clear, exc_exec = local reset, set_additional_cmd, clear, exc_exec, get_shada_rw =
shada_helpers.reset, shada_helpers.set_additional_cmd, shada_helpers.reset, shada_helpers.set_additional_cmd,
shada_helpers.clear, shada_helpers.exc_exec shada_helpers.clear, shada_helpers.exc_exec,
shada_helpers.get_shada_rw
local shada_fname = 'Xtest-functional-shada-errors.shada' local wshada, sdrcmd, shada_fname = get_shada_rw('Xtest-functional-shada-errors.shada')
local wshada = function(text)
write_file(shada_fname, text, true)
end
local sdrcmd = function(bang)
return 'rshada' .. (bang and '!' or '') .. ' ' .. shada_fname
end
describe('ShaDa error handling', function() describe('ShaDa error handling', function()
before_each(reset) before_each(reset)

12
test/functional/shada/helpers.lua
View File

@@ -2,6 +2,7 @@ local helpers = require('test.functional.helpers')
local spawn, set_session, nvim, nvim_prog, nvim_command, nvim_eval = local spawn, set_session, nvim, nvim_prog, nvim_command, nvim_eval =
helpers.spawn, helpers.set_session, helpers.nvim, helpers.nvim_prog, helpers.spawn, helpers.set_session, helpers.nvim, helpers.nvim_prog,
helpers.command, helpers.eval helpers.command, helpers.eval
local write_file = helpers.write_file
local tmpname = os.tmpname() local tmpname = os.tmpname()
local additional_cmd = '' local additional_cmd = ''
@@ -60,9 +61,20 @@ local exc_exec = function(cmd)
return ret return ret
end end
local get_shada_rw = function(fname)
local wshada = function(text)
write_file(fname, text, true)
end
local sdrcmd = function(bang)
return 'rshada' .. (bang and '!' or '') .. ' ' .. fname
end
return wshada, sdrcmd, fname
end
return { return {
reset=reset, reset=reset,
set_additional_cmd=set_additional_cmd, set_additional_cmd=set_additional_cmd,
clear=clear, clear=clear,
exc_exec=exc_exec, exc_exec=exc_exec,
get_shada_rw=get_shada_rw,
} }