From 7e1c9598617a140e40a0a22676c0631294617246 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Fri, 6 Sep 2019 17:17:37 -0700 Subject: test: Eliminate expect_err Eliminate `expect_err` in favor of `pcall_err` + `eq` or `matches`. --- test/functional/terminal/scrollback_spec.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'test/functional/terminal') diff --git a/test/functional/terminal/scrollback_spec.lua b/test/functional/terminal/scrollback_spec.lua index f4441a5396..7413081510 100644 --- a/test/functional/terminal/scrollback_spec.lua +++ b/test/functional/terminal/scrollback_spec.lua @@ -10,8 +10,8 @@ local wait = helpers.wait local retry = helpers.retry local curbufmeths = helpers.curbufmeths local nvim = helpers.nvim -local expect_err = helpers.expect_err local feed_data = thelpers.feed_data +local pcall_err = helpers.pcall_err describe(':terminal scrollback', function() local screen @@ -455,8 +455,10 @@ describe("'scrollback' option", function() end) it('error if set to invalid value', function() - expect_err('E474:', command, 'set scrollback=-2') - expect_err('E474:', command, 'set scrollback=100001') + eq('Vim(set):E474: Invalid argument: scrollback=-2', + pcall_err(command, 'set scrollback=-2')) + eq('Vim(set):E474: Invalid argument: scrollback=100001', + pcall_err(command, 'set scrollback=100001')) end) it('defaults to -1 on normal buffers', function() -- cgit