aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Schnitzer <mail@jakobschnitzer.de>2017-06-28 20:21:44 +0200
committerJakob Schnitzer <mail@jakobschnitzer.de>2017-06-28 20:23:03 +0200
commit4403864da3c48412595d439f36458d1e6ccfc49f (patch)
tree00c239ea15609435a0685fc233c5df182cadb6b1
parente8829710bc5f38208499e0ad38402eac24a67ac2 (diff)
downloadrneovim-4403864da3c48412595d439f36458d1e6ccfc49f.tar.gz
rneovim-4403864da3c48412595d439f36458d1e6ccfc49f.tar.bz2
rneovim-4403864da3c48412595d439f36458d1e6ccfc49f.zip
update tests
-rw-r--r--test/functional/options/num_options_spec.lua30
1 files changed, 15 insertions, 15 deletions
diff --git a/test/functional/options/num_options_spec.lua b/test/functional/options/num_options_spec.lua
index 42af4cb9b8..ed17ffdd3c 100644
--- a/test/functional/options/num_options_spec.lua
+++ b/test/functional/options/num_options_spec.lua
@@ -1,16 +1,16 @@
-- Tests for :setlocal and :setglobal
local helpers = require('test.functional.helpers')(after_each)
-local clear, execute, eval, eq, meths =
- helpers.clear, helpers.execute, helpers.eval, helpers.eq, helpers.meths
+local clear, feed_command, eval, eq, meths =
+ helpers.clear, helpers.feed_command, helpers.eval, helpers.eq, helpers.meths
local function should_fail(opt, value, errmsg)
- execute('setglobal ' .. opt .. '=' .. value)
+ feed_command('setglobal ' .. opt .. '=' .. value)
eq(errmsg, eval("v:errmsg"):match("E%d*"))
- execute('let v:errmsg = ""')
- execute('setlocal ' .. opt .. '=' .. value)
+ feed_command('let v:errmsg = ""')
+ feed_command('setlocal ' .. opt .. '=' .. value)
eq(errmsg, eval("v:errmsg"):match("E%d*"))
- execute('let v:errmsg = ""')
+ feed_command('let v:errmsg = ""')
local status, err = pcall(meths.set_option, opt, value)
eq(status, false)
eq(errmsg, err:match("E%d*"))
@@ -18,8 +18,8 @@ local function should_fail(opt, value, errmsg)
end
local function should_succeed(opt, value)
- execute('setglobal ' .. opt .. '=' .. value)
- execute('setlocal ' .. opt .. '=' .. value)
+ feed_command('setglobal ' .. opt .. '=' .. value)
+ feed_command('setlocal ' .. opt .. '=' .. value)
meths.set_option(opt, value)
eq(value, meths.get_option(opt))
eq('', eval("v:errmsg"))
@@ -30,10 +30,10 @@ describe(':setlocal', function()
it('setlocal sets only local value', function()
eq(0, meths.get_option('iminsert'))
- execute('setlocal iminsert=1')
+ feed_command('setlocal iminsert=1')
eq(0, meths.get_option('iminsert'))
eq(0, meths.get_option('imsearch'))
- execute('setlocal imsearch=1')
+ feed_command('setlocal imsearch=1')
eq(0, meths.get_option('imsearch'))
end)
end)
@@ -79,19 +79,19 @@ describe(':set validation', function()
should_fail('numberwidth', 0, 'E487')
-- If smaller than 1 this one is set to 'lines'-1
- execute('setglobal window=-10')
+ feed_command('setglobal window=-10')
meths.set_option('window', -10)
eq(23, meths.get_option('window'))
eq('', eval("v:errmsg"))
end)
it('set wmh/wh wmw/wiw checks', function()
- execute('set winheight=2')
- execute('set winminheight=3')
+ feed_command('set winheight=2')
+ feed_command('set winminheight=3')
eq('E591', eval("v:errmsg"):match("E%d*"))
- execute('set winwidth=2')
- execute('set winminwidth=3')
+ feed_command('set winwidth=2')
+ feed_command('set winminwidth=3')
eq('E592', eval("v:errmsg"):match("E%d*"))
end)
end)