aboutsummaryrefslogtreecommitdiff
path: root/test/functional/legacy/034_user_function_spec.lua
diff options
context:
space:
mode:
authorJakob Schnitzer <mail@jakobschnitzer.de>2017-04-24 11:35:10 +0200
committerJakob Schnitzer <mail@jakobschnitzer.de>2017-04-24 11:35:10 +0200
commitff8b2eb435c518f0eafd0e509afe1f5ee4a81fd1 (patch)
tree526b1df09b06121bdbc6ef5254ef53821958a6cb /test/functional/legacy/034_user_function_spec.lua
parent4049492b6d7b8805686b14dbacb3b729abd03308 (diff)
parent7f6d3d305269fd1139bc2aec9a91bf98ad595199 (diff)
downloadrneovim-ff8b2eb435c518f0eafd0e509afe1f5ee4a81fd1.tar.gz
rneovim-ff8b2eb435c518f0eafd0e509afe1f5ee4a81fd1.tar.bz2
rneovim-ff8b2eb435c518f0eafd0e509afe1f5ee4a81fd1.zip
Merge branch 'master' into option-fixes
Diffstat (limited to 'test/functional/legacy/034_user_function_spec.lua')
-rw-r--r--test/functional/legacy/034_user_function_spec.lua22
1 files changed, 11 insertions, 11 deletions
diff --git a/test/functional/legacy/034_user_function_spec.lua b/test/functional/legacy/034_user_function_spec.lua
index 38989cd982..0b7dfc4f0e 100644
--- a/test/functional/legacy/034_user_function_spec.lua
+++ b/test/functional/legacy/034_user_function_spec.lua
@@ -5,7 +5,7 @@
local helpers = require('test.functional.helpers')(after_each)
local feed, insert, source = helpers.feed, helpers.insert, helpers.source
-local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
+local clear, feed_command, expect = helpers.clear, helpers.feed_command, helpers.expect
describe('user functions, expr-mappings, overwrite protected builtin functions and regression on calling expressions', function()
setup(clear)
@@ -72,19 +72,19 @@ describe('user functions, expr-mappings, overwrite protected builtin functions a
feed('(one<cr>')
feed('(two<cr>')
feed('[(one again<esc>')
- execute('call append(line("$"), max([1, 2, 3]))')
- execute('call extend(g:, {"max": function("min")})')
- execute('call append(line("$"), max([1, 2, 3]))')
- execute('try')
+ feed_command('call append(line("$"), max([1, 2, 3]))')
+ feed_command('call extend(g:, {"max": function("min")})')
+ feed_command('call append(line("$"), max([1, 2, 3]))')
+ feed_command('try')
-- Regression: the first line below used to throw "E110: Missing ')'"
-- Second is here just to prove that this line is correct when not
-- skipping rhs of &&.
- execute([[ $put =(0&&(function('tr'))(1, 2, 3))]])
- execute([[ $put =(1&&(function('tr'))(1, 2, 3))]])
- execute('catch')
- execute([[ $put ='!!! Unexpected exception:']])
- execute(' $put =v:exception')
- execute('endtry')
+ feed_command([[ $put =(0&&(function('tr'))(1, 2, 3))]])
+ feed_command([[ $put =(1&&(function('tr'))(1, 2, 3))]])
+ feed_command('catch')
+ feed_command([[ $put ='!!! Unexpected exception:']])
+ feed_command(' $put =v:exception')
+ feed_command('endtry')
-- Assert buffer contents.
expect([[