Merge #40865 from justinmk/fixci

.luacheckrc

@@ -43,7 +43,6 @@ globals = {
 }
 
 exclude_files = {
-  'test/_meta.lua',
   'test/functional/fixtures/lua/syntax_error.lua',
   'runtime/lua/vim/treesitter/_meta.lua',
   'runtime/lua/vim/_meta/vimfn.gen.lua',

test/_meta.lua

@@ -1,28 +0,0 @@
---- @meta
-
---- @param name string
---- @param fn? fun()
-function it(name, fn) end
-
---- @param name string
---- @param fn fun()
-function describe(name, fn) end
-
---- @param name? string
---- @param block? fun()|string
-function pending(name, block) end
-
---- @param fn fun()
-function setup(fn) end
-
---- @param fn fun()
-function before_each(fn) end
-
---- @param fn fun()
-function after_each(fn) end
-
---- @param fn fun()
-function teardown(fn) end
-
---- @param fn fun()
-function finally(fn) end

test/assert.lua

@@ -5,7 +5,7 @@ local FORMAT_DEPTH = 100
 
 --- @param value any
 --- @return string
-local function format_value(value)
+local function fmt(value)
   if type(value) == 'string' then
     return string.format('%q', value)
   end
@@ -36,8 +36,8 @@ end
 local function comparison_message(expected, actual, comparator)
   return ('Expected values to be %s.\nExpected:\n%s\nActual:\n%s'):format(
     comparator,
-    format_value(expected),
-    format_value(actual)
+    fmt(expected),
+    fmt(actual)
   )
 end
 
@@ -63,30 +63,10 @@ function M.neq(expected, actual, context)
     not vim.deep_equal(expected, actual),
     actual,
     context,
-    ('Expected values to differ.\nValue:\n%s'):format(format_value(actual))
+    ('Expected values to differ.\nValue:\n%s'):format(fmt(actual))
   )
 end
 
---- @param value any
---- @param context? any
---- @return any
-function M.is_true(value, context)
-  return M.eq(true, value, context)
-end
-
---- @param value any
---- @param context? any
---- @return any
-function M.is_false(value, context)
-  return M.eq(false, value, context)
-end
-
--- TODO(lewis6991): remove these aliases
-M.True = M.is_true
-M.False = M.is_false
-M.equals = M.eq
-M.Equal = M.eq
-
 return setmetatable(M, {
   --- @param condition any
   --- @param message? string

test/benchmark/autocmd_spec.lua

@@ -1,5 +1,7 @@
 local n = require('test.functional.testnvim')()
+local t = require('test.testutil')
 
+local describe, it, before_each, after_each = t.describe, t.it, t.before_each, t.after_each
 local clear = n.clear
 local exec_lua = n.exec_lua
 

test/benchmark/bench_regexp_spec.lua

@@ -1,7 +1,9 @@
 -- Test for benchmarking the RE engine.
 
 local n = require('test.functional.testnvim')()
+local t = require('test.testutil')
 
+local describe, it, setup, teardown = t.describe, t.it, t.setup, t.teardown
 local insert, source = n.insert, n.source
 local clear, command = n.clear, n.command
 

test/benchmark/decor_spec.lua

@@ -1,5 +1,7 @@
 local n = require('test.functional.testnvim')()
+local t = require('test.testutil')
 local Screen = require('test.functional.ui.screen')
+local describe, it, before_each = t.describe, t.it, t.before_each
 local exec_lua = n.exec_lua
 
 describe('decor perf', function()

test/benchmark/deepcopy_spec.lua

@@ -1,3 +1,5 @@
+local t = require('test.testutil')
+local describe, it = t.describe, t.it
 local N = 20
 
 local function tcall(f, ...)

test/benchmark/extmark_spec.lua

@@ -1,6 +1,8 @@
 local n = require('test.functional.testnvim')()
+local t = require('test.testutil')
 local Screen = require('test.functional.ui.screen')
 
+local describe, it, before_each, after_each = t.describe, t.it, t.before_each, t.after_each
 local clear = n.clear
 local exec_lua = n.exec_lua
 

test/benchmark/iter_spec.lua

@@ -1,3 +1,5 @@
+local t = require('test.testutil')
+local describe, it = t.describe, t.it
 local N = 500
 local test_table_size = 100000
 

test/benchmark/keycodes_spec.lua

@@ -1,5 +1,6 @@
 local n = require('test.functional.testnvim')()
 local t = require('test.testutil')
+local describe, it = t.describe, t.it
 local clear = n.clear
 local api = n.api
 local fn = n.fn

test/benchmark/option_spec.lua

@@ -1,5 +1,7 @@
 local n = require('test.functional.testnvim')()
+local t = require('test.testutil')
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear = n.clear
 local bench = n.bench
 

test/benchmark/screenpos_spec.lua

@@ -2,6 +2,7 @@ local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local api = n.api
 
 local function rand_utf8(count, seed)

test/benchmark/text_spec.lua

@@ -1,5 +1,6 @@
 local t = require('test.testutil')
 
+local describe, it = t.describe, t.it
 describe('vim.text', function()
   local input, output = string.rep('😂', 2 ^ 16), string.rep('F09F9882', 2 ^ 16)
 

test/benchmark/treesitter_spec.lua

@@ -1,6 +1,8 @@
 local n = require('test.functional.testnvim')()
+local t = require('test.testutil')
 local Screen = require('test.functional.ui.screen')
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear = n.clear
 local exec_lua = n.exec_lua
 

test/benchmark/trim_spec.lua

@@ -1,5 +1,6 @@
 local t = require('test.testutil')
 
+local describe, it = t.describe, t.it
 describe('vim.trim()', function()
   local strings = {
     ['10000 whitespace characters'] = string.rep(' ', 10000),

test/functional/api/autocmd_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each, pending = t.describe, t.it, t.before_each, t.pending
 local clear = n.clear
 local command = n.command
 local eq = t.eq

test/functional/api/buffer_spec.lua

@@ -2,6 +2,8 @@ local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
 
+local describe, it, before_each, after_each, setup, teardown, finally =
+  t.describe, t.it, t.before_each, t.after_each, t.setup, t.teardown, t.finally
 local clear = n.clear
 local eq = t.eq
 local ok = t.ok

test/functional/api/buffer_updates_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear = n.clear
 local eq, ok = t.eq, t.ok
 local fn = n.fn

test/functional/api/command_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local NIL = vim.NIL
 local clear = n.clear
 local command = n.command

test/functional/api/deprecated_spec.lua

@@ -4,6 +4,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear, eval, eq, ok = n.clear, n.eval, t.eq, t.ok
 local api, command, fn = n.api, n.command, n.fn
 local pcall_err, assert_alive = t.pcall_err, n.assert_alive

test/functional/api/extmark_spec.lua

@@ -2,6 +2,7 @@ local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local request = n.request
 local eq = t.eq
 local ok = t.ok

test/functional/api/fast_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear = n.clear
 local eq = t.eq
 local exec_lua = n.exec_lua

test/functional/api/highlight_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear, eq, neq = n.clear, t.eq, t.neq
 local command = n.command
 local exec_capture = n.exec_capture

test/functional/api/keymap_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear = n.clear
 local command = n.command
 local eq, neq = t.eq, t.neq

test/functional/api/menu_spec.lua

@@ -1,6 +1,8 @@
 local n = require('test.functional.testnvim')()
+local t = require('test.testutil')
 local Screen = require('test.functional.ui.screen')
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear = n.clear
 local command = n.command
 local feed = n.feed

test/functional/api/proc_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear = n.clear
 local eq = t.eq
 local fn = n.fn

test/functional/api/server_notifications_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each, after_each = t.describe, t.it, t.before_each, t.after_each
 local eq, clear, eval, command, next_msg = t.eq, n.clear, n.eval, n.command, n.next_msg
 local api = n.api
 local exec_lua = n.exec_lua

test/functional/api/server_requests_spec.lua

@@ -3,6 +3,8 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each, after_each, pending, finally =
+  t.describe, t.it, t.before_each, t.after_each, t.pending, t.finally
 local clear, eval = n.clear, n.eval
 local eq, neq, run, stop = t.eq, t.neq, n.run, n.stop
 local nvim_prog, command, fn = n.nvim_prog, n.command, n.fn

test/functional/api/tabpage_spec.lua

@@ -2,6 +2,7 @@ local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear, eq, ok = n.clear, t.eq, t.ok
 local matches = t.matches
 local exec = n.exec

test/functional/api/ui_spec.lua

@@ -2,6 +2,7 @@ local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
 
+local describe, it, before_each, finally = t.describe, t.it, t.before_each, t.finally
 local clear = n.clear
 local command = n.command
 local eq = t.eq

test/functional/api/version_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each, setup = t.describe, t.it, t.before_each, t.setup
 local clear, fn, eq = n.clear, n.fn, t.eq
 local api = n.api
 local matches = t.matches

test/functional/api/vim_spec.lua

@@ -1,6 +1,8 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
+local describe, it, before_each, after_each, setup, teardown, finally =
+  t.describe, t.it, t.before_each, t.after_each, t.setup, t.teardown, t.finally
 local uv = vim.uv
 
 local dedent = t.dedent

test/functional/api/window_spec.lua

@@ -3,6 +3,8 @@ local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
 local tt = require('test.functional.testterm')
 
+local describe, it, before_each, after_each, finally =
+  t.describe, t.it, t.before_each, t.after_each, t.finally
 local clear, curbuf, curbuf_contents, curwin, eq, neq, matches, ok, feed, insert, eval =
   n.clear,
   n.api.nvim_get_current_buf,

test/functional/autocmd/autocmd_oldtest_spec.lua

@@ -2,6 +2,7 @@ local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear = n.clear
 local eq = t.eq
 local api = n.api

test/functional/autocmd/autocmd_spec.lua

@@ -2,6 +2,7 @@ local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local assert_visible = n.assert_visible
 local assert_alive = n.assert_alive
 local dedent = t.dedent

test/functional/autocmd/bufenter_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear = n.clear
 local command = n.command
 local eq = t.eq

test/functional/autocmd/cmdline_spec.lua

@@ -2,6 +2,7 @@ local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear = n.clear
 local command = n.command
 local eq = t.eq

test/functional/autocmd/completedone_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear = n.clear
 local command = n.command
 local call = n.call

test/functional/autocmd/cursorhold_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear = n.clear
 local eq = t.eq
 local feed = n.feed

test/functional/autocmd/cursormoved_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear = n.clear
 local eq = t.eq
 local eval = n.eval

test/functional/autocmd/dirchanged_spec.lua

@@ -1,6 +1,8 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each, setup, teardown =
+  t.describe, t.it, t.before_each, t.setup, t.teardown
 local clear = n.clear
 local command = n.command
 local eq = t.eq

test/functional/autocmd/filetype_spec.lua

@@ -1,5 +1,7 @@
 local n = require('test.functional.testnvim')()
+local t = require('test.testutil')
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local eval = n.eval
 local clear = n.clear
 local command = n.command
@@ -12,6 +14,6 @@ describe('autocmd FileType', function()
     command('let g:foo = 0')
     command('autocmd FileType help let g:foo = g:foo + 1')
     command('help help')
-    assert.eq(1, eval('g:foo'))
+    t.eq(1, eval('g:foo'))
   end)
 end)

test/functional/autocmd/focus_spec.lua

@@ -2,6 +2,7 @@ local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 local tt = require('test.functional.testterm')
 
+local describe, it, before_each, teardown = t.describe, t.it, t.before_each, t.teardown
 local clear = n.clear
 local feed_data = tt.feed_data
 

test/functional/autocmd/markset_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local api = n.api
 local clear = n.clear
 local command = n.command

test/functional/autocmd/modechanged_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear, eval, eq = n.clear, n.eval, t.eq
 local feed, command = n.feed, n.command
 local exec_lua = n.exec_lua

test/functional/autocmd/optionset_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local eq = t.eq
 local eval = n.eval
 local clear = n.clear

test/functional/autocmd/recording_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear = n.clear
 local eq = t.eq
 local eval = n.eval

test/functional/autocmd/safestate_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear = n.clear
 local eq = t.eq
 local exec = n.exec

test/functional/autocmd/searchwrapped_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear = n.clear
 local command = n.command
 local api = n.api

test/functional/autocmd/show_spec.lua

@@ -2,6 +2,7 @@ local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear = n.clear
 local command = n.command
 local dedent = t.dedent

test/functional/autocmd/signal_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each, finally = t.describe, t.it, t.before_each, t.finally
 local clear = n.clear
 local command = n.command
 local eq = t.eq

test/functional/autocmd/tabclose_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear, eq = n.clear, t.eq
 local command = n.command
 local eval = n.eval

test/functional/autocmd/tabmove_spec.lua

@@ -2,6 +2,7 @@ local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear = n.clear
 local command = n.command
 local exec_lua = n.exec_lua

test/functional/autocmd/tabnew_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear = n.clear
 local command = n.command
 local eq = t.eq

test/functional/autocmd/tabnewentered_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear = n.clear
 local command = n.command
 local dedent = t.dedent

test/functional/autocmd/termxx_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
+local describe, it, before_each = t.describe, t.it, t.before_each
 local uv = vim.uv
 
 local clear, command, testprg = n.clear, n.command, n.testprg

test/functional/autocmd/textchanged_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local it, finally = t.it, t.finally
 local clear = n.clear
 local exec = n.exec
 local command = n.command

test/functional/autocmd/textyankpost_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear, eval, eq = n.clear, n.eval, t.eq
 local feed, command, expect = n.feed, n.command, n.expect
 local api, fn, neq = n.api, n.fn, t.neq

test/functional/autocmd/win_scrolled_resized_spec.lua

@@ -2,6 +2,7 @@ local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
 
+local describe, it, before_each, after_each = t.describe, t.it, t.before_each, t.after_each
 local clear = n.clear
 local eq = t.eq
 local eval = n.eval

test/functional/core/channels_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each, finally = t.describe, t.it, t.before_each, t.finally
 local clear, eq, eval, next_msg, ok, source = n.clear, t.eq, n.eval, n.next_msg, t.ok, n.source
 local command, fn, api = n.command, n.fn, n.api
 local feed = n.feed

test/functional/core/env_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local eq = t.eq
 local clear = n.clear
 local command = n.command

test/functional/core/exit_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local assert_alive = n.assert_alive
 local command = n.command
 local feed_command = n.feed_command

test/functional/core/fileio_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
+local describe, it, before_each, after_each = t.describe, t.it, t.before_each, t.after_each
 local uv = vim.uv
 
 local assert_log = t.assert_log

test/functional/core/job_spec.lua

@@ -3,6 +3,8 @@ local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
 local tt = require('test.functional.testterm')
 
+local describe, it, before_each, pending, finally =
+  t.describe, t.it, t.before_each, t.pending, t.finally
 local clear = n.clear
 local eq = t.eq
 local eval = n.eval

test/functional/core/keycode_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local eq = t.eq
 local exec_lua = n.exec_lua
 local clear = n.clear

test/functional/core/log_spec.lua

@@ -2,6 +2,7 @@ local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 local tt = require('test.functional.testterm')
 
+local describe, it, after_each = t.describe, t.it, t.after_each
 local assert_log = t.assert_log
 local clear = n.clear
 local command = n.command

test/functional/core/main_spec.lua

@@ -1,6 +1,8 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
+local describe, it, before_each, after_each, finally =
+  t.describe, t.it, t.before_each, t.after_each, t.finally
 local uv = vim.uv
 
 local eq = t.eq

test/functional/core/path_spec.lua

@@ -1,6 +1,8 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each, setup, teardown =
+  t.describe, t.it, t.before_each, t.setup, t.teardown
 local clear = n.clear
 local command = n.command
 local eq = t.eq

test/functional/core/remote_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each, after_each = t.describe, t.it, t.before_each, t.after_each
 local clear = n.clear
 local command = n.command
 local eq = t.eq

test/functional/core/server_spec.lua

@@ -1,6 +1,8 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each, after_each, finally =
+  t.describe, t.it, t.before_each, t.after_each, t.finally
 local eq, neq, eval = t.eq, t.neq, n.eval
 local clear, fn, api = n.clear, n.fn, n.api
 local matches = t.matches

test/functional/core/spellfile_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each, after_each = t.describe, t.it, t.before_each, t.after_each
 local eq = t.eq
 local pcall_err = t.pcall_err
 local clear = n.clear

test/functional/core/startup_spec.lua

@@ -2,6 +2,8 @@ local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
 
+local describe, it, before_each, after_each, setup, teardown, finally =
+  t.describe, t.it, t.before_each, t.after_each, t.setup, t.teardown, t.finally
 local assert_alive = n.assert_alive
 local assert_log = t.assert_log
 local clear = n.clear

test/functional/editor/K_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each, after_each = t.describe, t.it, t.before_each, t.after_each
 local eq, clear, eval, feed, api, retry = t.eq, n.clear, n.eval, n.feed, n.api, t.retry
 
 describe('K', function()

test/functional/editor/cmdwin_spec.lua

@@ -3,6 +3,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local feed = n.feed
 local api = n.api
 local fn = n.fn

test/functional/editor/completion_spec.lua

@@ -1,4 +1,5 @@
 local t = require('test.testutil')
+local describe, it, before_each, finally = t.describe, t.it, t.before_each, t.finally
 local pcall_err = t.pcall_err
 local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')

test/functional/editor/count_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local eq = t.eq
 local eval = n.eval
 local feed = n.feed

test/functional/editor/ctrl_c_spec.lua

@@ -2,6 +2,7 @@ local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear, feed, source = n.clear, n.feed, n.source
 local command = n.command
 local poke_eventloop = n.poke_eventloop
@@ -17,7 +18,7 @@ describe('CTRL-C (mapped)', function()
 
   it('interrupts :global', function()
     -- Crashes luajit.
-    if t.skip_fragile(pending) then
+    if t.skip_fragile(t.pending) then
       return
     end
 

test/functional/editor/defaults_spec.lua

@@ -8,6 +8,7 @@ local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
 
+local describe, it = t.describe, t.it
 describe('default', function()
   describe('autocommands', function()
     it('nvim.terminal.TermClose closes terminal with default shell on success', function()

test/functional/editor/fold_spec.lua

@@ -1,6 +1,8 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each, after_each, setup =
+  t.describe, t.it, t.before_each, t.after_each, t.setup
 local clear = n.clear
 local insert = n.insert
 local exec = n.exec

test/functional/editor/ftplugin_spec.lua

@@ -3,6 +3,8 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each, setup, teardown =
+  t.describe, t.it, t.before_each, t.setup, t.teardown
 local exec_lua = n.exec_lua
 local command = n.command
 local eq = t.eq

test/functional/editor/jump_spec.lua

@@ -2,6 +2,7 @@ local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
 
+local describe, it, before_each, after_each = t.describe, t.it, t.before_each, t.after_each
 local clear = n.clear
 local command = n.command
 local dedent = t.dedent

test/functional/editor/lang_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each, pending = t.describe, t.it, t.before_each, t.pending
 local clear, insert, eq = n.clear, n.insert, t.eq
 local command, expect = n.command, n.expect
 local feed, eval = n.feed, n.eval

test/functional/editor/langmap_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each, pending = t.describe, t.it, t.before_each, t.pending
 local eq, neq, call = t.eq, t.neq, n.call
 local eval, feed, clear = n.eval, n.feed, n.clear
 local command, insert, expect = n.command, n.insert, n.expect

test/functional/editor/macro_spec.lua

@@ -2,6 +2,7 @@ local t = require('test.testutil')
 local Screen = require('test.functional.ui.screen')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local eq = t.eq
 local eval = n.eval
 local feed = n.feed

test/functional/editor/mark_spec.lua

@@ -2,6 +2,8 @@ local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
 
+local describe, it, before_each, after_each, finally =
+  t.describe, t.it, t.before_each, t.after_each, t.finally
 local api = n.api
 local clear = n.clear
 local command = n.command

test/functional/editor/meta_key_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear, feed, insert = n.clear, n.feed, n.insert
 local command = n.command
 local exec_lua = n.exec_lua

test/functional/editor/mode_cmdline_spec.lua

@@ -4,6 +4,7 @@ local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear, insert, fn, eq, feed = n.clear, n.insert, n.fn, t.eq, n.feed
 local eval = n.eval
 local command = n.command

test/functional/editor/mode_insert_spec.lua

@@ -4,6 +4,7 @@ local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear, feed, insert = n.clear, n.feed, n.insert
 local expect = n.expect
 local command = n.command

test/functional/editor/mode_normal_spec.lua

@@ -4,6 +4,7 @@ local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear = n.clear
 local feed = n.feed
 local fn = n.fn

test/functional/editor/put_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear = n.clear
 local insert = n.insert
 local feed = n.feed

test/functional/editor/runtime_spec.lua

@@ -1,6 +1,8 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each, after_each, setup, teardown, finally =
+  t.describe, t.it, t.before_each, t.after_each, t.setup, t.teardown, t.finally
 local clear = n.clear
 local eq = t.eq
 local eval = n.eval

test/functional/editor/search_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear = n.clear
 local command = n.command
 local eq = t.eq

test/functional/editor/tabpage_spec.lua

@@ -2,6 +2,7 @@ local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local clear = n.clear
 local command = n.command
 local eq = t.eq

test/functional/editor/textobject_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local api = n.api
 local clear = n.clear
 local command = n.command

test/functional/editor/undo_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each, after_each = t.describe, t.it, t.before_each, t.after_each
 local clear = n.clear
 local command = n.command
 local expect = n.expect

test/functional/editor/xxd_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local eq = t.eq
 local eval = n.eval
 local clear = n.clear

test/functional/ex_cmds/append_spec.lua

@@ -2,6 +2,7 @@ local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local eq = t.eq
 local dedent = t.dedent
 local exec = n.exec

test/functional/ex_cmds/arg_spec.lua

@@ -1,6 +1,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each = t.describe, t.it, t.before_each
 local eq, command, fn = t.eq, n.command, n.fn
 local ok = t.ok
 local matches = t.matches

test/functional/ex_cmds/cd_spec.lua

@@ -3,6 +3,7 @@
 local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 
+local describe, it, before_each, after_each = t.describe, t.it, t.before_each, t.after_each
 local eq = t.eq
 local pcall_err = t.pcall_err
 local call = n.call

test/functional/ex_cmds/cmd_map_spec.lua

@@ -2,6 +2,7 @@ local t = require('test.testutil')
 local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
 
+local describe, it, before_each, after_each = t.describe, t.it, t.before_each, t.after_each
 local clear = n.clear
 local feed = n.feed
 local eq = t.eq