aboutsummaryrefslogtreecommitdiff
path: root/test/functional/legacy
diff options
context:
space:
mode:
authorbfredl <bjorn.linse@gmail.com>2022-06-08 23:22:50 +0200
committerbfredl <bjorn.linse@gmail.com>2022-06-13 10:15:44 +0200
commite3281d992e1b9366d67a4b4399e3b5e11bb6c1cc (patch)
treefe0a8377115e946faf1c0328285331b4fd6c8a4c /test/functional/legacy
parentdd8b6094c03362cc60d627ce709a4a0f9825b86a (diff)
downloadrneovim-e3281d992e1b9366d67a4b4399e3b5e11bb6c1cc.tar.gz
rneovim-e3281d992e1b9366d67a4b4399e3b5e11bb6c1cc.tar.bz2
rneovim-e3281d992e1b9366d67a4b4399e3b5e11bb6c1cc.zip
fix(tests): check for EOF on exit of nvim properly
Diffstat (limited to 'test/functional/legacy')
-rw-r--r--test/functional/legacy/008_autocommands_spec.lua3
-rw-r--r--test/functional/legacy/012_directory_spec.lua3
-rw-r--r--test/functional/legacy/031_close_commands_spec.lua3
3 files changed, 6 insertions, 3 deletions
diff --git a/test/functional/legacy/008_autocommands_spec.lua b/test/functional/legacy/008_autocommands_spec.lua
index 002f037d09..4088cd1644 100644
--- a/test/functional/legacy/008_autocommands_spec.lua
+++ b/test/functional/legacy/008_autocommands_spec.lua
@@ -6,6 +6,7 @@ local source = helpers.source
local clear, command, expect, eq, eval = helpers.clear, helpers.command, helpers.expect, helpers.eq, helpers.eval
local write_file, dedent = helpers.write_file, helpers.dedent
local read_file = helpers.read_file
+local expect_exit = helpers.expect_exit
describe('autocommands that delete and unload buffers:', function()
local test_file = 'Xtest-008_autocommands.out'
@@ -78,7 +79,7 @@ describe('autocommands that delete and unload buffers:', function()
command('silent! edit Xxx1')
command('silent! edit Makefile') -- an existing file
command('silent! split new2')
- command('silent! quit')
+ expect_exit(command, 'silent! quit')
eq('VimLeave done',
string.match(read_file(test_file), "^%s*(.-)%s*$"))
end)
diff --git a/test/functional/legacy/012_directory_spec.lua b/test/functional/legacy/012_directory_spec.lua
index f666e51469..dd207ca0b4 100644
--- a/test/functional/legacy/012_directory_spec.lua
+++ b/test/functional/legacy/012_directory_spec.lua
@@ -16,6 +16,7 @@ local insert = helpers.insert
local command = helpers.command
local write_file = helpers.write_file
local curbufmeths = helpers.curbufmeths
+local expect_exit = helpers.expect_exit
local function ls_dir_sorted(dirname)
local files = {}
@@ -43,7 +44,7 @@ describe("'directory' option", function()
clear()
end)
teardown(function()
- command('qall!')
+ expect_exit(command, 'qall!')
helpers.rmdir('Xtest.je')
helpers.rmdir('Xtest2')
os.remove('Xtest1')
diff --git a/test/functional/legacy/031_close_commands_spec.lua b/test/functional/legacy/031_close_commands_spec.lua
index 64c67c9882..d02b1a2049 100644
--- a/test/functional/legacy/031_close_commands_spec.lua
+++ b/test/functional/legacy/031_close_commands_spec.lua
@@ -17,6 +17,7 @@ local source = helpers.source
local insert = helpers.insert
local expect = helpers.expect
local feed_command = helpers.feed_command
+local expect_exit = helpers.expect_exit
describe('Commands that close windows and/or buffers', function()
local function cleanup()
@@ -118,7 +119,7 @@ describe('Commands that close windows and/or buffers', function()
feed_command('q!')
feed('<CR>')
expect('testtext 1')
- source([[
+ expect_exit(source, [[
q!
" Now nvim should have exited
throw "Oh, Not finished yet."]])