diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-04-10 22:21:06 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-04-10 22:21:06 +0300 |
| commit | ab4d13e2fa09db538756cc5cfb36f81681e5ff7a (patch) | |
| tree | b8bded415655f09bc323a23d21ed8d7e74b1c8da /test/functional/legacy/034_user_function_spec.lua | |
| parent | a40a969e9a4776f1e274dcf0e59c8f1ec1770ca0 (diff) | |
| parent | 9aface8c4d1edd25d4fed3e099e3c2c02b0a282a (diff) | |
| download | rneovim-ab4d13e2fa09db538756cc5cfb36f81681e5ff7a.tar.gz rneovim-ab4d13e2fa09db538756cc5cfb36f81681e5ff7a.tar.bz2 rneovim-ab4d13e2fa09db538756cc5cfb36f81681e5ff7a.zip | |
Merge branch 'master' into luaviml'/lua
Diffstat (limited to 'test/functional/legacy/034_user_function_spec.lua')
| -rw-r--r-- | test/functional/legacy/034_user_function_spec.lua | 22 |
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([[ |