diff options
Diffstat (limited to 'test/functional/ui/title_spec.lua')
| -rw-r--r-- | test/functional/ui/title_spec.lua | 57 |
1 files changed, 37 insertions, 20 deletions
diff --git a/test/functional/ui/title_spec.lua b/test/functional/ui/title_spec.lua index 66c0ff5c9c..8060d3a460 100644 --- a/test/functional/ui/title_spec.lua +++ b/test/functional/ui/title_spec.lua @@ -2,12 +2,12 @@ local helpers = require('test.functional.helpers')(after_each) local Screen = require('test.functional.ui.screen') local clear = helpers.clear local command = helpers.command -local curwin = helpers.curwin +local curwin = helpers.api.nvim_get_current_win local eq = helpers.eq local exec_lua = helpers.exec_lua local feed = helpers.feed -local funcs = helpers.funcs -local meths = helpers.meths +local fn = helpers.fn +local api = helpers.api local is_os = helpers.is_os describe('title', function() @@ -43,13 +43,13 @@ describe('title', function() local buf2 before_each(function() - command('edit '..file1) - buf2 = funcs.bufadd(file2) + command('edit ' .. file1) + buf2 = fn.bufadd(file2) command('set title') end) it('calling setbufvar() to set an option in a hidden buffer from i_CTRL-R', function() - command([[inoremap <F2> <C-R>=setbufvar(]]..buf2..[[, '&autoindent', 1) ?? ''<CR>]]) + command([[inoremap <F2> <C-R>=setbufvar(]] .. buf2 .. [[, '&autoindent', 1) ?? ''<CR>]]) feed('i<F2><Esc>') command('redraw!') screen:expect(function() @@ -58,7 +58,7 @@ describe('title', function() end) it('an RPC call to nvim_set_option_value in a hidden buffer', function() - meths.set_option_value('autoindent', true, { buf = buf2 }) + api.nvim_set_option_value('autoindent', true, { buf = buf2 }) command('redraw!') screen:expect(function() eq(expected, screen.title) @@ -66,11 +66,14 @@ describe('title', function() end) it('a Lua callback calling nvim_set_option_value in a hidden buffer', function() - exec_lua(string.format([[ + exec_lua(string.format( + [[ vim.schedule(function() vim.api.nvim_set_option_value('autoindent', true, { buf = %d }) end) - ]], buf2)) + ]], + buf2 + )) command('redraw!') screen:expect(function() eq(expected, screen.title) @@ -78,11 +81,14 @@ describe('title', function() end) it('a Lua callback calling nvim_buf_call in a hidden buffer', function() - exec_lua(string.format([[ + exec_lua(string.format( + [[ vim.schedule(function() vim.api.nvim_buf_call(%d, function() end) end) - ]], buf2)) + ]], + buf2 + )) command('redraw!') screen:expect(function() eq(expected, screen.title) @@ -90,9 +96,9 @@ describe('title', function() end) it('setting the buffer of another window using RPC', function() - local oldwin = curwin().id + local oldwin = curwin() command('split') - meths.win_set_buf(oldwin, buf2) + api.nvim_win_set_buf(oldwin, buf2) command('redraw!') screen:expect(function() eq(expected, screen.title) @@ -100,13 +106,17 @@ describe('title', function() end) it('setting the buffer of another window using Lua callback', function() - local oldwin = curwin().id + local oldwin = curwin() command('split') - exec_lua(string.format([[ + exec_lua(string.format( + [[ vim.schedule(function() vim.api.nvim_win_set_buf(%d, %d) end) - ]], oldwin, buf2)) + ]], + oldwin, + buf2 + )) command('redraw!') screen:expect(function() eq(expected, screen.title) @@ -114,8 +124,12 @@ describe('title', function() end) it('creating a floating window using RPC', function() - meths.open_win(buf2, false, { - relative = 'editor', width = 5, height = 5, row = 0, col = 0, + api.nvim_open_win(buf2, false, { + relative = 'editor', + width = 5, + height = 5, + row = 0, + col = 0, }) command('redraw!') screen:expect(function() @@ -124,11 +138,14 @@ describe('title', function() end) it('creating a floating window using Lua callback', function() - exec_lua(string.format([[ + exec_lua(string.format( + [[ vim.api.nvim_open_win(%d, false, { relative = 'editor', width = 5, height = 5, row = 0, col = 0, }) - ]], buf2)) + ]], + buf2 + )) command('redraw!') screen:expect(function() eq(expected, screen.title) |