From 7035125b2b26aa68fcfb7cda39377ac79926a0f9 Mon Sep 17 00:00:00 2001 From: dundargoc Date: Mon, 8 Apr 2024 11:03:20 +0200 Subject: test: improve test conventions Work on https://github.com/neovim/neovim/issues/27004. --- test/functional/legacy/autochdir_spec.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'test/functional/legacy/autochdir_spec.lua') diff --git a/test/functional/legacy/autochdir_spec.lua b/test/functional/legacy/autochdir_spec.lua index e5980f5942..84fb897d5b 100644 --- a/test/functional/legacy/autochdir_spec.lua +++ b/test/functional/legacy/autochdir_spec.lua @@ -1,8 +1,8 @@ -local helpers = require('test.functional.helpers')(after_each) -local clear, eq, matches = helpers.clear, helpers.eq, helpers.matches -local eval, command, call, api = helpers.eval, helpers.command, helpers.call, helpers.api -local source, exec_capture = helpers.source, helpers.exec_capture -local mkdir = helpers.mkdir +local t = require('test.functional.testutil')(after_each) +local clear, eq, matches = t.clear, t.eq, t.matches +local eval, command, call, api = t.eval, t.command, t.call, t.api +local source, exec_capture = t.source, t.exec_capture +local mkdir = t.mkdir local function expected_empty() eq({}, api.nvim_get_vvar('errors')) @@ -18,7 +18,7 @@ describe('autochdir behavior', function() end) after_each(function() - helpers.rmdir(dir) + t.rmdir(dir) end) -- Tests vim/vim#777 without test_autochdir(). -- cgit From 81fc27124b9e1b375e0ce9605ae69c3c2a2d9222 Mon Sep 17 00:00:00 2001 From: Lewis Russell Date: Tue, 9 Apr 2024 12:26:16 +0100 Subject: refactor(test): inject after_each differently --- test/functional/legacy/autochdir_spec.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/functional/legacy/autochdir_spec.lua') diff --git a/test/functional/legacy/autochdir_spec.lua b/test/functional/legacy/autochdir_spec.lua index 84fb897d5b..5ab502eebd 100644 --- a/test/functional/legacy/autochdir_spec.lua +++ b/test/functional/legacy/autochdir_spec.lua @@ -1,4 +1,4 @@ -local t = require('test.functional.testutil')(after_each) +local t = require('test.functional.testutil')() local clear, eq, matches = t.clear, t.eq, t.matches local eval, command, call, api = t.eval, t.command, t.call, t.api local source, exec_capture = t.source, t.exec_capture -- cgit 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/legacy/autochdir_spec.lua | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'test/functional/legacy/autochdir_spec.lua') diff --git a/test/functional/legacy/autochdir_spec.lua b/test/functional/legacy/autochdir_spec.lua index 5ab502eebd..3bfa8bcd1e 100644 --- a/test/functional/legacy/autochdir_spec.lua +++ b/test/functional/legacy/autochdir_spec.lua @@ -1,7 +1,9 @@ -local t = require('test.functional.testutil')() -local clear, eq, matches = t.clear, t.eq, t.matches -local eval, command, call, api = t.eval, t.command, t.call, t.api -local source, exec_capture = t.source, t.exec_capture +local t = require('test.testutil') +local n = require('test.functional.testnvim')() + +local clear, eq, matches = n.clear, t.eq, t.matches +local eval, command, call, api = n.eval, n.command, n.call, n.api +local source, exec_capture = n.source, n.exec_capture local mkdir = t.mkdir local function expected_empty() @@ -18,7 +20,7 @@ describe('autochdir behavior', function() end) after_each(function() - t.rmdir(dir) + n.rmdir(dir) end) -- Tests vim/vim#777 without test_autochdir(). -- cgit