Merge #40865 from justinmk/fixci

test/functional/lua/api_spec.lua

@@ -2,6 +2,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 remove_trace = t.remove_trace
 local fn = n.fn
 local clear = n.clear

test/functional/lua/base64_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 exec_lua = n.exec_lua
 local eq = t.eq

test/functional/lua/buffer_updates_spec.lua

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

test/functional/lua/command_line_completion_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/lua/commands_spec.lua

@@ -3,6 +3,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 eq = t.eq
 local NIL = vim.NIL
 local eval = n.eval

test/functional/lua/comment_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 eq = t.eq

test/functional/lua/deprecated_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 exec_lua = n.exec_lua
 local eq = t.eq

test/functional/lua/diagnostic_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 command = n.command
 local clear = n.clear
 local exec_lua = n.exec_lua

test/functional/lua/ffi_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 = t.eq
 local exec_lua = n.exec_lua
 local clear = n.clear

test/functional/lua/filetype_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 exec_lua = n.exec_lua
 local eq = t.eq
 local api = n.api

test/functional/lua/fs_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, pending, finally =
+  t.describe, t.it, t.before_each, t.after_each, t.setup, t.pending, t.finally
 local clear = n.clear
 local exec_lua = n.exec_lua
 local eq = t.eq

test/functional/lua/func_memoize_spec.lua

@@ -1,5 +1,6 @@
 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 exec_lua = n.exec_lua
 local eq = t.eq

test/functional/lua/glob_spec.lua

@@ -1,5 +1,6 @@
 local t = require('test.testutil')
 
+local describe, it = t.describe, t.it
 local eq = t.eq
 
 describe('glob', function()

test/functional/lua/hl_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 exec_lua = n.exec_lua
 local eq = t.eq
 local eval = n.eval

test/functional/lua/inspector_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 exec_lua = n.exec_lua
 local eq = t.eq
 local eval = n.eval

test/functional/lua/iter_spec.lua

@@ -1,5 +1,6 @@
 local t = require('test.testutil')
 
+local describe, it = t.describe, t.it
 local eq = t.eq
 local matches = t.matches
 local pcall_err = t.pcall_err

test/functional/lua/json_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 exec_lua = n.exec_lua
 local eq = t.eq

test/functional/lua/list_spec.lua

@@ -1,5 +1,6 @@
 -- Test suite for vim.list
 local t = require('test.testutil')
+local describe, it = t.describe, t.it
 local eq = t.eq
 
 describe('vim.list', function()

test/functional/lua/loader_spec.lua

@@ -2,6 +2,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 exec_lua = n.exec_lua
 local command = n.command
 local clear = n.clear

test/functional/lua/log_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_log = t.assert_log
 local assert_nolog = t.assert_nolog
 local clear = n.clear

test/functional/lua/luaeval_spec.lua

@@ -3,6 +3,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 pcall_err = t.pcall_err
 local remove_trace = t.remove_trace
 local exec_lua = n.exec_lua

test/functional/lua/mpack_spec.lua

@@ -2,6 +2,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/lua/net_spec.lua

@@ -1,5 +1,6 @@
 local n = require('test.functional.testnvim')()
 local t = require('test.testutil')
+local describe, it, before_each = t.describe, t.it, t.before_each
 local skip_integ = os.getenv('NVIM_TEST_INTEG') ~= '1'
 
 local exec_lua = n.exec_lua

test/functional/lua/option_and_var_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, pending = t.describe, t.it, t.before_each, t.pending
 local NIL = vim.NIL
 local feed = n.feed
 local command = n.command

test/functional/lua/overrides_spec.lua

@@ -3,6 +3,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 eq = t.eq
 local matches = t.matches
 local NIL = vim.NIL

test/functional/lua/pos_spec.lua

@@ -1,6 +1,7 @@
 -- Test suite for vim.pos
 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 dedent = t.dedent
 

test/functional/lua/range_spec.lua

@@ -1,6 +1,7 @@
 -- Test suite for vim.range
 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

test/functional/lua/secure_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, finally =
+  t.describe, t.it, t.before_each, t.after_each, t.setup, t.finally
 local eq = t.eq
 local clear = n.clear
 local command = n.command

test/functional/lua/snippet_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 buf_lines = n.buf_lines
 local clear = n.clear
 local eq = t.eq

test/functional/lua/spell_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 exec_lua = n.exec_lua
 local eq = t.eq

test/functional/lua/ssh_spec.lua

@@ -1,5 +1,6 @@
 local t = require('test.testutil')
 local parser = require('vim.net._ssh')
+local describe, it = t.describe, t.it
 local eq = t.eq
 
 describe('SSH parser', function()

test/functional/lua/system_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 exec_lua = n.exec_lua
 local eq = t.eq

test/functional/lua/text_spec.lua

@@ -1,5 +1,6 @@
 local t = require('test.testutil')
 
+local describe, it = t.describe, t.it
 local eq = t.eq
 local pcall_err = t.pcall_err
 

test/functional/lua/thread_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_alive = n.assert_alive
 local clear = n.clear
 local feed = n.feed

test/functional/lua/time_spec.lua

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

test/functional/lua/ui_event_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 eq = t.eq
 local exec_lua = n.exec_lua
 local clear = n.clear

test/functional/lua/ui_select_spec.lua

@@ -1,6 +1,7 @@
 -- Tests for vim.ui.select(), including integration with builtins (:tselect, z=).
 
 local t = require('test.testutil')
+local describe, it, before_each, finally = t.describe, t.it, t.before_each, t.finally
 local retry = t.retry
 local n = require('test.functional.testnvim')()
 local clear = n.clear

test/functional/lua/ui_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 ok = t.ok
 local exec_lua = n.exec_lua

test/functional/lua/uri_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 exec_lua = n.exec_lua
 local eq = t.eq

test/functional/lua/uv_spec.lua

@@ -3,6 +3,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 fn = n.fn
 local api = n.api
 local clear = n.clear

test/functional/lua/version_spec.lua

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

test/functional/lua/vim_spec.lua

@@ -3,6 +3,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 nvim_prog = n.nvim_prog
 local fn = n.fn
 local api = n.api

test/functional/lua/watch_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/lua/with_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, pending = t.describe, t.it, t.before_each, t.pending
 local fn = n.fn
 local api = n.api
 local command = n.command

test/functional/lua/xdiff_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 exec_lua = n.exec_lua
 local eq = t.eq