mirror of
https://github.com/neovim/neovim.git
synced 2026-04-20 14:25:32 +00:00
test: Eliminate expect_err
Eliminate `expect_err` in favor of `pcall_err` + `eq` or `matches`.
This commit is contained in:
@@ -3,9 +3,9 @@ local Screen = require('test.functional.ui.screen')
|
||||
local clear = helpers.clear
|
||||
local eq = helpers.eq
|
||||
local eval = helpers.eval
|
||||
local expect_err = helpers.expect_err
|
||||
local meths = helpers.meths
|
||||
local request = helpers.request
|
||||
local pcall_err = helpers.pcall_err
|
||||
|
||||
describe('nvim_ui_attach()', function()
|
||||
before_each(function()
|
||||
@@ -18,20 +18,20 @@ describe('nvim_ui_attach()', function()
|
||||
eq(999, eval('&columns'))
|
||||
end)
|
||||
it('invalid option returns error', function()
|
||||
expect_err('No such UI option: foo',
|
||||
meths.ui_attach, 80, 24, { foo={'foo'} })
|
||||
eq('No such UI option: foo',
|
||||
pcall_err(meths.ui_attach, 80, 24, { foo={'foo'} }))
|
||||
end)
|
||||
it('validates channel arg', function()
|
||||
expect_err('UI not attached to channel: 1',
|
||||
request, 'nvim_ui_try_resize', 40, 10)
|
||||
expect_err('UI not attached to channel: 1',
|
||||
request, 'nvim_ui_set_option', 'rgb', true)
|
||||
expect_err('UI not attached to channel: 1',
|
||||
request, 'nvim_ui_detach')
|
||||
eq('UI not attached to channel: 1',
|
||||
pcall_err(request, 'nvim_ui_try_resize', 40, 10))
|
||||
eq('UI not attached to channel: 1',
|
||||
pcall_err(request, 'nvim_ui_set_option', 'rgb', true))
|
||||
eq('UI not attached to channel: 1',
|
||||
pcall_err(request, 'nvim_ui_detach'))
|
||||
|
||||
local screen = Screen.new()
|
||||
screen:attach({rgb=false})
|
||||
expect_err('UI already attached to channel: 1',
|
||||
request, 'nvim_ui_attach', 40, 10, { rgb=false })
|
||||
eq('UI already attached to channel: 1',
|
||||
pcall_err(request, 'nvim_ui_attach', 40, 10, { rgb=false }))
|
||||
end)
|
||||
end)
|
||||
|
||||
Reference in New Issue
Block a user