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/provider/python3_spec.lua | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'test/functional/provider/python3_spec.lua') diff --git a/test/functional/provider/python3_spec.lua b/test/functional/provider/python3_spec.lua index 80b3552e82..5274054e7e 100644 --- a/test/functional/provider/python3_spec.lua +++ b/test/functional/provider/python3_spec.lua @@ -1,15 +1,15 @@ -local helpers = require('test.functional.helpers')(after_each) -local assert_alive = helpers.assert_alive -local eval, command, feed = helpers.eval, helpers.command, helpers.feed -local eq, clear, insert = helpers.eq, helpers.clear, helpers.insert -local expect, write_file = helpers.expect, helpers.write_file -local feed_command = helpers.feed_command -local source = helpers.source -local missing_provider = helpers.missing_provider -local matches = helpers.matches -local pcall_err = helpers.pcall_err -local fn = helpers.fn -local dedent = helpers.dedent +local t = require('test.functional.testutil')(after_each) +local assert_alive = t.assert_alive +local eval, command, feed = t.eval, t.command, t.feed +local eq, clear, insert = t.eq, t.clear, t.insert +local expect, write_file = t.expect, t.write_file +local feed_command = t.feed_command +local source = t.source +local missing_provider = t.missing_provider +local matches = t.matches +local pcall_err = t.pcall_err +local fn = t.fn +local dedent = t.dedent do clear() @@ -153,7 +153,7 @@ describe('python3 provider', function() end) it('RPC call to expand("") during BufDelete #5245 #5617', function() - helpers.add_builddir_to_rtp() + t.add_builddir_to_rtp() source([=[ python3 << EOF import vim -- 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/provider/python3_spec.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/functional/provider/python3_spec.lua') diff --git a/test/functional/provider/python3_spec.lua b/test/functional/provider/python3_spec.lua index 5274054e7e..0b1440f43f 100644 --- a/test/functional/provider/python3_spec.lua +++ b/test/functional/provider/python3_spec.lua @@ -1,4 +1,4 @@ -local t = require('test.functional.testutil')(after_each) +local t = require('test.functional.testutil')() local assert_alive = t.assert_alive local eval, command, feed = t.eval, t.command, t.feed local eq, clear, insert = t.eq, t.clear, t.insert -- 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/provider/python3_spec.lua | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'test/functional/provider/python3_spec.lua') diff --git a/test/functional/provider/python3_spec.lua b/test/functional/provider/python3_spec.lua index 0b1440f43f..71a067d3d2 100644 --- a/test/functional/provider/python3_spec.lua +++ b/test/functional/provider/python3_spec.lua @@ -1,14 +1,16 @@ -local t = require('test.functional.testutil')() -local assert_alive = t.assert_alive -local eval, command, feed = t.eval, t.command, t.feed -local eq, clear, insert = t.eq, t.clear, t.insert -local expect, write_file = t.expect, t.write_file -local feed_command = t.feed_command -local source = t.source -local missing_provider = t.missing_provider +local t = require('test.testutil') +local n = require('test.functional.testnvim')() + +local assert_alive = n.assert_alive +local eval, command, feed = n.eval, n.command, n.feed +local eq, clear, insert = t.eq, n.clear, n.insert +local expect, write_file = n.expect, t.write_file +local feed_command = n.feed_command +local source = n.source +local missing_provider = n.missing_provider local matches = t.matches local pcall_err = t.pcall_err -local fn = t.fn +local fn = n.fn local dedent = t.dedent do @@ -153,7 +155,7 @@ describe('python3 provider', function() end) it('RPC call to expand("") during BufDelete #5245 #5617', function() - t.add_builddir_to_rtp() + n.add_builddir_to_rtp() source([=[ python3 << EOF import vim -- cgit