diff options
Diffstat (limited to 'test/functional/autocmd/termxx_spec.lua')
| -rw-r--r-- | test/functional/autocmd/termxx_spec.lua | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/functional/autocmd/termxx_spec.lua b/test/functional/autocmd/termxx_spec.lua index a9980dda04..9ec1469c03 100644 --- a/test/functional/autocmd/termxx_spec.lua +++ b/test/functional/autocmd/termxx_spec.lua @@ -16,14 +16,14 @@ local is_os = helpers.is_os describe('autocmd TermClose', function() before_each(function() clear() - nvim('set_option', 'shell', testprg('shell-test')) + nvim('set_option_value', 'shell', testprg('shell-test'), {}) command('set shellcmdflag=EXE shellredir= shellpipe= shellquote= shellxquote=') end) local function test_termclose_delete_own_buf() -- The terminal process needs to keep running so that TermClose isn't triggered immediately. - nvim('set_option', 'shell', string.format('"%s" INTERACT', testprg('shell-test'))) + nvim('set_option_value', 'shell', string.format('"%s" INTERACT', testprg('shell-test')), {}) command('autocmd TermClose * bdelete!') command('terminal') matches('^TermClose Autocommands for "%*": Vim%(bdelete%):E937: Attempt to delete a buffer that is in use: term://', @@ -51,7 +51,7 @@ describe('autocmd TermClose', function() it('triggers when long-running terminal job gets stopped', function() skip(is_os('win')) - nvim('set_option', 'shell', is_os('win') and 'cmd.exe' or 'sh') + nvim('set_option_value', 'shell', is_os('win') and 'cmd.exe' or 'sh', {}) command('autocmd TermClose * let g:test_termclose = 23') command('terminal') command('call jobstop(b:terminal_job_id)') @@ -60,8 +60,8 @@ describe('autocmd TermClose', function() it('kills job trapping SIGTERM', function() skip(is_os('win')) - nvim('set_option', 'shell', 'sh') - nvim('set_option', 'shellcmdflag', '-c') + nvim('set_option_value', 'shell', 'sh', {}) + nvim('set_option_value', 'shellcmdflag', '-c', {}) command([[ let g:test_job = jobstart('trap "" TERM && echo 1 && sleep 60', { ]] .. [[ 'on_stdout': {-> execute('let g:test_job_started = 1')}, ]] .. [[ 'on_exit': {-> execute('let g:test_job_exited = 1')}}) ]]) @@ -80,8 +80,8 @@ describe('autocmd TermClose', function() it('kills PTY job trapping SIGHUP and SIGTERM', function() skip(is_os('win')) - nvim('set_option', 'shell', 'sh') - nvim('set_option', 'shellcmdflag', '-c') + nvim('set_option_value', 'shell', 'sh', {}) + nvim('set_option_value', 'shellcmdflag', '-c', {}) command([[ let g:test_job = jobstart('trap "" HUP TERM && echo 1 && sleep 60', { ]] .. [[ 'pty': 1,]] .. [[ 'on_stdout': {-> execute('let g:test_job_started = 1')}, ]] |