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/034_user_function_spec.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/functional/legacy/034_user_function_spec.lua') diff --git a/test/functional/legacy/034_user_function_spec.lua b/test/functional/legacy/034_user_function_spec.lua index c30c7275f2..b93bd45068 100644 --- a/test/functional/legacy/034_user_function_spec.lua +++ b/test/functional/legacy/034_user_function_spec.lua @@ -3,9 +3,9 @@ -- Also test that a builtin function cannot be replaced. -- Also test for regression when calling arbitrary expression. -local helpers = require('test.functional.helpers')(after_each) -local feed, insert, source = helpers.feed, helpers.insert, helpers.source -local clear, feed_command, expect = helpers.clear, helpers.feed_command, helpers.expect +local t = require('test.functional.testutil')(after_each) +local feed, insert, source = t.feed, t.insert, t.source +local clear, feed_command, expect = t.clear, t.feed_command, t.expect describe( 'user functions, expr-mappings, overwrite protected builtin functions and regression on calling expressions', -- 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/034_user_function_spec.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/functional/legacy/034_user_function_spec.lua') diff --git a/test/functional/legacy/034_user_function_spec.lua b/test/functional/legacy/034_user_function_spec.lua index b93bd45068..d592bd8b8a 100644 --- a/test/functional/legacy/034_user_function_spec.lua +++ b/test/functional/legacy/034_user_function_spec.lua @@ -3,7 +3,7 @@ -- Also test that a builtin function cannot be replaced. -- Also test for regression when calling arbitrary expression. -local t = require('test.functional.testutil')(after_each) +local t = require('test.functional.testutil')() local feed, insert, source = t.feed, t.insert, t.source local clear, feed_command, expect = t.clear, t.feed_command, t.expect -- 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/034_user_function_spec.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'test/functional/legacy/034_user_function_spec.lua') diff --git a/test/functional/legacy/034_user_function_spec.lua b/test/functional/legacy/034_user_function_spec.lua index d592bd8b8a..89bf3b8920 100644 --- a/test/functional/legacy/034_user_function_spec.lua +++ b/test/functional/legacy/034_user_function_spec.lua @@ -3,9 +3,10 @@ -- Also test that a builtin function cannot be replaced. -- Also test for regression when calling arbitrary expression. -local t = require('test.functional.testutil')() -local feed, insert, source = t.feed, t.insert, t.source -local clear, feed_command, expect = t.clear, t.feed_command, t.expect +local n = require('test.functional.testnvim')() + +local feed, insert, source = n.feed, n.insert, n.source +local clear, feed_command, expect = n.clear, n.feed_command, n.expect describe( 'user functions, expr-mappings, overwrite protected builtin functions and regression on calling expressions', -- cgit