From 052498ed42780a76daea589d063cd8947a894673 Mon Sep 17 00:00:00 2001
From: dundargoc <gocdundar@gmail.com>
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/script/luacats_grammar_spec.lua | 3 ++-
 test/functional/script/luacats_parser_spec.lua  | 3 ++-
 test/functional/script/text_utils_spec.lua      | 8 +++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'test/functional/script')

diff --git a/test/functional/script/luacats_grammar_spec.lua b/test/functional/script/luacats_grammar_spec.lua
index c6f0f868f0..2dd3ad8a78 100644
--- a/test/functional/script/luacats_grammar_spec.lua
+++ b/test/functional/script/luacats_grammar_spec.lua
@@ -1,4 +1,5 @@
-local t = require('test.functional.testutil')()
+local t = require('test.testutil')
+
 local eq = t.eq
 
 local grammar = require('scripts/luacats_grammar')
diff --git a/test/functional/script/luacats_parser_spec.lua b/test/functional/script/luacats_parser_spec.lua
index e797a913ba..bc87b38eca 100644
--- a/test/functional/script/luacats_parser_spec.lua
+++ b/test/functional/script/luacats_parser_spec.lua
@@ -1,4 +1,5 @@
-local t = require('test.functional.testutil')()
+local t = require('test.testutil')
+
 local eq = t.eq
 
 local parser = require('scripts/luacats_parser')
diff --git a/test/functional/script/text_utils_spec.lua b/test/functional/script/text_utils_spec.lua
index 7c608c157c..176c2ef816 100644
--- a/test/functional/script/text_utils_spec.lua
+++ b/test/functional/script/text_utils_spec.lua
@@ -1,5 +1,7 @@
-local t = require('test.functional.testutil')()
-local exec_lua = t.exec_lua
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
+
+local exec_lua = n.exec_lua
 local eq = t.eq
 
 local function md_to_vimdoc(text, start_indent, indent, text_width)
@@ -28,7 +30,7 @@ end
 
 describe('md_to_vimdoc', function()
   before_each(function()
-    t.clear()
+    n.clear()
   end)
 
   test('can render para after fenced code', {
-- 
cgit