From 052498ed42780a76daea589d063cd8947a894673 Mon Sep 17 00:00:00 2001 From: dundargoc Date: Sat, 20 Apr 2024 17:44:13 +0200 Subject: test: improve test conventions Specifically, functions that are run in the context of the test runner are put in module `test/testutil.lua` while the functions that are run in the context of the test session are put in `test/functional/testnvim.lua`. Closes https://github.com/neovim/neovim/issues/27004. --- test/functional/api/buffer_spec.lua | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'test/functional/api/buffer_spec.lua') diff --git a/test/functional/api/buffer_spec.lua b/test/functional/api/buffer_spec.lua index 12b2c43158..cf69958fd8 100644 --- a/test/functional/api/buffer_spec.lua +++ b/test/functional/api/buffer_spec.lua @@ -1,21 +1,23 @@ -local t = require('test.functional.testutil')() +local t = require('test.testutil') +local n = require('test.functional.testnvim')() local Screen = require('test.functional.ui.screen') -local clear = t.clear + +local clear = n.clear local eq = t.eq local ok = t.ok -local describe_lua_and_rpc = t.describe_lua_and_rpc(describe) -local api = t.api -local fn = t.fn -local request = t.request -local exc_exec = t.exc_exec -local exec_lua = t.exec_lua -local feed_command = t.feed_command -local insert = t.insert +local describe_lua_and_rpc = n.describe_lua_and_rpc(describe) +local api = n.api +local fn = n.fn +local request = n.request +local exc_exec = n.exc_exec +local exec_lua = n.exec_lua +local feed_command = n.feed_command +local insert = n.insert local NIL = vim.NIL -local command = t.command -local feed = t.feed +local command = n.command +local feed = n.feed local pcall_err = t.pcall_err -local assert_alive = t.assert_alive +local assert_alive = n.assert_alive describe('api/buf', function() before_each(clear) @@ -2066,7 +2068,7 @@ describe('api/buf', function() end) after_each(function() - t.rmdir(topdir .. '/Xacd') + n.rmdir(topdir .. '/Xacd') end) it('does not change cwd with non-current buffer', function() -- cgit