refactor(test): inject after_each differently

40 files changed, 40 insertions, 42 deletions

diff --git a/test/unit/api/private_helpers_spec.lua b/test/unit/api/private_helpers_spec.lua
index 282a2e7f8e..a31374bd70 100644
--- a/test/unit/api/private_helpers_spec.lua
+++ b/test/unit/api/private_helpers_spec.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local itp = t.gen_itp(it)
 local t_eval = require('test.unit.eval.testutil')
 local api_t = require('test.unit.api.testutil')
diff --git a/test/unit/api/testutil.lua b/test/unit/api/testutil.lua
index 2790bca085..0946ef194c 100644
--- a/test/unit/api/testutil.lua
+++ b/test/unit/api/testutil.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(nil)
+local t = require('test.unit.testutil')
 local t_eval = require('test.unit.eval.testutil')
 
 local cimport = t.cimport
diff --git a/test/unit/buffer_spec.lua b/test/unit/buffer_spec.lua
index beedc6b5f1..a7c672322b 100644
--- a/test/unit/buffer_spec.lua
+++ b/test/unit/buffer_spec.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local itp = t.gen_itp(it)
 
 local to_cstr = t.to_cstr
diff --git a/test/unit/charset/vim_str2nr_spec.lua b/test/unit/charset/vim_str2nr_spec.lua
index f83fc3b96b..a70ee77716 100644
--- a/test/unit/charset/vim_str2nr_spec.lua
+++ b/test/unit/charset/vim_str2nr_spec.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local bit = require('bit')
 
 local itp = t.gen_itp(it)
diff --git a/test/unit/eval/decode_spec.lua b/test/unit/eval/decode_spec.lua
index 1f36d95473..7e037500b9 100644
--- a/test/unit/eval/decode_spec.lua
+++ b/test/unit/eval/decode_spec.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local itp = t.gen_itp(it)
 
 local cimport = t.cimport
diff --git a/test/unit/eval/encode_spec.lua b/test/unit/eval/encode_spec.lua
index d0eeedf4b0..5b9188163e 100644
--- a/test/unit/eval/encode_spec.lua
+++ b/test/unit/eval/encode_spec.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local itp = t.gen_itp(it)
 local t_eval = require('test.unit.eval.testutil')
 
diff --git a/test/unit/eval/testutil.lua b/test/unit/eval/testutil.lua
index 5809877341..78788e5837 100644
--- a/test/unit/eval/testutil.lua
+++ b/test/unit/eval/testutil.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(nil)
+local t = require('test.unit.testutil')
 
 local ptr2key = t.ptr2key
 local cimport = t.cimport
diff --git a/test/unit/eval/tricks_spec.lua b/test/unit/eval/tricks_spec.lua
index c67bfa4fac..20ecf0d920 100644
--- a/test/unit/eval/tricks_spec.lua
+++ b/test/unit/eval/tricks_spec.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local t_eval = require('test.unit.eval.testutil')
 
 local itp = t.gen_itp(it)
diff --git a/test/unit/eval/tv_clear_spec.lua b/test/unit/eval/tv_clear_spec.lua
index 86ddde9d7d..1ad537d8bf 100644
--- a/test/unit/eval/tv_clear_spec.lua
+++ b/test/unit/eval/tv_clear_spec.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local itp = t.gen_itp(it)
 local t_eval = require('test.unit.eval.testutil')
 
diff --git a/test/unit/eval/typval_spec.lua b/test/unit/eval/typval_spec.lua
index 029a6d53a4..c69c9b0fae 100644
--- a/test/unit/eval/typval_spec.lua
+++ b/test/unit/eval/typval_spec.lua
@@ -1,5 +1,5 @@
 local bit = require('bit')
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local t_eval = require('test.unit.eval.testutil')
 
 local itp = t.gen_itp(it)
diff --git a/test/unit/fileio_spec.lua b/test/unit/fileio_spec.lua
index 55332cee87..8f915372fe 100644
--- a/test/unit/fileio_spec.lua
+++ b/test/unit/fileio_spec.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local itp = t.gen_itp(it)
 --{:cimport, :internalize, :eq, :neq, :ffi, :lib, :cstr, :to_cstr} = require 'test.unit.testutil'
 
diff --git a/test/unit/garray_spec.lua b/test/unit/garray_spec.lua
index f0b991a051..30d1d3f21e 100644
--- a/test/unit/garray_spec.lua
+++ b/test/unit/garray_spec.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local itp = t.gen_itp(it)
 
 local cimport = t.cimport
diff --git a/test/unit/indent_spec.lua b/test/unit/indent_spec.lua
index 8fa848b086..a1c3dc4a75 100644
--- a/test/unit/indent_spec.lua
+++ b/test/unit/indent_spec.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local itp = t.gen_itp(it)
 
 local to_cstr = t.to_cstr
diff --git a/test/unit/keycodes_spec.lua b/test/unit/keycodes_spec.lua
index 7c8fd47c21..948f0a3ead 100644
--- a/test/unit/keycodes_spec.lua
+++ b/test/unit/keycodes_spec.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local itp = t.gen_itp(it)
 
 local ffi = t.ffi
diff --git a/test/unit/marktree_spec.lua b/test/unit/marktree_spec.lua
index 3e6081a078..cccce5ca8f 100644
--- a/test/unit/marktree_spec.lua
+++ b/test/unit/marktree_spec.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local itp = t.gen_itp(it)
 
 local ffi = t.ffi
diff --git a/test/unit/mbyte_spec.lua b/test/unit/mbyte_spec.lua
index 1a28f9c43d..8fcc67d20b 100644
--- a/test/unit/mbyte_spec.lua
+++ b/test/unit/mbyte_spec.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local itp = t.gen_itp(it)
 
 local ffi = t.ffi
diff --git a/test/unit/memory_spec.lua b/test/unit/memory_spec.lua
index fb49bdf8e5..169d6b9cb0 100644
--- a/test/unit/memory_spec.lua
+++ b/test/unit/memory_spec.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local itp = t.gen_itp(it)
 
 local cimport = t.cimport
diff --git a/test/unit/message_spec.lua b/test/unit/message_spec.lua
index 5653f8ee5b..fee8f5124d 100644
--- a/test/unit/message_spec.lua
+++ b/test/unit/message_spec.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local itp = t.gen_itp(it)
 
 local ffi = t.ffi
diff --git a/test/unit/msgpack_spec.lua b/test/unit/msgpack_spec.lua
index 0bebbef141..730c4f9e36 100644
--- a/test/unit/msgpack_spec.lua
+++ b/test/unit/msgpack_spec.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local cimport = t.cimport
 local itp = t.gen_itp(it)
 local lib = cimport('./src/nvim/msgpack_rpc/unpacker.h', './src/nvim/memory.h')
diff --git a/test/unit/multiqueue_spec.lua b/test/unit/multiqueue_spec.lua
index 0866bc1f0c..931a5efa94 100644
--- a/test/unit/multiqueue_spec.lua
+++ b/test/unit/multiqueue_spec.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local itp = t.gen_itp(it)
 
 local child_call_once = t.child_call_once
diff --git a/test/unit/optionstr_spec.lua b/test/unit/optionstr_spec.lua
index 37fe4a3a3b..b9c9ceaa85 100644
--- a/test/unit/optionstr_spec.lua
+++ b/test/unit/optionstr_spec.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local itp = t.gen_itp(it)
 
 local to_cstr = t.to_cstr
diff --git a/test/unit/os/env_spec.lua b/test/unit/os/env_spec.lua
index d0231b2e2b..d8231545f3 100644
--- a/test/unit/os/env_spec.lua
+++ b/test/unit/os/env_spec.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local itp = t.gen_itp(it)
 
 local cimport = t.cimport
diff --git a/test/unit/os/fileio_spec.lua b/test/unit/os/fileio_spec.lua
index d748a6d306..fd9eb2bafb 100644
--- a/test/unit/os/fileio_spec.lua
+++ b/test/unit/os/fileio_spec.lua
@@ -1,6 +1,6 @@
 local uv = vim.uv
 
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local itp = t.gen_itp(it)
 
 local eq = t.eq
diff --git a/test/unit/os/fs_spec.lua b/test/unit/os/fs_spec.lua
index e866a1b5c3..a829962305 100644
--- a/test/unit/os/fs_spec.lua
+++ b/test/unit/os/fs_spec.lua
@@ -1,7 +1,7 @@
 local uv = vim.uv
 local bit = require('bit')
 
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local itp = t.gen_itp(it)
 
 local cimport = t.cimport
diff --git a/test/unit/os/shell_spec.lua b/test/unit/os/shell_spec.lua
index fd0a6336b0..94ad6f4a10 100644
--- a/test/unit/os/shell_spec.lua
+++ b/test/unit/os/shell_spec.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local itp = t.gen_itp(it)
 local cimported = t.cimport(
   './src/nvim/os/shell.h',
diff --git a/test/unit/os/users_spec.lua b/test/unit/os/users_spec.lua
index cf81b25a44..21d47fdb6e 100644
--- a/test/unit/os/users_spec.lua
+++ b/test/unit/os/users_spec.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local itp = t.gen_itp(it)
 
 local cimport = t.cimport
diff --git a/test/unit/path_spec.lua b/test/unit/path_spec.lua
index 0c94201dfa..8df6a52cd1 100644
--- a/test/unit/path_spec.lua
+++ b/test/unit/path_spec.lua
@@ -1,5 +1,5 @@
 local uv = vim.uv
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local itp = t.gen_itp(it)
 
 local cimport = t.cimport
diff --git a/test/unit/preload.lua b/test/unit/preload.lua
index 896d07b9cd..1865bba719 100644
--- a/test/unit/preload.lua
+++ b/test/unit/preload.lua
@@ -2,5 +2,5 @@
 -- Busted started doing this to help provide more isolation.  See issue #62
 -- for more information about this.
 local ffi = require('ffi')
-local t = require('test.unit.testutil')(nil)
+local t = require('test.unit.testutil')
 local preprocess = require('test.unit.preprocess')
diff --git a/test/unit/profile_spec.lua b/test/unit/profile_spec.lua
index 79d32c3a69..27b817cf42 100644
--- a/test/unit/profile_spec.lua
+++ b/test/unit/profile_spec.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local itp = t.gen_itp(it)
 
 local cimport = t.cimport
diff --git a/test/unit/rbuffer_spec.lua b/test/unit/rbuffer_spec.lua
index 4b2d64cd48..ad18ea2ddc 100644
--- a/test/unit/rbuffer_spec.lua
+++ b/test/unit/rbuffer_spec.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local itp = t.gen_itp(it)
 
 local eq = t.eq
diff --git a/test/unit/search_spec.lua b/test/unit/search_spec.lua
index 4572beaae0..f68cd88c12 100644
--- a/test/unit/search_spec.lua
+++ b/test/unit/search_spec.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local itp = t.gen_itp(it)
 
 local to_cstr = t.to_cstr
diff --git a/test/unit/statusline_spec.lua b/test/unit/statusline_spec.lua
index 41afa3c897..973d9ec992 100644
--- a/test/unit/statusline_spec.lua
+++ b/test/unit/statusline_spec.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local itp = t.gen_itp(it)
 
 local to_cstr = t.to_cstr
diff --git a/test/unit/strings_spec.lua b/test/unit/strings_spec.lua
index e686998e84..6e88f5141d 100644
--- a/test/unit/strings_spec.lua
+++ b/test/unit/strings_spec.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local itp = t.gen_itp(it)
 
 local cimport = t.cimport
diff --git a/test/unit/tempfile_spec.lua b/test/unit/tempfile_spec.lua
index 3308eaebb2..1a42eed17e 100644
--- a/test/unit/tempfile_spec.lua
+++ b/test/unit/tempfile_spec.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local itp = t.gen_itp(it)
 
 local eq = t.eq
diff --git a/test/unit/testtest_spec.lua b/test/unit/testtest_spec.lua
index 79f29f4e54..0750cac5cc 100644
--- a/test/unit/testtest_spec.lua
+++ b/test/unit/testtest_spec.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local assert = require('luassert')
 
 local itp = t.gen_itp(it)
diff --git a/test/unit/testutil.lua b/test/unit/testutil.lua
index c1ba1f6e97..c90859581d 100644
--- a/test/unit/testutil.lua
+++ b/test/unit/testutil.lua
@@ -906,6 +906,4 @@ local module = {
 --- @class test.unit.testutil: test.unit.testutil.module, test.testutil
 module = vim.tbl_extend('error', module, t_global)
 
-return function()
-  return module
-end
+return module
diff --git a/test/unit/undo_spec.lua b/test/unit/undo_spec.lua
index 847ac7789a..5a96280caf 100644
--- a/test/unit/undo_spec.lua
+++ b/test/unit/undo_spec.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local itp = t.gen_itp(it)
 local uv = vim.uv
 local child_call_once = t.child_call_once
diff --git a/test/unit/viml/expressions/lexer_spec.lua b/test/unit/viml/expressions/lexer_spec.lua
index 9b2ad0a84b..30483f4c1d 100644
--- a/test/unit/viml/expressions/lexer_spec.lua
+++ b/test/unit/viml/expressions/lexer_spec.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local itp = t.gen_itp(it)
 local t_viml = require('test.unit.viml.testutil')
 
diff --git a/test/unit/viml/expressions/parser_spec.lua b/test/unit/viml/expressions/parser_spec.lua
index 74f2a120bf..6f18448bd2 100644
--- a/test/unit/viml/expressions/parser_spec.lua
+++ b/test/unit/viml/expressions/parser_spec.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(after_each)
+local t = require('test.unit.testutil')
 local itp = t.gen_itp(it)
 local t_viml = require('test.unit.viml.testutil')
 
diff --git a/test/unit/viml/testutil.lua b/test/unit/viml/testutil.lua
index 7046cedb47..376ef538d4 100644
--- a/test/unit/viml/testutil.lua
+++ b/test/unit/viml/testutil.lua
@@ -1,4 +1,4 @@
-local t = require('test.unit.testutil')(nil)
+local t = require('test.unit.testutil')
 
 local ffi = t.ffi
 local cimport = t.cimport