From 6d8c8b18d551d0be0490640c00fabb816727ec10 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Mon, 20 Jul 2026 17:16:51 +0200 Subject: [PATCH] test(harness): migrate away from magic globals Problem: The magic globals `it`, `describe`, etc., are more trouble than they are worth. - Hooking into `after_each` requires `getfenv()` hacks. - They confuse luals/emmylua, because the top-level `.luarc.json` isn't merged with `test/.luarc.json` (apparently a luals limitation?) - They totally defeat discoverability because the user just has to "know" about the various magic symbols. So they harm DX, which means they serve no purpose at all. Solution: - Expose the test API from `testutil`, so tests can call `t.it()`, `t.describe()`, etc., in the conventional way. - Drop `getfenv()` hacks. - Drop the `setfenv()` injection in `load_chunk`. - Drop `test/_meta.lua`. --- .luacheckrc | 1 - test/_meta.lua | 28 --------- test/benchmark/autocmd_spec.lua | 2 + test/benchmark/bench_regexp_spec.lua | 2 + test/benchmark/decor_spec.lua | 2 + test/benchmark/deepcopy_spec.lua | 2 + test/benchmark/extmark_spec.lua | 2 + test/benchmark/iter_spec.lua | 2 + test/benchmark/keycodes_spec.lua | 1 + test/benchmark/option_spec.lua | 2 + test/benchmark/screenpos_spec.lua | 1 + test/benchmark/text_spec.lua | 1 + test/benchmark/treesitter_spec.lua | 2 + test/benchmark/trim_spec.lua | 1 + test/functional/api/autocmd_spec.lua | 1 + test/functional/api/buffer_spec.lua | 2 + test/functional/api/buffer_updates_spec.lua | 1 + test/functional/api/command_spec.lua | 1 + test/functional/api/deprecated_spec.lua | 1 + test/functional/api/extmark_spec.lua | 1 + test/functional/api/fast_spec.lua | 1 + test/functional/api/highlight_spec.lua | 1 + test/functional/api/keymap_spec.lua | 1 + test/functional/api/menu_spec.lua | 2 + test/functional/api/proc_spec.lua | 1 + .../api/server_notifications_spec.lua | 1 + test/functional/api/server_requests_spec.lua | 2 + test/functional/api/tabpage_spec.lua | 1 + test/functional/api/ui_spec.lua | 1 + test/functional/api/version_spec.lua | 1 + test/functional/api/vim_spec.lua | 2 + test/functional/api/window_spec.lua | 2 + .../autocmd/autocmd_oldtest_spec.lua | 1 + test/functional/autocmd/autocmd_spec.lua | 1 + test/functional/autocmd/bufenter_spec.lua | 1 + test/functional/autocmd/cmdline_spec.lua | 1 + test/functional/autocmd/completedone_spec.lua | 1 + test/functional/autocmd/cursorhold_spec.lua | 1 + test/functional/autocmd/cursormoved_spec.lua | 1 + test/functional/autocmd/dirchanged_spec.lua | 2 + test/functional/autocmd/filetype_spec.lua | 2 + test/functional/autocmd/focus_spec.lua | 1 + test/functional/autocmd/markset_spec.lua | 1 + test/functional/autocmd/modechanged_spec.lua | 1 + test/functional/autocmd/optionset_spec.lua | 1 + test/functional/autocmd/recording_spec.lua | 1 + test/functional/autocmd/safestate_spec.lua | 1 + .../functional/autocmd/searchwrapped_spec.lua | 1 + test/functional/autocmd/show_spec.lua | 1 + test/functional/autocmd/signal_spec.lua | 1 + test/functional/autocmd/tabclose_spec.lua | 1 + test/functional/autocmd/tabmove_spec.lua | 1 + test/functional/autocmd/tabnew_spec.lua | 1 + .../functional/autocmd/tabnewentered_spec.lua | 1 + test/functional/autocmd/termxx_spec.lua | 1 + test/functional/autocmd/textchanged_spec.lua | 1 + test/functional/autocmd/textyankpost_spec.lua | 1 + .../autocmd/win_scrolled_resized_spec.lua | 1 + test/functional/core/channels_spec.lua | 1 + test/functional/core/env_spec.lua | 1 + test/functional/core/exit_spec.lua | 1 + test/functional/core/fileio_spec.lua | 1 + test/functional/core/job_spec.lua | 2 + test/functional/core/keycode_spec.lua | 1 + test/functional/core/log_spec.lua | 1 + test/functional/core/main_spec.lua | 2 + test/functional/core/path_spec.lua | 2 + test/functional/core/remote_spec.lua | 1 + test/functional/core/server_spec.lua | 2 + test/functional/core/spellfile_spec.lua | 1 + test/functional/core/startup_spec.lua | 2 + test/functional/editor/K_spec.lua | 1 + test/functional/editor/cmdwin_spec.lua | 1 + test/functional/editor/completion_spec.lua | 1 + test/functional/editor/count_spec.lua | 1 + test/functional/editor/ctrl_c_spec.lua | 3 +- test/functional/editor/defaults_spec.lua | 1 + test/functional/editor/fold_spec.lua | 2 + test/functional/editor/ftplugin_spec.lua | 2 + test/functional/editor/jump_spec.lua | 1 + test/functional/editor/lang_spec.lua | 1 + test/functional/editor/langmap_spec.lua | 1 + test/functional/editor/macro_spec.lua | 1 + test/functional/editor/mark_spec.lua | 2 + test/functional/editor/meta_key_spec.lua | 1 + test/functional/editor/mode_cmdline_spec.lua | 1 + test/functional/editor/mode_insert_spec.lua | 1 + test/functional/editor/mode_normal_spec.lua | 1 + test/functional/editor/put_spec.lua | 1 + test/functional/editor/runtime_spec.lua | 2 + test/functional/editor/search_spec.lua | 1 + test/functional/editor/tabpage_spec.lua | 1 + test/functional/editor/textobject_spec.lua | 1 + test/functional/editor/undo_spec.lua | 1 + test/functional/editor/xxd_spec.lua | 1 + test/functional/ex_cmds/append_spec.lua | 1 + test/functional/ex_cmds/arg_spec.lua | 1 + test/functional/ex_cmds/cd_spec.lua | 1 + test/functional/ex_cmds/cmd_map_spec.lua | 1 + test/functional/ex_cmds/debug_spec.lua | 2 + .../ex_cmds/dict_notifications_spec.lua | 1 + test/functional/ex_cmds/digraphs_spec.lua | 2 + test/functional/ex_cmds/drop_spec.lua | 2 + test/functional/ex_cmds/echo_spec.lua | 1 + test/functional/ex_cmds/edit_spec.lua | 1 + test/functional/ex_cmds/encoding_spec.lua | 1 + test/functional/ex_cmds/excmd_spec.lua | 1 + test/functional/ex_cmds/file_spec.lua | 1 + test/functional/ex_cmds/grep_spec.lua | 1 + test/functional/ex_cmds/help_spec.lua | 1 + test/functional/ex_cmds/highlight_spec.lua | 1 + test/functional/ex_cmds/log_spec.lua | 1 + test/functional/ex_cmds/ls_spec.lua | 1 + test/functional/ex_cmds/lsp_spec.lua | 1 + test/functional/ex_cmds/make_spec.lua | 1 + test/functional/ex_cmds/map_spec.lua | 1 + test/functional/ex_cmds/marks_spec.lua | 1 + test/functional/ex_cmds/menu_spec.lua | 1 + test/functional/ex_cmds/mksession_spec.lua | 2 + test/functional/ex_cmds/mkview_spec.lua | 1 + test/functional/ex_cmds/normal_spec.lua | 1 + test/functional/ex_cmds/oldfiles_spec.lua | 1 + test/functional/ex_cmds/pack_spec.lua | 1 + .../ex_cmds/print_commands_spec.lua | 1 + test/functional/ex_cmds/profile_spec.lua | 1 + .../ex_cmds/quickfix_commands_spec.lua | 2 + test/functional/ex_cmds/quit_spec.lua | 2 + test/functional/ex_cmds/script_spec.lua | 1 + test/functional/ex_cmds/sign_spec.lua | 1 + test/functional/ex_cmds/source_spec.lua | 1 + .../swapfile_preserve_recover_spec.lua | 2 + test/functional/ex_cmds/syntax_spec.lua | 1 + test/functional/ex_cmds/trust_spec.lua | 1 + test/functional/ex_cmds/undojoin_spec.lua | 2 + test/functional/ex_cmds/uptime_spec.lua | 1 + test/functional/ex_cmds/verbose_spec.lua | 1 + test/functional/ex_cmds/wincmd_spec.lua | 1 + test/functional/ex_cmds/write_spec.lua | 2 + test/functional/ex_cmds/wundo_spec.lua | 2 + test/functional/ex_cmds/wviminfo_spec.lua | 1 + test/functional/example_spec.lua | 1 + test/functional/harness/assert_spec.lua | 2 + test/functional/harness/harness_spec.lua | 2 + .../legacy/002_filename_recognition_spec.lua | 2 + .../004_bufenter_with_modelines_spec.lua | 2 + .../005_bufleave_delete_buffer_spec.lua | 2 + .../legacy/007_ball_buffer_list_spec.lua | 2 + .../legacy/008_autocommands_spec.lua | 2 + .../legacy/011_autocommands_spec.lua | 2 + test/functional/legacy/012_directory_spec.lua | 1 + test/functional/legacy/015_alignment_spec.lua | 2 + .../legacy/018_unset_smart_indenting_spec.lua | 2 + .../legacy/019_smarttab_expandtab_spec.lua | 2 + .../legacy/020_blockwise_visual_spec.lua | 2 + .../functional/legacy/021_control_wi_spec.lua | 2 + .../legacy/023_edit_arguments_spec.lua | 2 + .../legacy/025_jump_tag_hidden_spec.lua | 1 + .../legacy/026_execute_while_if_spec.lua | 2 + .../legacy/028_source_ctrl_v_spec.lua | 2 + test/functional/legacy/029_fuzzy_spec.lua | 2 + .../legacy/030_fileformats_spec.lua | 1 + .../legacy/031_close_commands_spec.lua | 2 + .../legacy/033_lisp_indent_spec.lua | 2 + .../legacy/034_user_function_spec.lua | 2 + .../035_increment_and_decrement_spec.lua | 2 + .../036_regexp_character_classes_spec.lua | 2 + .../legacy/038_virtual_replace_spec.lua | 2 + .../039_visual_block_mode_commands_spec.lua | 1 + .../legacy/043_magic_settings_spec.lua | 2 + .../044_099_regexp_multibyte_magic_spec.lua | 2 + .../legacy/046_multi_line_regexps_spec.lua | 2 + .../054_buffer_local_autocommands_spec.lua | 2 + .../legacy/055_list_and_dict_types_spec.lua | 2 + .../legacy/056_script_local_function_spec.lua | 2 + test/functional/legacy/057_sort_spec.lua | 1 + .../060_exists_and_has_functions_spec.lua | 1 + test/functional/legacy/061_undo_tree_spec.lua | 1 + .../legacy/063_match_and_matchadd_spec.lua | 2 + .../065_float_and_logic_operators_spec.lua | 2 + .../legacy/066_visual_block_tab_spec.lua | 2 + .../legacy/067_augroup_exists_spec.lua | 2 + .../legacy/068_text_formatting_spec.lua | 2 + .../legacy/069_multibyte_formatting_spec.lua | 1 + test/functional/legacy/072_undo_file_spec.lua | 2 + .../legacy/074_global_var_in_viminfo_spec.lua | 1 + .../legacy/081_coptions_movement_spec.lua | 2 + .../legacy/082_string_comparison_spec.lua | 2 + ...083_tag_search_with_file_encoding_spec.lua | 1 + test/functional/legacy/090_sha256_spec.lua | 2 + .../legacy/091_context_variables_spec.lua | 2 + .../092_mksession_cursor_cols_utf8_spec.lua | 2 + .../093_mksession_cursor_cols_latin1_spec.lua | 2 + .../legacy/094_visual_mode_operators_spec.lua | 2 + .../legacy/095_regexp_multibyte_spec.lua | 2 + .../legacy/096_location_list_spec.lua | 2 + test/functional/legacy/097_glob_path_spec.lua | 1 + test/functional/legacy/101_hlsearch_spec.lua | 2 + .../legacy/102_fnameescape_spec.lua | 2 + .../legacy/103_visual_mode_reset_spec.lua | 2 + .../legacy/106_errorformat_spec.lua | 2 + .../107_adjust_window_and_contents_spec.lua | 2 + .../108_backtrace_debug_commands_spec.lua | 2 + test/functional/legacy/arglist_spec.lua | 1 + test/functional/legacy/assert_spec.lua | 1 + test/functional/legacy/autochdir_spec.lua | 1 + .../functional/legacy/autocmd_option_spec.lua | 1 + test/functional/legacy/autocmd_spec.lua | 1 + .../legacy/autoformat_join_spec.lua | 2 + test/functional/legacy/breakindent_spec.lua | 2 + test/functional/legacy/changelist_spec.lua | 2 + test/functional/legacy/charsearch_spec.lua | 2 + test/functional/legacy/close_count_spec.lua | 1 + test/functional/legacy/cmdline_spec.lua | 2 + test/functional/legacy/command_count_spec.lua | 2 + test/functional/legacy/comparators_spec.lua | 1 + test/functional/legacy/conceal_spec.lua | 1 + test/functional/legacy/cpoptions_spec.lua | 2 + test/functional/legacy/crash_spec.lua | 1 + test/functional/legacy/debugger_spec.lua | 1 + test/functional/legacy/delete_spec.lua | 2 + test/functional/legacy/digraph_spec.lua | 2 + test/functional/legacy/display_spec.lua | 2 + test/functional/legacy/edit_spec.lua | 2 + test/functional/legacy/erasebackword_spec.lua | 2 + test/functional/legacy/eval_spec.lua | 2 + test/functional/legacy/ex_mode_spec.lua | 1 + test/functional/legacy/excmd_spec.lua | 1 + test/functional/legacy/fixeol_spec.lua | 2 + test/functional/legacy/fnamemodify_spec.lua | 1 + test/functional/legacy/fold_spec.lua | 2 + test/functional/legacy/function_sort_spec.lua | 1 + test/functional/legacy/getcwd_spec.lua | 1 + test/functional/legacy/gf_spec.lua | 1 + test/functional/legacy/glob2regpat_spec.lua | 1 + test/functional/legacy/global_spec.lua | 2 + test/functional/legacy/highlight_spec.lua | 1 + test/functional/legacy/insertcount_spec.lua | 2 + test/functional/legacy/join_spec.lua | 1 + test/functional/legacy/lispwords_spec.lua | 1 + test/functional/legacy/listchars_spec.lua | 2 + test/functional/legacy/listlbr_spec.lua | 2 + test/functional/legacy/listlbr_utf8_spec.lua | 2 + test/functional/legacy/mapping_spec.lua | 1 + test/functional/legacy/marks_spec.lua | 2 + test/functional/legacy/match_spec.lua | 2 + test/functional/legacy/matchparen_spec.lua | 2 + test/functional/legacy/memory_usage_spec.lua | 2 + test/functional/legacy/messages_spec.lua | 1 + test/functional/legacy/mksession_spec.lua | 1 + test/functional/legacy/move_spec.lua | 2 + .../legacy/nested_function_spec.lua | 2 + test/functional/legacy/normal_spec.lua | 1 + test/functional/legacy/number_spec.lua | 2 + test/functional/legacy/options_spec.lua | 1 + test/functional/legacy/prompt_buffer_spec.lua | 1 + test/functional/legacy/put_spec.lua | 2 + test/functional/legacy/qf_title_spec.lua | 2 + test/functional/legacy/registers_spec.lua | 1 + test/functional/legacy/scroll_opt_spec.lua | 2 + test/functional/legacy/search_mbyte_spec.lua | 2 + test/functional/legacy/search_spec.lua | 1 + test/functional/legacy/search_stat_spec.lua | 2 + test/functional/legacy/signs_spec.lua | 2 + test/functional/legacy/source_spec.lua | 1 + test/functional/legacy/statusline_spec.lua | 2 + test/functional/legacy/substitute_spec.lua | 1 + test/functional/legacy/syn_attr_spec.lua | 1 + test/functional/legacy/tabline_spec.lua | 2 + test/functional/legacy/tagcase_spec.lua | 2 + test/functional/legacy/utf8_spec.lua | 1 + test/functional/legacy/vimscript_spec.lua | 2 + test/functional/legacy/visual_spec.lua | 2 + test/functional/legacy/window_cmd_spec.lua | 1 + test/functional/legacy/wordcount_spec.lua | 1 + test/functional/legacy/writefile_spec.lua | 2 + test/functional/lua/api_spec.lua | 1 + test/functional/lua/base64_spec.lua | 1 + test/functional/lua/buffer_updates_spec.lua | 1 + .../lua/command_line_completion_spec.lua | 1 + test/functional/lua/commands_spec.lua | 1 + test/functional/lua/comment_spec.lua | 1 + test/functional/lua/deprecated_spec.lua | 1 + test/functional/lua/diagnostic_spec.lua | 1 + test/functional/lua/ffi_spec.lua | 1 + test/functional/lua/filetype_spec.lua | 2 + test/functional/lua/fs_spec.lua | 2 + test/functional/lua/func_memoize_spec.lua | 1 + test/functional/lua/glob_spec.lua | 1 + test/functional/lua/hl_spec.lua | 1 + test/functional/lua/inspector_spec.lua | 1 + test/functional/lua/iter_spec.lua | 1 + test/functional/lua/json_spec.lua | 1 + test/functional/lua/list_spec.lua | 1 + test/functional/lua/loader_spec.lua | 1 + test/functional/lua/log_spec.lua | 1 + test/functional/lua/luaeval_spec.lua | 1 + test/functional/lua/mpack_spec.lua | 1 + test/functional/lua/net_spec.lua | 1 + test/functional/lua/option_and_var_spec.lua | 1 + test/functional/lua/overrides_spec.lua | 1 + test/functional/lua/pos_spec.lua | 1 + test/functional/lua/range_spec.lua | 1 + test/functional/lua/secure_spec.lua | 2 + test/functional/lua/snippet_spec.lua | 1 + test/functional/lua/spell_spec.lua | 1 + test/functional/lua/ssh_spec.lua | 1 + test/functional/lua/system_spec.lua | 1 + test/functional/lua/text_spec.lua | 1 + test/functional/lua/thread_spec.lua | 1 + test/functional/lua/time_spec.lua | 1 + test/functional/lua/ui_event_spec.lua | 1 + test/functional/lua/ui_select_spec.lua | 1 + test/functional/lua/ui_spec.lua | 1 + test/functional/lua/uri_spec.lua | 1 + test/functional/lua/uv_spec.lua | 1 + test/functional/lua/version_spec.lua | 1 + test/functional/lua/vim_spec.lua | 1 + test/functional/lua/watch_spec.lua | 1 + test/functional/lua/with_spec.lua | 1 + test/functional/lua/xdiff_spec.lua | 1 + test/functional/options/autochdir_spec.lua | 1 + test/functional/options/autoread_spec.lua | 1 + test/functional/options/belloff_spec.lua | 1 + test/functional/options/chars_spec.lua | 1 + test/functional/options/cursorbind_spec.lua | 2 + test/functional/options/defaults_spec.lua | 2 + test/functional/options/keymap_spec.lua | 1 + test/functional/options/modified_spec.lua | 1 + test/functional/options/mousescroll_spec.lua | 1 + test/functional/options/num_options_spec.lua | 1 + test/functional/options/shell_spec.lua | 1 + test/functional/options/shortmess_spec.lua | 1 + test/functional/options/tabstop_spec.lua | 2 + test/functional/options/winfixbuf_spec.lua | 1 + test/functional/plugin/cfilter_spec.lua | 1 + test/functional/plugin/difftool_spec.lua | 2 + test/functional/plugin/dir_spec.lua | 2 + test/functional/plugin/editorconfig_spec.lua | 2 + test/functional/plugin/health_spec.lua | 1 + test/functional/plugin/lsp/buf_spec.lua | 2 + test/functional/plugin/lsp/codelens_spec.lua | 1 + .../functional/plugin/lsp/completion_spec.lua | 1 + .../functional/plugin/lsp/diagnostic_spec.lua | 1 + .../plugin/lsp/document_color_spec.lua | 1 + .../plugin/lsp/folding_range_spec.lua | 1 + .../plugin/lsp/incremental_sync_spec.lua | 1 + .../functional/plugin/lsp/inlay_hint_spec.lua | 1 + .../plugin/lsp/inline_completion_spec.lua | 1 + .../plugin/lsp/linked_editing_range_spec.lua | 1 + .../plugin/lsp/on_type_formatting_spec.lua | 1 + .../plugin/lsp/selection_range_spec.lua | 1 + .../plugin/lsp/semantic_tokens_spec.lua | 1 + test/functional/plugin/lsp/snippet_spec.lua | 1 + test/functional/plugin/lsp/util_spec.lua | 1 + test/functional/plugin/lsp_spec.lua | 2 + test/functional/plugin/man_spec.lua | 1 + test/functional/plugin/matchparen_spec.lua | 1 + test/functional/plugin/msgpack_spec.lua | 1 + test/functional/plugin/optwin_spec.lua | 1 + test/functional/plugin/pack_spec.lua | 2 + test/functional/plugin/shada_spec.lua | 2 + test/functional/plugin/spellfile_spec.lua | 1 + test/functional/plugin/tohtml_spec.lua | 1 + test/functional/plugin/tutor_spec.lua | 1 + test/functional/plugin/undotree_spec.lua | 1 + test/functional/plugin/vim_syntax_spec.lua | 2 + test/functional/provider/clipboard_spec.lua | 1 + test/functional/provider/define_spec.lua | 1 + test/functional/provider/nodejs_spec.lua | 2 + test/functional/provider/perl_spec.lua | 2 + test/functional/provider/provider_spec.lua | 1 + test/functional/provider/python3_spec.lua | 1 + test/functional/provider/ruby_spec.lua | 1 + test/functional/script/clint_spec.lua | 1 + .../script/luacats_grammar_spec.lua | 1 + .../functional/script/luacats_parser_spec.lua | 1 + test/functional/script/text_utils_spec.lua | 1 + test/functional/shada/buffers_spec.lua | 1 + test/functional/shada/compatibility_spec.lua | 1 + test/functional/shada/errors_spec.lua | 1 + test/functional/shada/history_spec.lua | 1 + test/functional/shada/marks_spec.lua | 1 + test/functional/shada/merging_spec.lua | 1 + test/functional/shada/registers_spec.lua | 1 + test/functional/shada/shada_spec.lua | 1 + test/functional/shada/variables_spec.lua | 1 + test/functional/terminal/altscreen_spec.lua | 1 + test/functional/terminal/api_spec.lua | 1 + test/functional/terminal/buffer_spec.lua | 1 + test/functional/terminal/channel_spec.lua | 1 + test/functional/terminal/clipboard_spec.lua | 1 + test/functional/terminal/cursor_spec.lua | 1 + test/functional/terminal/edit_spec.lua | 1 + test/functional/terminal/ex_terminal_spec.lua | 2 + test/functional/terminal/highlight_spec.lua | 1 + test/functional/terminal/mouse_spec.lua | 1 + test/functional/terminal/parser_spec.lua | 2 + test/functional/terminal/scrollback_spec.lua | 2 + .../terminal/synchronized_output_spec.lua | 1 + test/functional/terminal/tui_spec.lua | 2 + test/functional/terminal/window_spec.lua | 1 + .../terminal/window_split_tab_spec.lua | 1 + test/functional/testnvim.lua | 15 +---- test/functional/treesitter/fold_spec.lua | 1 + test/functional/treesitter/highlight_spec.lua | 1 + .../treesitter/inspect_tree_spec.lua | 1 + test/functional/treesitter/language_spec.lua | 1 + test/functional/treesitter/node_spec.lua | 1 + test/functional/treesitter/parser_spec.lua | 1 + test/functional/treesitter/query_spec.lua | 1 + test/functional/treesitter/select_spec.lua | 1 + test/functional/treesitter/util_spec.lua | 1 + test/functional/treesitter/wasm_spec.lua | 1 + test/functional/ui/bufhl_spec.lua | 1 + test/functional/ui/cmdline2_spec.lua | 1 + test/functional/ui/cmdline_highlight_spec.lua | 1 + test/functional/ui/cmdline_spec.lua | 1 + test/functional/ui/cursor_spec.lua | 1 + test/functional/ui/decorations_spec.lua | 1 + test/functional/ui/diff_spec.lua | 2 + test/functional/ui/embed_spec.lua | 2 + test/functional/ui/float_spec.lua | 1 + test/functional/ui/fold_spec.lua | 1 + test/functional/ui/highlight_spec.lua | 1 + test/functional/ui/hlstate_spec.lua | 1 + test/functional/ui/img_spec.lua | 1 + test/functional/ui/inccommand_spec.lua | 3 +- test/functional/ui/inccommand_user_spec.lua | 1 + test/functional/ui/input_spec.lua | 1 + test/functional/ui/linematch_spec.lua | 2 + test/functional/ui/messages2_spec.lua | 4 +- test/functional/ui/messages_spec.lua | 2 + test/functional/ui/mode_spec.lua | 1 + test/functional/ui/mouse_spec.lua | 1 + test/functional/ui/multibyte_spec.lua | 1 + test/functional/ui/multigrid_spec.lua | 1 + test/functional/ui/options_spec.lua | 1 + test/functional/ui/output_spec.lua | 1 + test/functional/ui/popupmenu_spec.lua | 1 + test/functional/ui/quickfix_spec.lua | 2 + test/functional/ui/screen_basic_spec.lua | 1 + test/functional/ui/scrollbind_spec.lua | 1 + test/functional/ui/searchhl_spec.lua | 1 + test/functional/ui/sign_spec.lua | 1 + test/functional/ui/spell_spec.lua | 1 + test/functional/ui/statuscolumn_spec.lua | 1 + test/functional/ui/statusline_spec.lua | 1 + test/functional/ui/syntax_conceal_spec.lua | 1 + test/functional/ui/tabline_spec.lua | 1 + test/functional/ui/title_spec.lua | 1 + test/functional/ui/wildmode_spec.lua | 1 + test/functional/ui/winbar_spec.lua | 1 + .../vimscript/api_functions_spec.lua | 1 + .../vimscript/buf_functions_spec.lua | 1 + .../functional/vimscript/changedtick_spec.lua | 1 + .../vimscript/container_functions_spec.lua | 1 + test/functional/vimscript/environ_spec.lua | 1 + test/functional/vimscript/errorlist_spec.lua | 1 + test/functional/vimscript/eval_spec.lua | 2 + test/functional/vimscript/executable_spec.lua | 2 + test/functional/vimscript/execute_spec.lua | 1 + test/functional/vimscript/exepath_spec.lua | 1 + .../functional/vimscript/fnamemodify_spec.lua | 2 + test/functional/vimscript/functions_spec.lua | 1 + test/functional/vimscript/getchar_spec.lua | 2 + test/functional/vimscript/getline_spec.lua | 1 + test/functional/vimscript/glob_spec.lua | 1 + test/functional/vimscript/has_spec.lua | 1 + test/functional/vimscript/hostname_spec.lua | 1 + test/functional/vimscript/input_spec.lua | 1 + .../vimscript/json_functions_spec.lua | 1 + test/functional/vimscript/lang_spec.lua | 1 + test/functional/vimscript/let_spec.lua | 1 + .../vimscript/map_functions_spec.lua | 1 + .../vimscript/match_functions_spec.lua | 1 + .../vimscript/minmax_functions_spec.lua | 1 + test/functional/vimscript/modeline_spec.lua | 1 + .../vimscript/msgpack_functions_spec.lua | 1 + test/functional/vimscript/null_spec.lua | 1 + test/functional/vimscript/operators_spec.lua | 1 + test/functional/vimscript/printf_spec.lua | 1 + test/functional/vimscript/reltime_spec.lua | 1 + test/functional/vimscript/screenchar_spec.lua | 1 + test/functional/vimscript/screenpos_spec.lua | 1 + .../vimscript/screenrowcol_spec.lua | 1 + test/functional/vimscript/setpos_spec.lua | 1 + test/functional/vimscript/sort_spec.lua | 1 + .../vimscript/special_vars_spec.lua | 1 + test/functional/vimscript/state_spec.lua | 1 + test/functional/vimscript/string_spec.lua | 1 + test/functional/vimscript/system_spec.lua | 2 + test/functional/vimscript/timer_spec.lua | 1 + test/functional/vimscript/uniq_spec.lua | 1 + test/functional/vimscript/vvars_spec.lua | 1 + test/functional/vimscript/wait_spec.lua | 1 + test/functional/vimscript/writefile_spec.lua | 1 + test/harness.lua | 61 +++++++++---------- test/testutil.lua | 14 ++++- test/unit/api/private_helpers_spec.lua | 3 +- test/unit/buffer_spec.lua | 3 +- test/unit/charset/vim_str2nr_spec.lua | 3 +- test/unit/eval/decode_spec.lua | 3 +- test/unit/eval/encode_spec.lua | 3 +- test/unit/eval/tricks_spec.lua | 3 +- test/unit/eval/tv_clear_spec.lua | 3 +- test/unit/eval/typval_spec.lua | 4 +- test/unit/fileio_spec.lua | 3 +- test/unit/garray_spec.lua | 3 +- test/unit/indent_spec.lua | 3 +- test/unit/keycodes_spec.lua | 3 +- test/unit/marktree_spec.lua | 3 +- test/unit/mbyte_spec.lua | 3 +- test/unit/memory_spec.lua | 3 +- test/unit/message_spec.lua | 3 +- test/unit/msgpack_spec.lua | 3 +- test/unit/multiqueue_spec.lua | 3 +- test/unit/optionstr_spec.lua | 3 +- test/unit/os/env_spec.lua | 3 +- test/unit/os/fileio_spec.lua | 3 +- test/unit/os/fs_spec.lua | 4 +- test/unit/os/shell_spec.lua | 3 +- test/unit/os/users_spec.lua | 3 +- test/unit/path_spec.lua | 4 +- test/unit/profile_spec.lua | 3 +- test/unit/search_spec.lua | 3 +- test/unit/statusline_spec.lua | 3 +- test/unit/strings_spec.lua | 3 +- test/unit/tempfile_spec.lua | 3 +- test/unit/termkey_spec.lua | 3 +- test/unit/testtest_spec.lua | 3 +- test/unit/tui/terminfo_spec.lua | 3 +- test/unit/undo_spec.lua | 3 +- test/unit/viml/expressions/lexer_spec.lua | 3 +- test/unit/viml/expressions/parser_spec.lua | 3 +- test/unit/vterm_spec.lua | 3 +- 535 files changed, 771 insertions(+), 115 deletions(-) delete mode 100644 test/_meta.lua diff --git a/.luacheckrc b/.luacheckrc index cdefcbbab4a..75139b172ec 100644 --- a/.luacheckrc +++ b/.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', diff --git a/test/_meta.lua b/test/_meta.lua deleted file mode 100644 index e69345a370f..00000000000 --- a/test/_meta.lua +++ /dev/null @@ -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 diff --git a/test/benchmark/autocmd_spec.lua b/test/benchmark/autocmd_spec.lua index af5fa1c2588..4dec7447df9 100644 --- a/test/benchmark/autocmd_spec.lua +++ b/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 diff --git a/test/benchmark/bench_regexp_spec.lua b/test/benchmark/bench_regexp_spec.lua index 2c2b8dc359c..6e042d0f2eb 100644 --- a/test/benchmark/bench_regexp_spec.lua +++ b/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 diff --git a/test/benchmark/decor_spec.lua b/test/benchmark/decor_spec.lua index ddf6a9b3902..d44ed133d1d 100644 --- a/test/benchmark/decor_spec.lua +++ b/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() diff --git a/test/benchmark/deepcopy_spec.lua b/test/benchmark/deepcopy_spec.lua index dc8655f19c9..caef4073165 100644 --- a/test/benchmark/deepcopy_spec.lua +++ b/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, ...) diff --git a/test/benchmark/extmark_spec.lua b/test/benchmark/extmark_spec.lua index 2d774436a79..e6abb4d8ccd 100644 --- a/test/benchmark/extmark_spec.lua +++ b/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 diff --git a/test/benchmark/iter_spec.lua b/test/benchmark/iter_spec.lua index d1760799974..5d908ca8916 100644 --- a/test/benchmark/iter_spec.lua +++ b/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 diff --git a/test/benchmark/keycodes_spec.lua b/test/benchmark/keycodes_spec.lua index 8925dcaec44..d60f8fe2496 100644 --- a/test/benchmark/keycodes_spec.lua +++ b/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 diff --git a/test/benchmark/option_spec.lua b/test/benchmark/option_spec.lua index f24c5458105..d708c46a2c4 100644 --- a/test/benchmark/option_spec.lua +++ b/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 diff --git a/test/benchmark/screenpos_spec.lua b/test/benchmark/screenpos_spec.lua index db8f9188172..65c8e5fabca 100644 --- a/test/benchmark/screenpos_spec.lua +++ b/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) diff --git a/test/benchmark/text_spec.lua b/test/benchmark/text_spec.lua index 895e8c88986..52e97f44125 100644 --- a/test/benchmark/text_spec.lua +++ b/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) diff --git a/test/benchmark/treesitter_spec.lua b/test/benchmark/treesitter_spec.lua index 222a2ae8fbf..2baa301599d 100644 --- a/test/benchmark/treesitter_spec.lua +++ b/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 diff --git a/test/benchmark/trim_spec.lua b/test/benchmark/trim_spec.lua index 3318d1b73b6..1a2def8f091 100644 --- a/test/benchmark/trim_spec.lua +++ b/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), diff --git a/test/functional/api/autocmd_spec.lua b/test/functional/api/autocmd_spec.lua index 8d0172fd862..e908b3d8f7c 100644 --- a/test/functional/api/autocmd_spec.lua +++ b/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 diff --git a/test/functional/api/buffer_spec.lua b/test/functional/api/buffer_spec.lua index ab7e3683cba..d46a704773a 100644 --- a/test/functional/api/buffer_spec.lua +++ b/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 diff --git a/test/functional/api/buffer_updates_spec.lua b/test/functional/api/buffer_updates_spec.lua index 26670c9261a..9046cdbfbc1 100644 --- a/test/functional/api/buffer_updates_spec.lua +++ b/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 diff --git a/test/functional/api/command_spec.lua b/test/functional/api/command_spec.lua index c1eb1f92c37..554bd5b695a 100644 --- a/test/functional/api/command_spec.lua +++ b/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 diff --git a/test/functional/api/deprecated_spec.lua b/test/functional/api/deprecated_spec.lua index 8a941e7af74..c49641f2279 100644 --- a/test/functional/api/deprecated_spec.lua +++ b/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 diff --git a/test/functional/api/extmark_spec.lua b/test/functional/api/extmark_spec.lua index 28e0d8aa9cc..5c1e2da2912 100644 --- a/test/functional/api/extmark_spec.lua +++ b/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 diff --git a/test/functional/api/fast_spec.lua b/test/functional/api/fast_spec.lua index d8f4ed3dfa9..851d345de37 100644 --- a/test/functional/api/fast_spec.lua +++ b/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 diff --git a/test/functional/api/highlight_spec.lua b/test/functional/api/highlight_spec.lua index a82bffcf03d..f57d385bd25 100644 --- a/test/functional/api/highlight_spec.lua +++ b/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 diff --git a/test/functional/api/keymap_spec.lua b/test/functional/api/keymap_spec.lua index fe28739c97e..e1fc4ca0c0b 100644 --- a/test/functional/api/keymap_spec.lua +++ b/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 diff --git a/test/functional/api/menu_spec.lua b/test/functional/api/menu_spec.lua index 7556a5bc3fe..0ef72f4b77a 100644 --- a/test/functional/api/menu_spec.lua +++ b/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 diff --git a/test/functional/api/proc_spec.lua b/test/functional/api/proc_spec.lua index d2dd655b175..4399bf6bbf8 100644 --- a/test/functional/api/proc_spec.lua +++ b/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 diff --git a/test/functional/api/server_notifications_spec.lua b/test/functional/api/server_notifications_spec.lua index 1a13c15b431..a5dfd5ad4db 100644 --- a/test/functional/api/server_notifications_spec.lua +++ b/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 diff --git a/test/functional/api/server_requests_spec.lua b/test/functional/api/server_requests_spec.lua index 8c6c5ba1b4d..22974d62186 100644 --- a/test/functional/api/server_requests_spec.lua +++ b/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 diff --git a/test/functional/api/tabpage_spec.lua b/test/functional/api/tabpage_spec.lua index 9193d96c4b8..cb8feff5157 100644 --- a/test/functional/api/tabpage_spec.lua +++ b/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 diff --git a/test/functional/api/ui_spec.lua b/test/functional/api/ui_spec.lua index 40403aa2e61..6600ae89eaa 100644 --- a/test/functional/api/ui_spec.lua +++ b/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 diff --git a/test/functional/api/version_spec.lua b/test/functional/api/version_spec.lua index 9beb012ec3b..2b5ef149ae6 100644 --- a/test/functional/api/version_spec.lua +++ b/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 diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua index e17335f56a0..fb85d2f7a98 100644 --- a/test/functional/api/vim_spec.lua +++ b/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 diff --git a/test/functional/api/window_spec.lua b/test/functional/api/window_spec.lua index adfb6e2c1cc..8d8113dff3d 100644 --- a/test/functional/api/window_spec.lua +++ b/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, diff --git a/test/functional/autocmd/autocmd_oldtest_spec.lua b/test/functional/autocmd/autocmd_oldtest_spec.lua index dadf5095ce7..9810fe92a0a 100644 --- a/test/functional/autocmd/autocmd_oldtest_spec.lua +++ b/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 diff --git a/test/functional/autocmd/autocmd_spec.lua b/test/functional/autocmd/autocmd_spec.lua index 9fc529992ae..7814687add6 100644 --- a/test/functional/autocmd/autocmd_spec.lua +++ b/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 diff --git a/test/functional/autocmd/bufenter_spec.lua b/test/functional/autocmd/bufenter_spec.lua index 72e650cae45..61430390271 100644 --- a/test/functional/autocmd/bufenter_spec.lua +++ b/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 diff --git a/test/functional/autocmd/cmdline_spec.lua b/test/functional/autocmd/cmdline_spec.lua index a8e185e6b7d..4216f8256c7 100644 --- a/test/functional/autocmd/cmdline_spec.lua +++ b/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 diff --git a/test/functional/autocmd/completedone_spec.lua b/test/functional/autocmd/completedone_spec.lua index 97c156dba40..12575a27db8 100644 --- a/test/functional/autocmd/completedone_spec.lua +++ b/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 diff --git a/test/functional/autocmd/cursorhold_spec.lua b/test/functional/autocmd/cursorhold_spec.lua index 3c030d29114..f5759569195 100644 --- a/test/functional/autocmd/cursorhold_spec.lua +++ b/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 diff --git a/test/functional/autocmd/cursormoved_spec.lua b/test/functional/autocmd/cursormoved_spec.lua index 7cc3a26bfb8..7fa07c46bda 100644 --- a/test/functional/autocmd/cursormoved_spec.lua +++ b/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 diff --git a/test/functional/autocmd/dirchanged_spec.lua b/test/functional/autocmd/dirchanged_spec.lua index bf7d628357e..4c940b293d5 100644 --- a/test/functional/autocmd/dirchanged_spec.lua +++ b/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 diff --git a/test/functional/autocmd/filetype_spec.lua b/test/functional/autocmd/filetype_spec.lua index da2d2050fba..72ce5cb8362 100644 --- a/test/functional/autocmd/filetype_spec.lua +++ b/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 diff --git a/test/functional/autocmd/focus_spec.lua b/test/functional/autocmd/focus_spec.lua index e78cda49ce7..964a411b6a5 100644 --- a/test/functional/autocmd/focus_spec.lua +++ b/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 diff --git a/test/functional/autocmd/markset_spec.lua b/test/functional/autocmd/markset_spec.lua index 392481474b8..51d5783692a 100644 --- a/test/functional/autocmd/markset_spec.lua +++ b/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 diff --git a/test/functional/autocmd/modechanged_spec.lua b/test/functional/autocmd/modechanged_spec.lua index 61ce15d91dc..94d38afc2e2 100644 --- a/test/functional/autocmd/modechanged_spec.lua +++ b/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 diff --git a/test/functional/autocmd/optionset_spec.lua b/test/functional/autocmd/optionset_spec.lua index 3bfc7b89fcd..1004968835b 100644 --- a/test/functional/autocmd/optionset_spec.lua +++ b/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 diff --git a/test/functional/autocmd/recording_spec.lua b/test/functional/autocmd/recording_spec.lua index 6ee61c56763..7f1aa1454ba 100644 --- a/test/functional/autocmd/recording_spec.lua +++ b/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 diff --git a/test/functional/autocmd/safestate_spec.lua b/test/functional/autocmd/safestate_spec.lua index c45a64e373d..0e2e552ea2c 100644 --- a/test/functional/autocmd/safestate_spec.lua +++ b/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 diff --git a/test/functional/autocmd/searchwrapped_spec.lua b/test/functional/autocmd/searchwrapped_spec.lua index 0c0b3595ca6..00bf985a88f 100644 --- a/test/functional/autocmd/searchwrapped_spec.lua +++ b/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 diff --git a/test/functional/autocmd/show_spec.lua b/test/functional/autocmd/show_spec.lua index 395e6d51447..ad848ffcebc 100644 --- a/test/functional/autocmd/show_spec.lua +++ b/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 diff --git a/test/functional/autocmd/signal_spec.lua b/test/functional/autocmd/signal_spec.lua index 33ccba44640..af6529aee52 100644 --- a/test/functional/autocmd/signal_spec.lua +++ b/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 diff --git a/test/functional/autocmd/tabclose_spec.lua b/test/functional/autocmd/tabclose_spec.lua index 38bdcfa4416..3367070d2b0 100644 --- a/test/functional/autocmd/tabclose_spec.lua +++ b/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 diff --git a/test/functional/autocmd/tabmove_spec.lua b/test/functional/autocmd/tabmove_spec.lua index ba01111fb36..948511ac319 100644 --- a/test/functional/autocmd/tabmove_spec.lua +++ b/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 diff --git a/test/functional/autocmd/tabnew_spec.lua b/test/functional/autocmd/tabnew_spec.lua index 80ab5a19449..59c9e3b02fb 100644 --- a/test/functional/autocmd/tabnew_spec.lua +++ b/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 diff --git a/test/functional/autocmd/tabnewentered_spec.lua b/test/functional/autocmd/tabnewentered_spec.lua index 5ed585a32d3..ad1d91d4874 100644 --- a/test/functional/autocmd/tabnewentered_spec.lua +++ b/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 diff --git a/test/functional/autocmd/termxx_spec.lua b/test/functional/autocmd/termxx_spec.lua index d1393e3a333..58bcd49d257 100644 --- a/test/functional/autocmd/termxx_spec.lua +++ b/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 diff --git a/test/functional/autocmd/textchanged_spec.lua b/test/functional/autocmd/textchanged_spec.lua index 7c679cd4c02..8be09e2f0f7 100644 --- a/test/functional/autocmd/textchanged_spec.lua +++ b/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 diff --git a/test/functional/autocmd/textyankpost_spec.lua b/test/functional/autocmd/textyankpost_spec.lua index cf8cbe25c11..14f80ded5ca 100644 --- a/test/functional/autocmd/textyankpost_spec.lua +++ b/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 diff --git a/test/functional/autocmd/win_scrolled_resized_spec.lua b/test/functional/autocmd/win_scrolled_resized_spec.lua index 295f3a8865a..51e79c5c6c9 100644 --- a/test/functional/autocmd/win_scrolled_resized_spec.lua +++ b/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 diff --git a/test/functional/core/channels_spec.lua b/test/functional/core/channels_spec.lua index 896e8146f8e..4d48d5cffbe 100644 --- a/test/functional/core/channels_spec.lua +++ b/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 diff --git a/test/functional/core/env_spec.lua b/test/functional/core/env_spec.lua index 6aa0e6fb6ac..b41a7f6cac5 100644 --- a/test/functional/core/env_spec.lua +++ b/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 diff --git a/test/functional/core/exit_spec.lua b/test/functional/core/exit_spec.lua index 852d9fd1a21..ffbc946bae3 100644 --- a/test/functional/core/exit_spec.lua +++ b/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 diff --git a/test/functional/core/fileio_spec.lua b/test/functional/core/fileio_spec.lua index cd23e00b036..6b9ac4b21b4 100644 --- a/test/functional/core/fileio_spec.lua +++ b/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 diff --git a/test/functional/core/job_spec.lua b/test/functional/core/job_spec.lua index 8550a03006a..d12df338bc5 100644 --- a/test/functional/core/job_spec.lua +++ b/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 diff --git a/test/functional/core/keycode_spec.lua b/test/functional/core/keycode_spec.lua index 35516ed9ab2..d77d299de3c 100644 --- a/test/functional/core/keycode_spec.lua +++ b/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 diff --git a/test/functional/core/log_spec.lua b/test/functional/core/log_spec.lua index e74b32c9266..f155ed5ac0e 100644 --- a/test/functional/core/log_spec.lua +++ b/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 diff --git a/test/functional/core/main_spec.lua b/test/functional/core/main_spec.lua index d185156d7d2..40ea60db230 100644 --- a/test/functional/core/main_spec.lua +++ b/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 diff --git a/test/functional/core/path_spec.lua b/test/functional/core/path_spec.lua index 68fb1dfecbd..2760346c801 100644 --- a/test/functional/core/path_spec.lua +++ b/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 diff --git a/test/functional/core/remote_spec.lua b/test/functional/core/remote_spec.lua index 1cfa0535f6e..6e743a8846f 100644 --- a/test/functional/core/remote_spec.lua +++ b/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 diff --git a/test/functional/core/server_spec.lua b/test/functional/core/server_spec.lua index dd136cdaaa5..9396b539296 100644 --- a/test/functional/core/server_spec.lua +++ b/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 diff --git a/test/functional/core/spellfile_spec.lua b/test/functional/core/spellfile_spec.lua index 42e83c2969a..ade32981204 100644 --- a/test/functional/core/spellfile_spec.lua +++ b/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 diff --git a/test/functional/core/startup_spec.lua b/test/functional/core/startup_spec.lua index 982a7859b7b..cd8ea7027f3 100644 --- a/test/functional/core/startup_spec.lua +++ b/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 diff --git a/test/functional/editor/K_spec.lua b/test/functional/editor/K_spec.lua index 837329cc900..2b866069873 100644 --- a/test/functional/editor/K_spec.lua +++ b/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() diff --git a/test/functional/editor/cmdwin_spec.lua b/test/functional/editor/cmdwin_spec.lua index 0deb4040c9a..e883391e839 100644 --- a/test/functional/editor/cmdwin_spec.lua +++ b/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 diff --git a/test/functional/editor/completion_spec.lua b/test/functional/editor/completion_spec.lua index 26fa2ea34c5..d863c5a4810 100644 --- a/test/functional/editor/completion_spec.lua +++ b/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') diff --git a/test/functional/editor/count_spec.lua b/test/functional/editor/count_spec.lua index d158497cb8f..9746e6548c3 100644 --- a/test/functional/editor/count_spec.lua +++ b/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 diff --git a/test/functional/editor/ctrl_c_spec.lua b/test/functional/editor/ctrl_c_spec.lua index cb6bc576815..9758e07df88 100644 --- a/test/functional/editor/ctrl_c_spec.lua +++ b/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 diff --git a/test/functional/editor/defaults_spec.lua b/test/functional/editor/defaults_spec.lua index 2a33a4fdaa2..4b29c7f8b67 100644 --- a/test/functional/editor/defaults_spec.lua +++ b/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() diff --git a/test/functional/editor/fold_spec.lua b/test/functional/editor/fold_spec.lua index 2198a974f67..61a0e7375f4 100644 --- a/test/functional/editor/fold_spec.lua +++ b/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 diff --git a/test/functional/editor/ftplugin_spec.lua b/test/functional/editor/ftplugin_spec.lua index 78ceb303904..672a476c791 100644 --- a/test/functional/editor/ftplugin_spec.lua +++ b/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 diff --git a/test/functional/editor/jump_spec.lua b/test/functional/editor/jump_spec.lua index 406786594e5..fac8f294ff3 100644 --- a/test/functional/editor/jump_spec.lua +++ b/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 diff --git a/test/functional/editor/lang_spec.lua b/test/functional/editor/lang_spec.lua index 940915823cd..741f5deca0a 100644 --- a/test/functional/editor/lang_spec.lua +++ b/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 diff --git a/test/functional/editor/langmap_spec.lua b/test/functional/editor/langmap_spec.lua index 42544d42b00..e7f54eeefa9 100644 --- a/test/functional/editor/langmap_spec.lua +++ b/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 diff --git a/test/functional/editor/macro_spec.lua b/test/functional/editor/macro_spec.lua index b6bba619154..b7c43e0469c 100644 --- a/test/functional/editor/macro_spec.lua +++ b/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 diff --git a/test/functional/editor/mark_spec.lua b/test/functional/editor/mark_spec.lua index 495c603a3fd..3a94c0d5c18 100644 --- a/test/functional/editor/mark_spec.lua +++ b/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 diff --git a/test/functional/editor/meta_key_spec.lua b/test/functional/editor/meta_key_spec.lua index 30027e2fd64..a3e7d2e7cc7 100644 --- a/test/functional/editor/meta_key_spec.lua +++ b/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 diff --git a/test/functional/editor/mode_cmdline_spec.lua b/test/functional/editor/mode_cmdline_spec.lua index 52f2bf7f8c9..e879b8bce31 100644 --- a/test/functional/editor/mode_cmdline_spec.lua +++ b/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 diff --git a/test/functional/editor/mode_insert_spec.lua b/test/functional/editor/mode_insert_spec.lua index 5e3afa9da27..c0897e17b2e 100644 --- a/test/functional/editor/mode_insert_spec.lua +++ b/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 diff --git a/test/functional/editor/mode_normal_spec.lua b/test/functional/editor/mode_normal_spec.lua index c3ffa2cfed4..8d42c25e36e 100644 --- a/test/functional/editor/mode_normal_spec.lua +++ b/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 diff --git a/test/functional/editor/put_spec.lua b/test/functional/editor/put_spec.lua index b44c0cd3b90..44c3a4f243a 100644 --- a/test/functional/editor/put_spec.lua +++ b/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 diff --git a/test/functional/editor/runtime_spec.lua b/test/functional/editor/runtime_spec.lua index a3a34df5445..3915b4451cf 100644 --- a/test/functional/editor/runtime_spec.lua +++ b/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 diff --git a/test/functional/editor/search_spec.lua b/test/functional/editor/search_spec.lua index 770a4f387dd..b50d8dd9175 100644 --- a/test/functional/editor/search_spec.lua +++ b/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 diff --git a/test/functional/editor/tabpage_spec.lua b/test/functional/editor/tabpage_spec.lua index da8597adfbc..0eff990c255 100644 --- a/test/functional/editor/tabpage_spec.lua +++ b/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 diff --git a/test/functional/editor/textobject_spec.lua b/test/functional/editor/textobject_spec.lua index c6c30a80a89..6ee31ce73a6 100644 --- a/test/functional/editor/textobject_spec.lua +++ b/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 diff --git a/test/functional/editor/undo_spec.lua b/test/functional/editor/undo_spec.lua index f079f92146e..533d64d9374 100644 --- a/test/functional/editor/undo_spec.lua +++ b/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 diff --git a/test/functional/editor/xxd_spec.lua b/test/functional/editor/xxd_spec.lua index 8e67dd98705..59521c9a94d 100644 --- a/test/functional/editor/xxd_spec.lua +++ b/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 diff --git a/test/functional/ex_cmds/append_spec.lua b/test/functional/ex_cmds/append_spec.lua index c0412a8167a..8c03dc6757f 100644 --- a/test/functional/ex_cmds/append_spec.lua +++ b/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 diff --git a/test/functional/ex_cmds/arg_spec.lua b/test/functional/ex_cmds/arg_spec.lua index 9b89823dcc4..6cece89e401 100644 --- a/test/functional/ex_cmds/arg_spec.lua +++ b/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 diff --git a/test/functional/ex_cmds/cd_spec.lua b/test/functional/ex_cmds/cd_spec.lua index a9156b5beb0..b6d5b195e7f 100644 --- a/test/functional/ex_cmds/cd_spec.lua +++ b/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 diff --git a/test/functional/ex_cmds/cmd_map_spec.lua b/test/functional/ex_cmds/cmd_map_spec.lua index 871b1cb424a..e38a2d9b8d5 100644 --- a/test/functional/ex_cmds/cmd_map_spec.lua +++ b/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 diff --git a/test/functional/ex_cmds/debug_spec.lua b/test/functional/ex_cmds/debug_spec.lua index d657f9aa6dc..5a9d4dd78b1 100644 --- a/test/functional/ex_cmds/debug_spec.lua +++ b/test/functional/ex_cmds/debug_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 feed = n.feed local clear = n.clear diff --git a/test/functional/ex_cmds/dict_notifications_spec.lua b/test/functional/ex_cmds/dict_notifications_spec.lua index ca80d9b4456..999909d645c 100644 --- a/test/functional/ex_cmds/dict_notifications_spec.lua +++ b/test/functional/ex_cmds/dict_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 assert_alive = n.assert_alive local clear, source = n.clear, n.source local api = n.api diff --git a/test/functional/ex_cmds/digraphs_spec.lua b/test/functional/ex_cmds/digraphs_spec.lua index b34c6e4bbb3..f21579b45b0 100644 --- a/test/functional/ex_cmds/digraphs_spec.lua +++ b/test/functional/ex_cmds/digraphs_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 diff --git a/test/functional/ex_cmds/drop_spec.lua b/test/functional/ex_cmds/drop_spec.lua index cd1ca978aaf..1dedf6f39b6 100644 --- a/test/functional/ex_cmds/drop_spec.lua +++ b/test/functional/ex_cmds/drop_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 command = n.command local clear, feed, feed_command = n.clear, n.feed, n.feed_command local exec = n.exec diff --git a/test/functional/ex_cmds/echo_spec.lua b/test/functional/ex_cmds/echo_spec.lua index 54924b18d63..bfe528eb5dc 100644 --- a/test/functional/ex_cmds/echo_spec.lua +++ b/test/functional/ex_cmds/echo_spec.lua @@ -1,6 +1,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() +local describe, it, setup = t.describe, t.it, t.setup local eq = t.eq local pcall_err = t.pcall_err local NIL = vim.NIL diff --git a/test/functional/ex_cmds/edit_spec.lua b/test/functional/ex_cmds/edit_spec.lua index bdf534188bf..efdc29c8508 100644 --- a/test/functional/ex_cmds/edit_spec.lua +++ b/test/functional/ex_cmds/edit_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 eq, command, fn = t.eq, n.command, n.fn local ok = t.ok local matches = t.matches diff --git a/test/functional/ex_cmds/encoding_spec.lua b/test/functional/ex_cmds/encoding_spec.lua index 4939f844c85..002d1d136ee 100644 --- a/test/functional/ex_cmds/encoding_spec.lua +++ b/test/functional/ex_cmds/encoding_spec.lua @@ -1,4 +1,5 @@ local t = require('test.testutil') +local describe, it, before_each = t.describe, t.it, t.before_each local pcall_err = t.pcall_err local n = require('test.functional.testnvim')() diff --git a/test/functional/ex_cmds/excmd_spec.lua b/test/functional/ex_cmds/excmd_spec.lua index cf5f781d1c8..eb6ee0be8b9 100644 --- a/test/functional/ex_cmds/excmd_spec.lua +++ b/test/functional/ex_cmds/excmd_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 command = n.command local eq = t.eq local clear = n.clear diff --git a/test/functional/ex_cmds/file_spec.lua b/test/functional/ex_cmds/file_spec.lua index 0c51f1c17b3..2646c5f19e4 100644 --- a/test/functional/ex_cmds/file_spec.lua +++ b/test/functional/ex_cmds/file_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 diff --git a/test/functional/ex_cmds/grep_spec.lua b/test/functional/ex_cmds/grep_spec.lua index 88fab7101e3..3d75d69dd23 100644 --- a/test/functional/ex_cmds/grep_spec.lua +++ b/test/functional/ex_cmds/grep_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, ok, eval = n.clear, t.ok, n.eval describe(':grep', function() diff --git a/test/functional/ex_cmds/help_spec.lua b/test/functional/ex_cmds/help_spec.lua index 7edb0556c59..9263e23e3a2 100644 --- a/test/functional/ex_cmds/help_spec.lua +++ b/test/functional/ex_cmds/help_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 diff --git a/test/functional/ex_cmds/highlight_spec.lua b/test/functional/ex_cmds/highlight_spec.lua index 8a0c54c5e06..e481ffec141 100644 --- a/test/functional/ex_cmds/highlight_spec.lua +++ b/test/functional/ex_cmds/highlight_spec.lua @@ -1,4 +1,5 @@ local t = require('test.testutil') +local describe, it, before_each = t.describe, t.it, t.before_each local pcall_err = t.pcall_err local n = require('test.functional.testnvim')() local Screen = require('test.functional.ui.screen') diff --git a/test/functional/ex_cmds/log_spec.lua b/test/functional/ex_cmds/log_spec.lua index fbf5e3e03f3..9483d9cf13b 100644 --- a/test/functional/ex_cmds/log_spec.lua +++ b/test/functional/ex_cmds/log_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 eq = t.eq local exec_lua = n.exec_lua diff --git a/test/functional/ex_cmds/ls_spec.lua b/test/functional/ex_cmds/ls_spec.lua index 591f20b76a5..1c21e4d42b4 100644 --- a/test/functional/ex_cmds/ls_spec.lua +++ b/test/functional/ex_cmds/ls_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 diff --git a/test/functional/ex_cmds/lsp_spec.lua b/test/functional/ex_cmds/lsp_spec.lua index 3922c55b141..0c1e797d350 100644 --- a/test/functional/ex_cmds/lsp_spec.lua +++ b/test/functional/ex_cmds/lsp_spec.lua @@ -2,6 +2,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() local t_lsp = require('test.functional.plugin.lsp.testutil') +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 diff --git a/test/functional/ex_cmds/make_spec.lua b/test/functional/ex_cmds/make_spec.lua index 106eefe290b..2726b05a607 100644 --- a/test/functional/ex_cmds/make_spec.lua +++ b/test/functional/ex_cmds/make_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 eval = n.eval local has_powershell = n.has_powershell diff --git a/test/functional/ex_cmds/map_spec.lua b/test/functional/ex_cmds/map_spec.lua index e827b9534b3..0c74ea4da62 100644 --- a/test/functional/ex_cmds/map_spec.lua +++ b/test/functional/ex_cmds/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 = t.describe, t.it, t.before_each local eq = t.eq local exec = n.exec local exec_capture = n.exec_capture diff --git a/test/functional/ex_cmds/marks_spec.lua b/test/functional/ex_cmds/marks_spec.lua index b620c2f0386..5d310b4dbf7 100644 --- a/test/functional/ex_cmds/marks_spec.lua +++ b/test/functional/ex_cmds/marks_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 command = n.command local eq = t.eq local exec_capture = n.exec_capture diff --git a/test/functional/ex_cmds/menu_spec.lua b/test/functional/ex_cmds/menu_spec.lua index 5276fc2d2d8..9fa86817018 100644 --- a/test/functional/ex_cmds/menu_spec.lua +++ b/test/functional/ex_cmds/menu_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, command = n.clear, n.command local expect, feed = n.expect, n.feed local eq, eval = t.eq, n.eval diff --git a/test/functional/ex_cmds/mksession_spec.lua b/test/functional/ex_cmds/mksession_spec.lua index 37a88a8a113..40d6564eba7 100644 --- a/test/functional/ex_cmds/mksession_spec.lua +++ b/test/functional/ex_cmds/mksession_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 clear = n.clear local command = n.command local get_pathsep = n.get_pathsep diff --git a/test/functional/ex_cmds/mkview_spec.lua b/test/functional/ex_cmds/mkview_spec.lua index 7cc0b1da83f..394a1aac392 100644 --- a/test/functional/ex_cmds/mkview_spec.lua +++ b/test/functional/ex_cmds/mkview_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 get_pathsep = n.get_pathsep diff --git a/test/functional/ex_cmds/normal_spec.lua b/test/functional/ex_cmds/normal_spec.lua index ccc649120fa..d2d72b3a911 100644 --- a/test/functional/ex_cmds/normal_spec.lua +++ b/test/functional/ex_cmds/normal_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 fn = n.fn diff --git a/test/functional/ex_cmds/oldfiles_spec.lua b/test/functional/ex_cmds/oldfiles_spec.lua index 63ed19fc77f..36e7ddd613a 100644 --- a/test/functional/ex_cmds/oldfiles_spec.lua +++ b/test/functional/ex_cmds/oldfiles_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 expect_exit = n.expect_exit diff --git a/test/functional/ex_cmds/pack_spec.lua b/test/functional/ex_cmds/pack_spec.lua index 950fc403656..88253b60fb5 100644 --- a/test/functional/ex_cmds/pack_spec.lua +++ b/test/functional/ex_cmds/pack_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 diff --git a/test/functional/ex_cmds/print_commands_spec.lua b/test/functional/ex_cmds/print_commands_spec.lua index 2ce7eb48ea9..548d902cc34 100644 --- a/test/functional/ex_cmds/print_commands_spec.lua +++ b/test/functional/ex_cmds/print_commands_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, command, fn = n.clear, t.eq, n.command, n.fn local assert_alive = n.assert_alive diff --git a/test/functional/ex_cmds/profile_spec.lua b/test/functional/ex_cmds/profile_spec.lua index 365583948be..3609a600ff3 100644 --- a/test/functional/ex_cmds/profile_spec.lua +++ b/test/functional/ex_cmds/profile_spec.lua @@ -1,5 +1,6 @@ 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 uv = vim.uv require('os') diff --git a/test/functional/ex_cmds/quickfix_commands_spec.lua b/test/functional/ex_cmds/quickfix_commands_spec.lua index 0fd66bff92f..dc1054db07c 100644 --- a/test/functional/ex_cmds/quickfix_commands_spec.lua +++ b/test/functional/ex_cmds/quickfix_commands_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 feed = n.feed local eq = t.eq local pcall_err = t.pcall_err diff --git a/test/functional/ex_cmds/quit_spec.lua b/test/functional/ex_cmds/quit_spec.lua index 83b1c5a5407..74d7894e17f 100644 --- a/test/functional/ex_cmds/quit_spec.lua +++ b/test/functional/ex_cmds/quit_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 describe(':qa', function() diff --git a/test/functional/ex_cmds/script_spec.lua b/test/functional/ex_cmds/script_spec.lua index 92628caae1e..319803756a3 100644 --- a/test/functional/ex_cmds/script_spec.lua +++ b/test/functional/ex_cmds/script_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 neq = t.neq diff --git a/test/functional/ex_cmds/sign_spec.lua b/test/functional/ex_cmds/sign_spec.lua index f55976276b8..7cb7ca59516 100644 --- a/test/functional/ex_cmds/sign_spec.lua +++ b/test/functional/ex_cmds/sign_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, assert_alive = n.clear, t.eq, n.assert_alive local command = n.command local api = n.api diff --git a/test/functional/ex_cmds/source_spec.lua b/test/functional/ex_cmds/source_spec.lua index 79cbd6bdd8f..729a2b40769 100644 --- a/test/functional/ex_cmds/source_spec.lua +++ b/test/functional/ex_cmds/source_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 command = n.command local insert = n.insert local eq = t.eq diff --git a/test/functional/ex_cmds/swapfile_preserve_recover_spec.lua b/test/functional/ex_cmds/swapfile_preserve_recover_spec.lua index 4a235dd3f34..383fe672ef7 100644 --- a/test/functional/ex_cmds/swapfile_preserve_recover_spec.lua +++ b/test/functional/ex_cmds/swapfile_preserve_recover_spec.lua @@ -3,6 +3,8 @@ local n = require('test.functional.testnvim')() local tt = require('test.functional.testterm') 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, eval, expect, exec = t.eq, n.eval, n.expect, n.exec local assert_alive = n.assert_alive diff --git a/test/functional/ex_cmds/syntax_spec.lua b/test/functional/ex_cmds/syntax_spec.lua index f6d93f9670b..1d2fae7123c 100644 --- a/test/functional/ex_cmds/syntax_spec.lua +++ b/test/functional/ex_cmds/syntax_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 pcall_err = t.pcall_err local clear = n.clear diff --git a/test/functional/ex_cmds/trust_spec.lua b/test/functional/ex_cmds/trust_spec.lua index efb82d6cb0b..9262f24ee31 100644 --- a/test/functional/ex_cmds/trust_spec.lua +++ b/test/functional/ex_cmds/trust_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 clear = n.clear local command = n.command diff --git a/test/functional/ex_cmds/undojoin_spec.lua b/test/functional/ex_cmds/undojoin_spec.lua index 631961ac4ba..50a7ab6faca 100644 --- a/test/functional/ex_cmds/undojoin_spec.lua +++ b/test/functional/ex_cmds/undojoin_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 insert = n.insert local feed = n.feed diff --git a/test/functional/ex_cmds/uptime_spec.lua b/test/functional/ex_cmds/uptime_spec.lua index 638ca16639c..39352a82f3d 100644 --- a/test/functional/ex_cmds/uptime_spec.lua +++ b/test/functional/ex_cmds/uptime_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_capture = n.exec_capture local exec_lua = n.exec_lua diff --git a/test/functional/ex_cmds/verbose_spec.lua b/test/functional/ex_cmds/verbose_spec.lua index cc3af84c876..4e55e657d3a 100644 --- a/test/functional/ex_cmds/verbose_spec.lua +++ b/test/functional/ex_cmds/verbose_spec.lua @@ -1,6 +1,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() +local describe, it, setup, teardown, pending = t.describe, t.it, t.setup, t.teardown, t.pending local clear = n.clear local eq = t.eq local exec = n.exec diff --git a/test/functional/ex_cmds/wincmd_spec.lua b/test/functional/ex_cmds/wincmd_spec.lua index 283f0991cba..a9aff0b4397 100644 --- a/test/functional/ex_cmds/wincmd_spec.lua +++ b/test/functional/ex_cmds/wincmd_spec.lua @@ -1,6 +1,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() +local it = t.it local clear = n.clear local eq = t.eq local fn = n.fn diff --git a/test/functional/ex_cmds/write_spec.lua b/test/functional/ex_cmds/write_spec.lua index 003a191f68b..e8b60e4978a 100644 --- a/test/functional/ex_cmds/write_spec.lua +++ b/test/functional/ex_cmds/write_spec.lua @@ -1,6 +1,8 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() +local describe, it, before_each, after_each, pending = + t.describe, t.it, t.before_each, t.after_each, t.pending local eq, eval, clear, write_file, source, insert = t.eq, n.eval, n.clear, t.write_file, n.source, n.insert local pcall_err = t.pcall_err diff --git a/test/functional/ex_cmds/wundo_spec.lua b/test/functional/ex_cmds/wundo_spec.lua index 9b81c6d06d3..06ab74163d0 100644 --- a/test/functional/ex_cmds/wundo_spec.lua +++ b/test/functional/ex_cmds/wundo_spec.lua @@ -1,7 +1,9 @@ -- Specs for :wundo and underlying functions 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 command = n.command local clear = n.clear local eval = n.eval diff --git a/test/functional/ex_cmds/wviminfo_spec.lua b/test/functional/ex_cmds/wviminfo_spec.lua index 7c76d922289..42b9c2a8166 100644 --- a/test/functional/ex_cmds/wviminfo_spec.lua +++ b/test/functional/ex_cmds/wviminfo_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, eq, neq, write_file = n.command, t.eq, t.neq, t.write_file local read_file = t.read_file diff --git a/test/functional/example_spec.lua b/test/functional/example_spec.lua index 4b22be23e34..d475fde1107 100644 --- a/test/functional/example_spec.lua +++ b/test/functional/example_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 command = n.command local eq = t.eq diff --git a/test/functional/harness/assert_spec.lua b/test/functional/harness/assert_spec.lua index df15a8a05d0..2e57f3912c9 100644 --- a/test/functional/harness/assert_spec.lua +++ b/test/functional/harness/assert_spec.lua @@ -1,5 +1,7 @@ local assert = require('test.assert') +local t = require('test.testutil') +local describe, it = t.describe, t.it describe('test.assert', function() it('ignores aliasing differences', function() local shared = {} diff --git a/test/functional/harness/harness_spec.lua b/test/functional/harness/harness_spec.lua index d9117b5a9a3..51e5b9ba26e 100644 --- a/test/functional/harness/harness_spec.lua +++ b/test/functional/harness/harness_spec.lua @@ -1,6 +1,8 @@ -- Black-box tests for the local Lua harness itself. These spawn a separate -- Nvim process instead of driving an embedded instance via testnvim. local t = require('test.testutil') +local describe, it, before_each, after_each, setup, teardown, pending, finally = + t.describe, t.it, t.before_each, t.after_each, t.setup, t.teardown, t.pending, t.finally local uv = vim.uv local eq = t.eq diff --git a/test/functional/legacy/002_filename_recognition_spec.lua b/test/functional/legacy/002_filename_recognition_spec.lua index dd1335df94c..d7bc6a67edb 100644 --- a/test/functional/legacy/002_filename_recognition_spec.lua +++ b/test/functional/legacy/002_filename_recognition_spec.lua @@ -2,7 +2,9 @@ -- we'll use `expand("")` since "gf" would need to open the file. local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local clear, feed, insert = n.clear, n.feed, n.insert local feed_command, expect = n.feed_command, n.expect diff --git a/test/functional/legacy/004_bufenter_with_modelines_spec.lua b/test/functional/legacy/004_bufenter_with_modelines_spec.lua index 6865153452b..8dcc1f4fe8d 100644 --- a/test/functional/legacy/004_bufenter_with_modelines_spec.lua +++ b/test/functional/legacy/004_bufenter_with_modelines_spec.lua @@ -2,7 +2,9 @@ -- Check if modelines are interpreted for the correct buffer. 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 clear, feed, insert = n.clear, n.feed, n.insert local feed_command, expect = n.feed_command, n.expect diff --git a/test/functional/legacy/005_bufleave_delete_buffer_spec.lua b/test/functional/legacy/005_bufleave_delete_buffer_spec.lua index 4d2d06f942d..807eafa43d5 100644 --- a/test/functional/legacy/005_bufleave_delete_buffer_spec.lua +++ b/test/functional/legacy/005_bufleave_delete_buffer_spec.lua @@ -2,7 +2,9 @@ -- Also test deleting the last buffer, should give a new, empty buffer. 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 clear, feed, insert = n.clear, n.feed, n.insert local command, expect = n.command, n.expect local poke_eventloop = n.poke_eventloop diff --git a/test/functional/legacy/007_ball_buffer_list_spec.lua b/test/functional/legacy/007_ball_buffer_list_spec.lua index 15f3b0b9b89..10c4ffe3609 100644 --- a/test/functional/legacy/007_ball_buffer_list_spec.lua +++ b/test/functional/legacy/007_ball_buffer_list_spec.lua @@ -1,7 +1,9 @@ -- Test for autocommand that changes the buffer list, when doing ":ball". 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 clear, feed, insert = n.clear, n.feed, n.insert local feed_command, expect = n.feed_command, n.expect diff --git a/test/functional/legacy/008_autocommands_spec.lua b/test/functional/legacy/008_autocommands_spec.lua index a25862918a1..872d0a95354 100644 --- a/test/functional/legacy/008_autocommands_spec.lua +++ b/test/functional/legacy/008_autocommands_spec.lua @@ -4,6 +4,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 source = n.source local clear, command, expect, eq, eval = n.clear, n.command, n.expect, t.eq, n.eval local write_file, dedent = t.write_file, t.dedent diff --git a/test/functional/legacy/011_autocommands_spec.lua b/test/functional/legacy/011_autocommands_spec.lua index b47143e791a..ddca82174ec 100644 --- a/test/functional/legacy/011_autocommands_spec.lua +++ b/test/functional/legacy/011_autocommands_spec.lua @@ -15,6 +15,8 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() +local describe, it, before_each, setup, teardown, pending = + t.describe, t.it, t.before_each, t.setup, t.teardown, t.pending local clear, feed_command, expect, eq, neq, dedent, write_file, feed = n.clear, n.feed_command, n.expect, t.eq, t.neq, t.dedent, t.write_file, n.feed local command = n.command diff --git a/test/functional/legacy/012_directory_spec.lua b/test/functional/legacy/012_directory_spec.lua index d6f2203aa20..114b806a6e1 100644 --- a/test/functional/legacy/012_directory_spec.lua +++ b/test/functional/legacy/012_directory_spec.lua @@ -6,6 +6,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() +local describe, it, setup, teardown = t.describe, t.it, t.setup, t.teardown local eq = t.eq local neq = t.neq local poke_eventloop = n.poke_eventloop diff --git a/test/functional/legacy/015_alignment_spec.lua b/test/functional/legacy/015_alignment_spec.lua index ac90f3f98b1..182b041b0e8 100644 --- a/test/functional/legacy/015_alignment_spec.lua +++ b/test/functional/legacy/015_alignment_spec.lua @@ -3,7 +3,9 @@ -- Also test undo after ":%s" and formatting. local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local feed, insert = n.feed, n.insert local clear, feed_command, expect = n.clear, n.feed_command, n.expect diff --git a/test/functional/legacy/018_unset_smart_indenting_spec.lua b/test/functional/legacy/018_unset_smart_indenting_spec.lua index 851b3264d3e..49d4d0cba80 100644 --- a/test/functional/legacy/018_unset_smart_indenting_spec.lua +++ b/test/functional/legacy/018_unset_smart_indenting_spec.lua @@ -1,7 +1,9 @@ -- Tests for not doing smart indenting when it isn't set. local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, before_each = t.describe, t.it, t.before_each local feed = n.feed local clear = n.clear local insert = n.insert diff --git a/test/functional/legacy/019_smarttab_expandtab_spec.lua b/test/functional/legacy/019_smarttab_expandtab_spec.lua index 3bdc76c2209..e03a4e609c1 100644 --- a/test/functional/legacy/019_smarttab_expandtab_spec.lua +++ b/test/functional/legacy/019_smarttab_expandtab_spec.lua @@ -2,7 +2,9 @@ -- Also test that dv_ works correctly local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local feed, insert = n.feed, n.insert local clear, feed_command, expect = n.clear, n.feed_command, n.expect diff --git a/test/functional/legacy/020_blockwise_visual_spec.lua b/test/functional/legacy/020_blockwise_visual_spec.lua index f8df3dbf7e3..defae7e1d06 100644 --- a/test/functional/legacy/020_blockwise_visual_spec.lua +++ b/test/functional/legacy/020_blockwise_visual_spec.lua @@ -3,7 +3,9 @@ -- Also test this in an empty buffer. local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local clear, feed, insert = n.clear, n.feed, n.insert local feed_command, expect = n.feed_command, n.expect diff --git a/test/functional/legacy/021_control_wi_spec.lua b/test/functional/legacy/021_control_wi_spec.lua index 64dbc472017..31abe929348 100644 --- a/test/functional/legacy/021_control_wi_spec.lua +++ b/test/functional/legacy/021_control_wi_spec.lua @@ -1,7 +1,9 @@ -- Tests for [ CTRL-I with a count and CTRL-W CTRL-I with a count local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local clear, feed, insert = n.clear, n.feed, n.insert local feed_command, expect = n.feed_command, n.expect diff --git a/test/functional/legacy/023_edit_arguments_spec.lua b/test/functional/legacy/023_edit_arguments_spec.lua index 97dc5b01538..4c25d9cb0a1 100644 --- a/test/functional/legacy/023_edit_arguments_spec.lua +++ b/test/functional/legacy/023_edit_arguments_spec.lua @@ -1,7 +1,9 @@ -- Tests for complicated + argument to :edit command 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 clear, insert = n.clear, n.insert local command, expect = n.command, n.expect local poke_eventloop = n.poke_eventloop diff --git a/test/functional/legacy/025_jump_tag_hidden_spec.lua b/test/functional/legacy/025_jump_tag_hidden_spec.lua index b7090662e6d..df30a8670ad 100644 --- a/test/functional/legacy/025_jump_tag_hidden_spec.lua +++ b/test/functional/legacy/025_jump_tag_hidden_spec.lua @@ -4,6 +4,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() +local describe, it, setup = t.describe, t.it, t.setup local clear, feed, insert = n.clear, n.feed, n.insert local feed_command, expect = n.feed_command, n.expect diff --git a/test/functional/legacy/026_execute_while_if_spec.lua b/test/functional/legacy/026_execute_while_if_spec.lua index 143985c7266..649d1a6fa98 100644 --- a/test/functional/legacy/026_execute_while_if_spec.lua +++ b/test/functional/legacy/026_execute_while_if_spec.lua @@ -1,7 +1,9 @@ -- Test for :execute, :while and :if local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local clear = n.clear local expect = n.expect local source = n.source diff --git a/test/functional/legacy/028_source_ctrl_v_spec.lua b/test/functional/legacy/028_source_ctrl_v_spec.lua index 79c452a8176..8c3be1c1be3 100644 --- a/test/functional/legacy/028_source_ctrl_v_spec.lua +++ b/test/functional/legacy/028_source_ctrl_v_spec.lua @@ -1,7 +1,9 @@ -- Test for sourcing a file with CTRL-V's at the end of the line local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, before_each, teardown = t.describe, t.it, t.before_each, t.teardown local clear, feed, insert = n.clear, n.feed, n.insert local feed_command, expect = n.feed_command, n.expect diff --git a/test/functional/legacy/029_fuzzy_spec.lua b/test/functional/legacy/029_fuzzy_spec.lua index 6ee2ff4dfa2..fa67b85b08f 100644 --- a/test/functional/legacy/029_fuzzy_spec.lua +++ b/test/functional/legacy/029_fuzzy_spec.lua @@ -1,7 +1,9 @@ -- Test for buffer name completion when 'wildoptions' contains "fuzzy" -- (Confirm that Vim does not crash) 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 insert = n.insert local expect = n.expect diff --git a/test/functional/legacy/030_fileformats_spec.lua b/test/functional/legacy/030_fileformats_spec.lua index 1a44ed6cb64..d72be4d8b10 100644 --- a/test/functional/legacy/030_fileformats_spec.lua +++ b/test/functional/legacy/030_fileformats_spec.lua @@ -3,6 +3,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() +local describe, it, setup, teardown = t.describe, t.it, t.setup, t.teardown local feed, clear, command = n.feed, n.clear, n.command local eq, write_file = t.eq, t.write_file local poke_eventloop = n.poke_eventloop diff --git a/test/functional/legacy/031_close_commands_spec.lua b/test/functional/legacy/031_close_commands_spec.lua index 974df0c21dd..0c32a23593f 100644 --- a/test/functional/legacy/031_close_commands_spec.lua +++ b/test/functional/legacy/031_close_commands_spec.lua @@ -10,7 +10,9 @@ -- :edit 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 feed = n.feed local clear = n.clear local source = n.source diff --git a/test/functional/legacy/033_lisp_indent_spec.lua b/test/functional/legacy/033_lisp_indent_spec.lua index e3d06be6bf3..30697315daa 100644 --- a/test/functional/legacy/033_lisp_indent_spec.lua +++ b/test/functional/legacy/033_lisp_indent_spec.lua @@ -2,7 +2,9 @@ -- If the lisp feature is not enabled, this will fail! local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local clear, feed, insert = n.clear, n.feed, n.insert local command, expect = n.command, n.expect local poke_eventloop = n.poke_eventloop diff --git a/test/functional/legacy/034_user_function_spec.lua b/test/functional/legacy/034_user_function_spec.lua index ebac1adcb8b..7e4a05ddd0d 100644 --- a/test/functional/legacy/034_user_function_spec.lua +++ b/test/functional/legacy/034_user_function_spec.lua @@ -4,7 +4,9 @@ -- Also test for regression when calling arbitrary expression. local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local feed, insert, source = n.feed, n.insert, n.source local clear, feed_command, expect = n.clear, n.feed_command, n.expect diff --git a/test/functional/legacy/035_increment_and_decrement_spec.lua b/test/functional/legacy/035_increment_and_decrement_spec.lua index b6486a8a274..59e092a0a13 100644 --- a/test/functional/legacy/035_increment_and_decrement_spec.lua +++ b/test/functional/legacy/035_increment_and_decrement_spec.lua @@ -2,7 +2,9 @@ -- and octal numbers. local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local clear, feed, insert = n.clear, n.feed, n.insert local feed_command, expect = n.feed_command, n.expect diff --git a/test/functional/legacy/036_regexp_character_classes_spec.lua b/test/functional/legacy/036_regexp_character_classes_spec.lua index febe6a36ced..daa75fa9e78 100644 --- a/test/functional/legacy/036_regexp_character_classes_spec.lua +++ b/test/functional/legacy/036_regexp_character_classes_spec.lua @@ -3,6 +3,8 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() +local describe, it, before_each, setup, teardown, pending, finally = + t.describe, t.it, t.before_each, t.setup, t.teardown, t.pending, t.finally local clear, command, expect = n.clear, n.command, n.expect local source, write_file = n.source, t.write_file diff --git a/test/functional/legacy/038_virtual_replace_spec.lua b/test/functional/legacy/038_virtual_replace_spec.lua index b2edc5933f8..43de4b6744a 100644 --- a/test/functional/legacy/038_virtual_replace_spec.lua +++ b/test/functional/legacy/038_virtual_replace_spec.lua @@ -1,7 +1,9 @@ -- Test Virtual replace mode. local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local feed = n.feed local clear, feed_command, expect = n.clear, n.feed_command, n.expect diff --git a/test/functional/legacy/039_visual_block_mode_commands_spec.lua b/test/functional/legacy/039_visual_block_mode_commands_spec.lua index 98bcfd8261a..76c4e29b02f 100644 --- a/test/functional/legacy/039_visual_block_mode_commands_spec.lua +++ b/test/functional/legacy/039_visual_block_mode_commands_spec.lua @@ -4,6 +4,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, eq = n.api, t.eq local insert, feed = n.insert, n.feed local clear, expect = n.clear, n.expect diff --git a/test/functional/legacy/043_magic_settings_spec.lua b/test/functional/legacy/043_magic_settings_spec.lua index ba4c2dab025..4004b22cd9c 100644 --- a/test/functional/legacy/043_magic_settings_spec.lua +++ b/test/functional/legacy/043_magic_settings_spec.lua @@ -1,7 +1,9 @@ -- Tests for regexp with various magic settings. local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local clear, feed, insert = n.clear, n.feed, n.insert local feed_command, expect = n.feed_command, n.expect diff --git a/test/functional/legacy/044_099_regexp_multibyte_magic_spec.lua b/test/functional/legacy/044_099_regexp_multibyte_magic_spec.lua index 99cb64c7e55..aa4cbe94a9e 100644 --- a/test/functional/legacy/044_099_regexp_multibyte_magic_spec.lua +++ b/test/functional/legacy/044_099_regexp_multibyte_magic_spec.lua @@ -4,7 +4,9 @@ -- This test contains both "test44" and "test99" from the old test suite. local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, before_each = t.describe, t.it, t.before_each local feed, insert = n.feed, n.insert local clear, feed_command, expect = n.clear, n.feed_command, n.expect diff --git a/test/functional/legacy/046_multi_line_regexps_spec.lua b/test/functional/legacy/046_multi_line_regexps_spec.lua index a103b55581e..f084e68a001 100644 --- a/test/functional/legacy/046_multi_line_regexps_spec.lua +++ b/test/functional/legacy/046_multi_line_regexps_spec.lua @@ -2,7 +2,9 @@ -- Tests for multi-line regexps with ":s" local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local clear, feed, insert = n.clear, n.feed, n.insert local expect = n.expect diff --git a/test/functional/legacy/054_buffer_local_autocommands_spec.lua b/test/functional/legacy/054_buffer_local_autocommands_spec.lua index afde6f220a2..e5779d365fd 100644 --- a/test/functional/legacy/054_buffer_local_autocommands_spec.lua +++ b/test/functional/legacy/054_buffer_local_autocommands_spec.lua @@ -1,7 +1,9 @@ -- Some tests for buffer-local autocommands 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 clear = n.clear local expect = n.expect local command = n.command diff --git a/test/functional/legacy/055_list_and_dict_types_spec.lua b/test/functional/legacy/055_list_and_dict_types_spec.lua index 737417126be..e1c1e822767 100644 --- a/test/functional/legacy/055_list_and_dict_types_spec.lua +++ b/test/functional/legacy/055_list_and_dict_types_spec.lua @@ -1,7 +1,9 @@ -- Tests for List and Dictionary types. local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, before_each = t.describe, t.it, t.before_each local feed, source = n.feed, n.source local clear, feed_command, expect = n.clear, n.feed_command, n.expect diff --git a/test/functional/legacy/056_script_local_function_spec.lua b/test/functional/legacy/056_script_local_function_spec.lua index dd99224edb2..6ce8c2a300f 100644 --- a/test/functional/legacy/056_script_local_function_spec.lua +++ b/test/functional/legacy/056_script_local_function_spec.lua @@ -2,7 +2,9 @@ -- Test for script-local function. local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local clear, feed, insert = n.clear, n.feed, n.insert local expect = n.expect diff --git a/test/functional/legacy/057_sort_spec.lua b/test/functional/legacy/057_sort_spec.lua index e04a171cbc1..f0912937d09 100644 --- a/test/functional/legacy/057_sort_spec.lua +++ b/test/functional/legacy/057_sort_spec.lua @@ -1,6 +1,7 @@ -- Tests for :sort command. local t = require('test.testutil') +local describe, it, before_each = t.describe, t.it, t.before_each local pcall_err = t.pcall_err local n = require('test.functional.testnvim')() diff --git a/test/functional/legacy/060_exists_and_has_functions_spec.lua b/test/functional/legacy/060_exists_and_has_functions_spec.lua index ec29b6cf04e..46a7d5f90de 100644 --- a/test/functional/legacy/060_exists_and_has_functions_spec.lua +++ b/test/functional/legacy/060_exists_and_has_functions_spec.lua @@ -3,6 +3,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() +local describe, it, setup, teardown = t.describe, t.it, t.setup, t.teardown local source = n.source local clear, expect = n.clear, n.expect local write_file = t.write_file diff --git a/test/functional/legacy/061_undo_tree_spec.lua b/test/functional/legacy/061_undo_tree_spec.lua index 8feafa2cee6..51f0c681798 100644 --- a/test/functional/legacy/061_undo_tree_spec.lua +++ b/test/functional/legacy/061_undo_tree_spec.lua @@ -2,6 +2,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() +local describe, it, before_each, teardown = t.describe, t.it, t.before_each, t.teardown local feed_command = n.feed_command local write_file = t.write_file local command = n.command diff --git a/test/functional/legacy/063_match_and_matchadd_spec.lua b/test/functional/legacy/063_match_and_matchadd_spec.lua index 639a97f68ff..57081f1d29a 100644 --- a/test/functional/legacy/063_match_and_matchadd_spec.lua +++ b/test/functional/legacy/063_match_and_matchadd_spec.lua @@ -1,8 +1,10 @@ -- Tests for adjusting window and contents local n = require('test.functional.testnvim')() +local t = require('test.testutil') local Screen = require('test.functional.ui.screen') +local describe, it, setup = t.describe, t.it, t.setup local clear, command = n.clear, n.command local insert = n.insert diff --git a/test/functional/legacy/065_float_and_logic_operators_spec.lua b/test/functional/legacy/065_float_and_logic_operators_spec.lua index 0835a3df524..48153acfb27 100644 --- a/test/functional/legacy/065_float_and_logic_operators_spec.lua +++ b/test/functional/legacy/065_float_and_logic_operators_spec.lua @@ -1,7 +1,9 @@ -- Test for floating point and logical operators. local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local insert, source = n.insert, n.source local clear, expect = n.clear, n.expect diff --git a/test/functional/legacy/066_visual_block_tab_spec.lua b/test/functional/legacy/066_visual_block_tab_spec.lua index 6e92bd4c65c..d817a38276e 100644 --- a/test/functional/legacy/066_visual_block_tab_spec.lua +++ b/test/functional/legacy/066_visual_block_tab_spec.lua @@ -2,7 +2,9 @@ -- Test for visual block shift and tab characters. local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local clear, feed, insert = n.clear, n.feed, n.insert local feed_command, expect = n.feed_command, n.expect diff --git a/test/functional/legacy/067_augroup_exists_spec.lua b/test/functional/legacy/067_augroup_exists_spec.lua index 82b9c4bfa33..d00eddcc2e2 100644 --- a/test/functional/legacy/067_augroup_exists_spec.lua +++ b/test/functional/legacy/067_augroup_exists_spec.lua @@ -2,7 +2,9 @@ -- autocommands. local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local clear = n.clear local command, expect = n.command, n.expect diff --git a/test/functional/legacy/068_text_formatting_spec.lua b/test/functional/legacy/068_text_formatting_spec.lua index 179c15fb0fd..1bd2d136ad2 100644 --- a/test/functional/legacy/068_text_formatting_spec.lua +++ b/test/functional/legacy/068_text_formatting_spec.lua @@ -1,5 +1,7 @@ local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local feed = n.feed local clear = n.clear local insert = n.insert diff --git a/test/functional/legacy/069_multibyte_formatting_spec.lua b/test/functional/legacy/069_multibyte_formatting_spec.lua index de31b8d3968..4ac798c3039 100644 --- a/test/functional/legacy/069_multibyte_formatting_spec.lua +++ b/test/functional/legacy/069_multibyte_formatting_spec.lua @@ -6,6 +6,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, insert, eq, eval, clear, feed_command, expect = n.feed, n.insert, t.eq, n.eval, n.clear, n.feed_command, n.expect diff --git a/test/functional/legacy/072_undo_file_spec.lua b/test/functional/legacy/072_undo_file_spec.lua index f7185dacffc..fbd429d1dc6 100644 --- a/test/functional/legacy/072_undo_file_spec.lua +++ b/test/functional/legacy/072_undo_file_spec.lua @@ -3,7 +3,9 @@ -- undo-able pieces. Do that by setting 'undolevels'. 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 feed, insert = n.feed, n.insert local clear, feed_command, expect = n.clear, n.feed_command, n.expect diff --git a/test/functional/legacy/074_global_var_in_viminfo_spec.lua b/test/functional/legacy/074_global_var_in_viminfo_spec.lua index eb5e36120fa..5cfcadd9bdd 100644 --- a/test/functional/legacy/074_global_var_in_viminfo_spec.lua +++ b/test/functional/legacy/074_global_var_in_viminfo_spec.lua @@ -3,6 +3,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() +local describe, it, setup, teardown = t.describe, t.it, t.setup, t.teardown local clear, command, eq, neq, eval, poke_eventloop = n.clear, n.command, t.eq, t.neq, n.eval, n.poke_eventloop diff --git a/test/functional/legacy/081_coptions_movement_spec.lua b/test/functional/legacy/081_coptions_movement_spec.lua index cfa65f5c8a4..39beb2151dc 100644 --- a/test/functional/legacy/081_coptions_movement_spec.lua +++ b/test/functional/legacy/081_coptions_movement_spec.lua @@ -1,7 +1,9 @@ -- Test for t movement command and 'cpo-;' setting local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local clear, feed, insert = n.clear, n.feed, n.insert local feed_command, expect = n.feed_command, n.expect diff --git a/test/functional/legacy/082_string_comparison_spec.lua b/test/functional/legacy/082_string_comparison_spec.lua index 3d91dc4b343..215ed266e83 100644 --- a/test/functional/legacy/082_string_comparison_spec.lua +++ b/test/functional/legacy/082_string_comparison_spec.lua @@ -2,7 +2,9 @@ -- Also test "g~ap". local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local feed, source = n.feed, n.source local clear, feed_command, expect = n.clear, n.feed_command, n.expect diff --git a/test/functional/legacy/083_tag_search_with_file_encoding_spec.lua b/test/functional/legacy/083_tag_search_with_file_encoding_spec.lua index 05154f660d7..45013aa59ac 100644 --- a/test/functional/legacy/083_tag_search_with_file_encoding_spec.lua +++ b/test/functional/legacy/083_tag_search_with_file_encoding_spec.lua @@ -3,6 +3,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() +local describe, it, setup, teardown, pending = t.describe, t.it, t.setup, t.teardown, t.pending local insert, source, clear, expect, write_file = n.insert, n.source, n.clear, n.expect, t.write_file diff --git a/test/functional/legacy/090_sha256_spec.lua b/test/functional/legacy/090_sha256_spec.lua index 648eb655506..a2102c5151f 100644 --- a/test/functional/legacy/090_sha256_spec.lua +++ b/test/functional/legacy/090_sha256_spec.lua @@ -1,7 +1,9 @@ -- Tests for sha256() function. local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local insert, source = n.insert, n.source local clear, expect = n.clear, n.expect diff --git a/test/functional/legacy/091_context_variables_spec.lua b/test/functional/legacy/091_context_variables_spec.lua index cc3ee6787a0..690336b1486 100644 --- a/test/functional/legacy/091_context_variables_spec.lua +++ b/test/functional/legacy/091_context_variables_spec.lua @@ -1,7 +1,9 @@ -- Tests for getbufvar(), getwinvar(), gettabvar() and gettabwinvar(). local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local insert, source = n.insert, n.source local clear, expect = n.clear, n.expect diff --git a/test/functional/legacy/092_mksession_cursor_cols_utf8_spec.lua b/test/functional/legacy/092_mksession_cursor_cols_utf8_spec.lua index d478545077c..2eda4e39eb4 100644 --- a/test/functional/legacy/092_mksession_cursor_cols_utf8_spec.lua +++ b/test/functional/legacy/092_mksession_cursor_cols_utf8_spec.lua @@ -4,7 +4,9 @@ -- Same as legacy test 93 but using UTF-8 file encoding. 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 feed, insert = n.feed, n.insert local clear, feed_command, expect = n.clear, n.feed_command, n.expect diff --git a/test/functional/legacy/093_mksession_cursor_cols_latin1_spec.lua b/test/functional/legacy/093_mksession_cursor_cols_latin1_spec.lua index 5e5e465c012..6fc85ac8188 100644 --- a/test/functional/legacy/093_mksession_cursor_cols_latin1_spec.lua +++ b/test/functional/legacy/093_mksession_cursor_cols_latin1_spec.lua @@ -4,7 +4,9 @@ -- Same as legacy test 92 but using Latin-1 file encoding. 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 feed, insert = n.feed, n.insert local clear, feed_command, expect = n.clear, n.feed_command, n.expect diff --git a/test/functional/legacy/094_visual_mode_operators_spec.lua b/test/functional/legacy/094_visual_mode_operators_spec.lua index 279c6a432a8..425783d5f7d 100644 --- a/test/functional/legacy/094_visual_mode_operators_spec.lua +++ b/test/functional/legacy/094_visual_mode_operators_spec.lua @@ -5,7 +5,9 @@ -- part of the test are mappings, counts, and repetition with the . command. local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, before_each = t.describe, t.it, t.before_each local feed, insert, source = n.feed, n.insert, n.source local clear, feed_command, expect = n.clear, n.feed_command, n.expect diff --git a/test/functional/legacy/095_regexp_multibyte_spec.lua b/test/functional/legacy/095_regexp_multibyte_spec.lua index 296bf00b580..b6a29c9fd3a 100644 --- a/test/functional/legacy/095_regexp_multibyte_spec.lua +++ b/test/functional/legacy/095_regexp_multibyte_spec.lua @@ -4,7 +4,9 @@ -- actually tried. local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local insert, source = n.insert, n.source local clear, expect = n.clear, n.expect diff --git a/test/functional/legacy/096_location_list_spec.lua b/test/functional/legacy/096_location_list_spec.lua index 27bbe706bb9..7bcd6cded4b 100644 --- a/test/functional/legacy/096_location_list_spec.lua +++ b/test/functional/legacy/096_location_list_spec.lua @@ -7,7 +7,9 @@ -- it belongs to. 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 source = n.source local clear, command, expect = n.clear, n.command, n.expect diff --git a/test/functional/legacy/097_glob_path_spec.lua b/test/functional/legacy/097_glob_path_spec.lua index b2d22e2a896..5647e53e4cc 100644 --- a/test/functional/legacy/097_glob_path_spec.lua +++ b/test/functional/legacy/097_glob_path_spec.lua @@ -5,6 +5,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() +local describe, it, setup, teardown = t.describe, t.it, t.setup, t.teardown local clear = n.clear local command, expect = n.command, n.expect diff --git a/test/functional/legacy/101_hlsearch_spec.lua b/test/functional/legacy/101_hlsearch_spec.lua index 88f1c31b23c..2b7911f0f1e 100644 --- a/test/functional/legacy/101_hlsearch_spec.lua +++ b/test/functional/legacy/101_hlsearch_spec.lua @@ -1,7 +1,9 @@ -- Test for v:hlsearch local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local clear, feed = n.clear, n.feed local feed_command, expect = n.feed_command, n.expect diff --git a/test/functional/legacy/102_fnameescape_spec.lua b/test/functional/legacy/102_fnameescape_spec.lua index f0361c2f5ab..4a0151fbefb 100644 --- a/test/functional/legacy/102_fnameescape_spec.lua +++ b/test/functional/legacy/102_fnameescape_spec.lua @@ -1,7 +1,9 @@ -- Test if fnameescape is correct for special chars like! 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 clear = n.clear local command, expect = n.command, n.expect diff --git a/test/functional/legacy/103_visual_mode_reset_spec.lua b/test/functional/legacy/103_visual_mode_reset_spec.lua index b6fdf8cc687..4f599849198 100644 --- a/test/functional/legacy/103_visual_mode_reset_spec.lua +++ b/test/functional/legacy/103_visual_mode_reset_spec.lua @@ -1,7 +1,9 @@ -- Test for visual mode not being reset causing E315 error. local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local feed, source = n.feed, n.source local clear, expect = n.clear, n.expect diff --git a/test/functional/legacy/106_errorformat_spec.lua b/test/functional/legacy/106_errorformat_spec.lua index 4189b568a23..24ee07d7b61 100644 --- a/test/functional/legacy/106_errorformat_spec.lua +++ b/test/functional/legacy/106_errorformat_spec.lua @@ -1,7 +1,9 @@ -- Tests for errorformat. local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local clear = n.clear local command, expect = n.command, n.expect diff --git a/test/functional/legacy/107_adjust_window_and_contents_spec.lua b/test/functional/legacy/107_adjust_window_and_contents_spec.lua index e97c9c074bf..3aeaf4e4c5b 100644 --- a/test/functional/legacy/107_adjust_window_and_contents_spec.lua +++ b/test/functional/legacy/107_adjust_window_and_contents_spec.lua @@ -1,8 +1,10 @@ -- Tests for adjusting window and contents local n = require('test.functional.testnvim')() +local t = require('test.testutil') local Screen = require('test.functional.ui.screen') +local describe, it, setup = t.describe, t.it, t.setup local poke_eventloop = n.poke_eventloop local clear = n.clear local insert = n.insert diff --git a/test/functional/legacy/108_backtrace_debug_commands_spec.lua b/test/functional/legacy/108_backtrace_debug_commands_spec.lua index aac25cca23b..71d1e335bed 100644 --- a/test/functional/legacy/108_backtrace_debug_commands_spec.lua +++ b/test/functional/legacy/108_backtrace_debug_commands_spec.lua @@ -1,7 +1,9 @@ -- Tests for backtrace debug commands. local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, before_each = t.describe, t.it, t.before_each local command = n.command local feed, clear = n.feed, n.clear local feed_command, expect = n.feed_command, n.expect diff --git a/test/functional/legacy/arglist_spec.lua b/test/functional/legacy/arglist_spec.lua index 288a182f369..f342114e35f 100644 --- a/test/functional/legacy/arglist_spec.lua +++ b/test/functional/legacy/arglist_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, command, eq = n.clear, n.command, t.eq local expect_exit = n.expect_exit local feed = n.feed diff --git a/test/functional/legacy/assert_spec.lua b/test/functional/legacy/assert_spec.lua index 96c60e9e61f..c66e6d0fd68 100644 --- a/test/functional/legacy/assert_spec.lua +++ b/test/functional/legacy/assert_spec.lua @@ -1,4 +1,5 @@ local t = require('test.testutil') +local describe, it, before_each = t.describe, t.it, t.before_each local pcall_err = t.pcall_err local n = require('test.functional.testnvim')() diff --git a/test/functional/legacy/autochdir_spec.lua b/test/functional/legacy/autochdir_spec.lua index 7e8f1093340..0bcd34ae695 100644 --- a/test/functional/legacy/autochdir_spec.lua +++ b/test/functional/legacy/autochdir_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, eq, matches = n.clear, t.eq, t.matches local eval, command, call, api = n.eval, n.command, n.call, n.api local source, exec_capture = n.source, n.exec_capture diff --git a/test/functional/legacy/autocmd_option_spec.lua b/test/functional/legacy/autocmd_option_spec.lua index fca368f6bd4..9c6ef067b45 100644 --- a/test/functional/legacy/autocmd_option_spec.lua +++ b/test/functional/legacy/autocmd_option_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, eval = n.clear, t.eq, t.neq, n.eval local api = n.api local curbuf = n.api.nvim_get_current_buf diff --git a/test/functional/legacy/autocmd_spec.lua b/test/functional/legacy/autocmd_spec.lua index 5e88301c65c..aedd257d547 100644 --- a/test/functional/legacy/autocmd_spec.lua +++ b/test/functional/legacy/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 it, before_each, finally = t.it, t.before_each, t.finally local clear = n.clear local write_file = t.write_file local command = n.command diff --git a/test/functional/legacy/autoformat_join_spec.lua b/test/functional/legacy/autoformat_join_spec.lua index 9a240c8bdac..4566678981d 100644 --- a/test/functional/legacy/autoformat_join_spec.lua +++ b/test/functional/legacy/autoformat_join_spec.lua @@ -1,7 +1,9 @@ -- Tests for setting the '[,'] marks when joining lines. local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local clear, feed, insert = n.clear, n.feed, n.insert local command, expect = n.command, n.expect local poke_eventloop = n.poke_eventloop diff --git a/test/functional/legacy/breakindent_spec.lua b/test/functional/legacy/breakindent_spec.lua index 42d28b12316..64aa1c23288 100644 --- a/test/functional/legacy/breakindent_spec.lua +++ b/test/functional/legacy/breakindent_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 exec = n.exec diff --git a/test/functional/legacy/changelist_spec.lua b/test/functional/legacy/changelist_spec.lua index e2f87351de4..0a55d0f24f8 100644 --- a/test/functional/legacy/changelist_spec.lua +++ b/test/functional/legacy/changelist_spec.lua @@ -2,7 +2,9 @@ -- Set 'undolevels' to make changelist for sourced file local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local clear, feed, insert = n.clear, n.feed, n.insert local feed_command, expect = n.feed_command, n.expect diff --git a/test/functional/legacy/charsearch_spec.lua b/test/functional/legacy/charsearch_spec.lua index da13b61e0fa..ac4cbd2177e 100644 --- a/test/functional/legacy/charsearch_spec.lua +++ b/test/functional/legacy/charsearch_spec.lua @@ -1,7 +1,9 @@ -- Test for character searches local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local feed, insert = n.feed, n.insert local clear, feed_command, expect = n.clear, n.feed_command, n.expect diff --git a/test/functional/legacy/close_count_spec.lua b/test/functional/legacy/close_count_spec.lua index 0a08ad9fe67..938e7cc4cc4 100644 --- a/test/functional/legacy/close_count_spec.lua +++ b/test/functional/legacy/close_count_spec.lua @@ -3,6 +3,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() +local describe, it, setup = t.describe, t.it, t.setup local eq = t.eq local poke_eventloop = n.poke_eventloop local eval = n.eval diff --git a/test/functional/legacy/cmdline_spec.lua b/test/functional/legacy/cmdline_spec.lua index 6495239208b..cc8c31bb7c0 100644 --- a/test/functional/legacy/cmdline_spec.lua +++ b/test/functional/legacy/cmdline_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 diff --git a/test/functional/legacy/command_count_spec.lua b/test/functional/legacy/command_count_spec.lua index a6be459a4de..e0b779d3271 100644 --- a/test/functional/legacy/command_count_spec.lua +++ b/test/functional/legacy/command_count_spec.lua @@ -1,7 +1,9 @@ -- Test for user command counts local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it = t.describe, t.it local clear, source, expect = n.clear, n.source, n.expect local feed_command = n.feed_command diff --git a/test/functional/legacy/comparators_spec.lua b/test/functional/legacy/comparators_spec.lua index 86df5b1c41f..3e7ccdbd64c 100644 --- a/test/functional/legacy/comparators_spec.lua +++ b/test/functional/legacy/comparators_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 clear, eq = n.clear, t.eq local eval, command = n.eval, n.command diff --git a/test/functional/legacy/conceal_spec.lua b/test/functional/legacy/conceal_spec.lua index 6c347eac853..1cc67d15f05 100644 --- a/test/functional/legacy/conceal_spec.lua +++ b/test/functional/legacy/conceal_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 = n.exec diff --git a/test/functional/legacy/cpoptions_spec.lua b/test/functional/legacy/cpoptions_spec.lua index bd1390c8740..e25dd60b994 100644 --- a/test/functional/legacy/cpoptions_spec.lua +++ b/test/functional/legacy/cpoptions_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 diff --git a/test/functional/legacy/crash_spec.lua b/test/functional/legacy/crash_spec.lua index 24d72f4c4f5..b15aa0d6d30 100644 --- a/test/functional/legacy/crash_spec.lua +++ b/test/functional/legacy/crash_spec.lua @@ -1,6 +1,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() +local it, before_each, finally = t.it, t.before_each, t.finally local assert_alive = n.assert_alive local clear = n.clear local command = n.command diff --git a/test/functional/legacy/debugger_spec.lua b/test/functional/legacy/debugger_spec.lua index 7c1d704cd7a..fa65f32700a 100644 --- a/test/functional/legacy/debugger_spec.lua +++ b/test/functional/legacy/debugger_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 feed = n.feed diff --git a/test/functional/legacy/delete_spec.lua b/test/functional/legacy/delete_spec.lua index 8c97341c8e6..2c1a17554c6 100644 --- a/test/functional/legacy/delete_spec.lua +++ b/test/functional/legacy/delete_spec.lua @@ -1,4 +1,6 @@ local t = require('test.testutil') +local describe, it, before_each, after_each, pending = + t.describe, t.it, t.before_each, t.after_each, t.pending local pcall_err = t.pcall_err local n = require('test.functional.testnvim')() diff --git a/test/functional/legacy/digraph_spec.lua b/test/functional/legacy/digraph_spec.lua index a90eb48f17f..0f90aee6ad4 100644 --- a/test/functional/legacy/digraph_spec.lua +++ b/test/functional/legacy/digraph_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 feed = n.feed diff --git a/test/functional/legacy/display_spec.lua b/test/functional/legacy/display_spec.lua index 875c7399757..83d830365a7 100644 --- a/test/functional/legacy/display_spec.lua +++ b/test/functional/legacy/display_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 = n.exec local feed = n.feed diff --git a/test/functional/legacy/edit_spec.lua b/test/functional/legacy/edit_spec.lua index dad1f7b579f..6e27bb980ec 100644 --- a/test/functional/legacy/edit_spec.lua +++ b/test/functional/legacy/edit_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 expect = n.expect diff --git a/test/functional/legacy/erasebackword_spec.lua b/test/functional/legacy/erasebackword_spec.lua index 3042c52784e..a266ef8cb8e 100644 --- a/test/functional/legacy/erasebackword_spec.lua +++ b/test/functional/legacy/erasebackword_spec.lua @@ -1,7 +1,9 @@ -- Test for CTRL-W in Insert mode local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local clear, feed, expect = n.clear, n.feed, n.expect describe('CTRL-W in Insert mode', function() diff --git a/test/functional/legacy/eval_spec.lua b/test/functional/legacy/eval_spec.lua index 293c23d8444..8bab252d37f 100644 --- a/test/functional/legacy/eval_spec.lua +++ b/test/functional/legacy/eval_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 assert_alive = n.assert_alive local feed, insert, source = n.feed, n.insert, n.source local clear, command, expect = n.clear, n.command, n.expect diff --git a/test/functional/legacy/ex_mode_spec.lua b/test/functional/legacy/ex_mode_spec.lua index af4490e7f2f..5ed572674d0 100644 --- a/test/functional/legacy/ex_mode_spec.lua +++ b/test/functional/legacy/ex_mode_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 diff --git a/test/functional/legacy/excmd_spec.lua b/test/functional/legacy/excmd_spec.lua index df797505497..5eaf495b63e 100644 --- a/test/functional/legacy/excmd_spec.lua +++ b/test/functional/legacy/excmd_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 = t.describe, t.it local clear = n.clear local command = n.command local exec = n.exec diff --git a/test/functional/legacy/fixeol_spec.lua b/test/functional/legacy/fixeol_spec.lua index 21f0b9f0011..8a007279454 100644 --- a/test/functional/legacy/fixeol_spec.lua +++ b/test/functional/legacy/fixeol_spec.lua @@ -1,7 +1,9 @@ -- Tests for 'fixeol' 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 feed = n.feed local clear, feed_command, expect = n.clear, n.feed_command, n.expect diff --git a/test/functional/legacy/fnamemodify_spec.lua b/test/functional/legacy/fnamemodify_spec.lua index ce8c710a46b..5d64008aca9 100644 --- a/test/functional/legacy/fnamemodify_spec.lua +++ b/test/functional/legacy/fnamemodify_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 clear, source = n.clear, n.source local call, eq, api = n.call, t.eq, n.api diff --git a/test/functional/legacy/fold_spec.lua b/test/functional/legacy/fold_spec.lua index b5e6a98b968..8c5e3c5aaf1 100644 --- a/test/functional/legacy/fold_spec.lua +++ b/test/functional/legacy/fold_spec.lua @@ -1,8 +1,10 @@ -- Tests for folding. 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 feed, insert, feed_command, expect_any = n.feed, n.insert, n.feed_command, n.expect_any local command = n.command local exec = n.exec diff --git a/test/functional/legacy/function_sort_spec.lua b/test/functional/legacy/function_sort_spec.lua index 840364d0d88..95a22721d8e 100644 --- a/test/functional/legacy/function_sort_spec.lua +++ b/test/functional/legacy/function_sort_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 pcall_err = t.pcall_err local neq = t.neq diff --git a/test/functional/legacy/getcwd_spec.lua b/test/functional/legacy/getcwd_spec.lua index c95a010c5a1..c54b32302c2 100644 --- a/test/functional/legacy/getcwd_spec.lua +++ b/test/functional/legacy/getcwd_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, eval, source = t.eq, n.eval, n.source local call, clear, command = n.call, n.clear, n.command diff --git a/test/functional/legacy/gf_spec.lua b/test/functional/legacy/gf_spec.lua index 4c98edf8e00..87abf22a431 100644 --- a/test/functional/legacy/gf_spec.lua +++ b/test/functional/legacy/gf_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 diff --git a/test/functional/legacy/glob2regpat_spec.lua b/test/functional/legacy/glob2regpat_spec.lua index 6d08a77386d..9b27a45c8eb 100644 --- a/test/functional/legacy/glob2regpat_spec.lua +++ b/test/functional/legacy/glob2regpat_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, eval = t.eq, n.eval diff --git a/test/functional/legacy/global_spec.lua b/test/functional/legacy/global_spec.lua index a39e7d5d380..906eb7aab9b 100644 --- a/test/functional/legacy/global_spec.lua +++ b/test/functional/legacy/global_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 = n.exec local feed = n.feed diff --git a/test/functional/legacy/highlight_spec.lua b/test/functional/legacy/highlight_spec.lua index af9e99fc9bb..4ccca98490f 100644 --- a/test/functional/legacy/highlight_spec.lua +++ b/test/functional/legacy/highlight_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 = n.clear, n.feed local expect = n.expect local eq = t.eq diff --git a/test/functional/legacy/insertcount_spec.lua b/test/functional/legacy/insertcount_spec.lua index 53402c21637..e500c3dc5ec 100644 --- a/test/functional/legacy/insertcount_spec.lua +++ b/test/functional/legacy/insertcount_spec.lua @@ -1,7 +1,9 @@ -- Tests for repeating insert and replace. local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local clear, feed, insert = n.clear, n.feed, n.insert local feed_command, expect = n.feed_command, n.expect diff --git a/test/functional/legacy/join_spec.lua b/test/functional/legacy/join_spec.lua index 018edae3212..b4c5e685cbd 100644 --- a/test/functional/legacy/join_spec.lua +++ b/test/functional/legacy/join_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 clear, eq = n.clear, t.eq local eval, command = n.eval, n.command local feed = n.feed diff --git a/test/functional/legacy/lispwords_spec.lua b/test/functional/legacy/lispwords_spec.lua index b0130320ed6..bb833d0d84c 100644 --- a/test/functional/legacy/lispwords_spec.lua +++ b/test/functional/legacy/lispwords_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 diff --git a/test/functional/legacy/listchars_spec.lua b/test/functional/legacy/listchars_spec.lua index 76b29664433..5399de5987e 100644 --- a/test/functional/legacy/listchars_spec.lua +++ b/test/functional/legacy/listchars_spec.lua @@ -1,8 +1,10 @@ -- Tests for 'listchars' display with 'list' and :list. 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 feed, insert, exec = n.feed, n.insert, n.exec local clear, feed_command, expect = n.clear, n.feed_command, n.expect diff --git a/test/functional/legacy/listlbr_spec.lua b/test/functional/legacy/listlbr_spec.lua index 09835bf97da..c5dedd54cfc 100644 --- a/test/functional/legacy/listlbr_spec.lua +++ b/test/functional/legacy/listlbr_spec.lua @@ -1,8 +1,10 @@ -- Test for linebreak and list option (non-utf8) 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 feed, insert, source = n.feed, n.insert, n.source local clear, feed_command, expect = n.clear, n.feed_command, n.expect diff --git a/test/functional/legacy/listlbr_utf8_spec.lua b/test/functional/legacy/listlbr_utf8_spec.lua index c1a2b340a0c..ef6187f13ba 100644 --- a/test/functional/legacy/listlbr_utf8_spec.lua +++ b/test/functional/legacy/listlbr_utf8_spec.lua @@ -1,8 +1,10 @@ -- Test for linebreak and list option in utf-8 mode 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 source = n.source local feed = n.feed local exec = n.exec diff --git a/test/functional/legacy/mapping_spec.lua b/test/functional/legacy/mapping_spec.lua index 8593868c832..86ea1352a11 100644 --- a/test/functional/legacy/mapping_spec.lua +++ b/test/functional/legacy/mapping_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, poke_eventloop = n.expect, n.poke_eventloop local command, eq, eval, api = n.command, t.eq, n.eval, n.api diff --git a/test/functional/legacy/marks_spec.lua b/test/functional/legacy/marks_spec.lua index fd968eb355d..fd9ab5b5045 100644 --- a/test/functional/legacy/marks_spec.lua +++ b/test/functional/legacy/marks_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 feed, insert, source = n.feed, n.insert, n.source local clear, feed_command, expect = n.clear, n.feed_command, n.expect diff --git a/test/functional/legacy/match_spec.lua b/test/functional/legacy/match_spec.lua index 64e223ab8c7..63cba3c0d39 100644 --- a/test/functional/legacy/match_spec.lua +++ b/test/functional/legacy/match_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 = n.exec local feed = n.feed diff --git a/test/functional/legacy/matchparen_spec.lua b/test/functional/legacy/matchparen_spec.lua index 083db22fcf8..f87aaead784 100644 --- a/test/functional/legacy/matchparen_spec.lua +++ b/test/functional/legacy/matchparen_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 = n.exec local feed = n.feed diff --git a/test/functional/legacy/memory_usage_spec.lua b/test/functional/legacy/memory_usage_spec.lua index af72013b8d5..82f5cd754a8 100644 --- a/test/functional/legacy/memory_usage_spec.lua +++ b/test/functional/legacy/memory_usage_spec.lua @@ -1,6 +1,8 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() +local describe, it, before_each, after_each, pending = + t.describe, t.it, t.before_each, t.after_each, t.pending local clear = n.clear local eval = n.eval local eq = t.eq diff --git a/test/functional/legacy/messages_spec.lua b/test/functional/legacy/messages_spec.lua index e02dd87bc1f..786e916d000 100644 --- a/test/functional/legacy/messages_spec.lua +++ b/test/functional/legacy/messages_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 exec = n.exec diff --git a/test/functional/legacy/mksession_spec.lua b/test/functional/legacy/mksession_spec.lua index 28d4637954a..f4eb6cc98ca 100644 --- a/test/functional/legacy/mksession_spec.lua +++ b/test/functional/legacy/mksession_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 fn = n.fn diff --git a/test/functional/legacy/move_spec.lua b/test/functional/legacy/move_spec.lua index ae011930497..ac0e4370959 100644 --- a/test/functional/legacy/move_spec.lua +++ b/test/functional/legacy/move_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 feed = n.feed local fn = n.fn diff --git a/test/functional/legacy/nested_function_spec.lua b/test/functional/legacy/nested_function_spec.lua index 5e981b58622..872e56c6ee6 100644 --- a/test/functional/legacy/nested_function_spec.lua +++ b/test/functional/legacy/nested_function_spec.lua @@ -1,7 +1,9 @@ -- Tests for nested function. local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local clear, insert = n.clear, n.insert local command, expect, source = n.command, n.expect, n.source diff --git a/test/functional/legacy/normal_spec.lua b/test/functional/legacy/normal_spec.lua index dbac8bbc54b..1f16bc7f4f0 100644 --- a/test/functional/legacy/normal_spec.lua +++ b/test/functional/legacy/normal_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 exec = n.exec local feed = n.feed diff --git a/test/functional/legacy/number_spec.lua b/test/functional/legacy/number_spec.lua index 58a08b9a13e..b9723a3a261 100644 --- a/test/functional/legacy/number_spec.lua +++ b/test/functional/legacy/number_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 exec = n.exec diff --git a/test/functional/legacy/options_spec.lua b/test/functional/legacy/options_spec.lua index d3a3944ea4f..15833a548d6 100644 --- a/test/functional/legacy/options_spec.lua +++ b/test/functional/legacy/options_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, setup = t.describe, t.it, t.before_each, t.setup local command, clear = n.command, n.clear local source, expect = n.source, n.expect local matches = t.matches diff --git a/test/functional/legacy/prompt_buffer_spec.lua b/test/functional/legacy/prompt_buffer_spec.lua index 05e69794356..ee7642f716c 100644 --- a/test/functional/legacy/prompt_buffer_spec.lua +++ b/test/functional/legacy/prompt_buffer_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 feed = n.feed local fn = n.call local source = n.source diff --git a/test/functional/legacy/put_spec.lua b/test/functional/legacy/put_spec.lua index 2656142176e..d6c709a3dbf 100644 --- a/test/functional/legacy/put_spec.lua +++ b/test/functional/legacy/put_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 source = n.source diff --git a/test/functional/legacy/qf_title_spec.lua b/test/functional/legacy/qf_title_spec.lua index 26b096d633f..953d0fb7bf8 100644 --- a/test/functional/legacy/qf_title_spec.lua +++ b/test/functional/legacy/qf_title_spec.lua @@ -1,7 +1,9 @@ -- Tests for quickfix window's title local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local insert, source = n.insert, n.source local clear, expect = n.clear, n.expect diff --git a/test/functional/legacy/registers_spec.lua b/test/functional/legacy/registers_spec.lua index df470f3009c..ad951782eed 100644 --- a/test/functional/legacy/registers_spec.lua +++ b/test/functional/legacy/registers_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 = n.exec local assert_alive = n.assert_alive diff --git a/test/functional/legacy/scroll_opt_spec.lua b/test/functional/legacy/scroll_opt_spec.lua index 505d479418f..d041d0e3c9a 100644 --- a/test/functional/legacy/scroll_opt_spec.lua +++ b/test/functional/legacy/scroll_opt_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 = n.exec local feed = n.feed diff --git a/test/functional/legacy/search_mbyte_spec.lua b/test/functional/legacy/search_mbyte_spec.lua index 64575671763..7247661e14f 100644 --- a/test/functional/legacy/search_mbyte_spec.lua +++ b/test/functional/legacy/search_mbyte_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 poke_eventloop = n.poke_eventloop local clear = n.clear local insert = n.insert diff --git a/test/functional/legacy/search_spec.lua b/test/functional/legacy/search_spec.lua index 70b610c8593..d8781cec18c 100644 --- a/test/functional/legacy/search_spec.lua +++ b/test/functional/legacy/search_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 diff --git a/test/functional/legacy/search_stat_spec.lua b/test/functional/legacy/search_stat_spec.lua index 05def8a7d92..650ef86e41e 100644 --- a/test/functional/legacy/search_stat_spec.lua +++ b/test/functional/legacy/search_stat_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, feed, exec, command = n.clear, n.feed, n.exec, n.command describe('search stat', function() diff --git a/test/functional/legacy/signs_spec.lua b/test/functional/legacy/signs_spec.lua index af355f27e6f..6484f7f67bf 100644 --- a/test/functional/legacy/signs_spec.lua +++ b/test/functional/legacy/signs_spec.lua @@ -1,8 +1,10 @@ -- Tests for signs 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, command, exec, expect, feed = n.clear, n.command, n.exec, n.expect, n.feed describe('signs', function() diff --git a/test/functional/legacy/source_spec.lua b/test/functional/legacy/source_spec.lua index 7358ba2d570..1755f3365a7 100644 --- a/test/functional/legacy/source_spec.lua +++ b/test/functional/legacy/source_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 feed = n.feed local write_file = t.write_file diff --git a/test/functional/legacy/statusline_spec.lua b/test/functional/legacy/statusline_spec.lua index cad7165270c..bf3bc2315ac 100644 --- a/test/functional/legacy/statusline_spec.lua +++ b/test/functional/legacy/statusline_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 = n.exec local feed = n.feed diff --git a/test/functional/legacy/substitute_spec.lua b/test/functional/legacy/substitute_spec.lua index 30ff13140fd..b72c4e4c2ba 100644 --- a/test/functional/legacy/substitute_spec.lua +++ b/test/functional/legacy/substitute_spec.lua @@ -6,6 +6,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 feed, insert = n.feed, n.insert local exec = n.exec local clear, feed_command, expect = n.clear, n.feed_command, n.expect diff --git a/test/functional/legacy/syn_attr_spec.lua b/test/functional/legacy/syn_attr_spec.lua index 155eb9ce118..f869280856e 100644 --- a/test/functional/legacy/syn_attr_spec.lua +++ b/test/functional/legacy/syn_attr_spec.lua @@ -1,6 +1,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() +local describe, it, setup = t.describe, t.it, t.setup local clear = n.clear local command = n.command local eq = t.eq diff --git a/test/functional/legacy/tabline_spec.lua b/test/functional/legacy/tabline_spec.lua index 949bec6dea5..3988ec8956b 100644 --- a/test/functional/legacy/tabline_spec.lua +++ b/test/functional/legacy/tabline_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 = n.exec local feed = n.feed diff --git a/test/functional/legacy/tagcase_spec.lua b/test/functional/legacy/tagcase_spec.lua index fac0fd85ff1..08cfc9ce8aa 100644 --- a/test/functional/legacy/tagcase_spec.lua +++ b/test/functional/legacy/tagcase_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 eq = t.eq local pcall_err = t.pcall_err diff --git a/test/functional/legacy/utf8_spec.lua b/test/functional/legacy/utf8_spec.lua index cdb0c2ca588..e2fb28d84f3 100644 --- a/test/functional/legacy/utf8_spec.lua +++ b/test/functional/legacy/utf8_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 clear, feed, insert = n.clear, n.feed, n.insert local command, expect = n.command, n.expect local eq, eval = t.eq, n.eval diff --git a/test/functional/legacy/vimscript_spec.lua b/test/functional/legacy/vimscript_spec.lua index e2e3493be8d..ae1a6858081 100644 --- a/test/functional/legacy/vimscript_spec.lua +++ b/test/functional/legacy/vimscript_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 = n.exec local feed = n.feed diff --git a/test/functional/legacy/visual_spec.lua b/test/functional/legacy/visual_spec.lua index e52d12bba97..5b03976cca8 100644 --- a/test/functional/legacy/visual_spec.lua +++ b/test/functional/legacy/visual_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 feed = n.feed local exec = n.exec diff --git a/test/functional/legacy/window_cmd_spec.lua b/test/functional/legacy/window_cmd_spec.lua index d6120678a97..d4f714bd875 100644 --- a/test/functional/legacy/window_cmd_spec.lua +++ b/test/functional/legacy/window_cmd_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 exec = n.exec diff --git a/test/functional/legacy/wordcount_spec.lua b/test/functional/legacy/wordcount_spec.lua index 85f2a1623cd..ca50876fac6 100644 --- a/test/functional/legacy/wordcount_spec.lua +++ b/test/functional/legacy/wordcount_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, insert, source = n.feed, n.insert, n.source local clear, command = n.clear, n.command local eq, eval = t.eq, n.eval diff --git a/test/functional/legacy/writefile_spec.lua b/test/functional/legacy/writefile_spec.lua index a5a2c3c6827..b8a51446fdc 100644 --- a/test/functional/legacy/writefile_spec.lua +++ b/test/functional/legacy/writefile_spec.lua @@ -1,7 +1,9 @@ -- Tests for writefile() local n = require('test.functional.testnvim')() +local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local clear, command, expect = n.clear, n.command, n.expect describe('writefile', function() diff --git a/test/functional/lua/api_spec.lua b/test/functional/lua/api_spec.lua index d100ee446d8..9511e876c0e 100644 --- a/test/functional/lua/api_spec.lua +++ b/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 diff --git a/test/functional/lua/base64_spec.lua b/test/functional/lua/base64_spec.lua index 529f5f56e81..0f801510c76 100644 --- a/test/functional/lua/base64_spec.lua +++ b/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 diff --git a/test/functional/lua/buffer_updates_spec.lua b/test/functional/lua/buffer_updates_spec.lua index 3a0f6875cca..0910218c085 100644 --- a/test/functional/lua/buffer_updates_spec.lua +++ b/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 diff --git a/test/functional/lua/command_line_completion_spec.lua b/test/functional/lua/command_line_completion_spec.lua index 6c06aa5b70d..5093ce76f75 100644 --- a/test/functional/lua/command_line_completion_spec.lua +++ b/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 diff --git a/test/functional/lua/commands_spec.lua b/test/functional/lua/commands_spec.lua index 70ac8f2e7cc..5d1196d891e 100644 --- a/test/functional/lua/commands_spec.lua +++ b/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 diff --git a/test/functional/lua/comment_spec.lua b/test/functional/lua/comment_spec.lua index 518abc84ddb..dbf7864e93b 100644 --- a/test/functional/lua/comment_spec.lua +++ b/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 diff --git a/test/functional/lua/deprecated_spec.lua b/test/functional/lua/deprecated_spec.lua index 182b7e89de8..3dd9bfcbb14 100644 --- a/test/functional/lua/deprecated_spec.lua +++ b/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 diff --git a/test/functional/lua/diagnostic_spec.lua b/test/functional/lua/diagnostic_spec.lua index 5b7bb4f3726..56be26440a3 100644 --- a/test/functional/lua/diagnostic_spec.lua +++ b/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 diff --git a/test/functional/lua/ffi_spec.lua b/test/functional/lua/ffi_spec.lua index 136e2e7c692..a9b72045136 100644 --- a/test/functional/lua/ffi_spec.lua +++ b/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 diff --git a/test/functional/lua/filetype_spec.lua b/test/functional/lua/filetype_spec.lua index efbac45570c..fdc6e8c7574 100644 --- a/test/functional/lua/filetype_spec.lua +++ b/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 diff --git a/test/functional/lua/fs_spec.lua b/test/functional/lua/fs_spec.lua index 2c9b0043e18..db8ff2a9c0a 100644 --- a/test/functional/lua/fs_spec.lua +++ b/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 diff --git a/test/functional/lua/func_memoize_spec.lua b/test/functional/lua/func_memoize_spec.lua index ca518ab88da..f542c314659 100644 --- a/test/functional/lua/func_memoize_spec.lua +++ b/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 diff --git a/test/functional/lua/glob_spec.lua b/test/functional/lua/glob_spec.lua index 4792731c0c1..00f33f8058f 100644 --- a/test/functional/lua/glob_spec.lua +++ b/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() diff --git a/test/functional/lua/hl_spec.lua b/test/functional/lua/hl_spec.lua index 7d7ec4dcb8e..8151ed56942 100644 --- a/test/functional/lua/hl_spec.lua +++ b/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 diff --git a/test/functional/lua/inspector_spec.lua b/test/functional/lua/inspector_spec.lua index 59b85874b1f..703d0c3687d 100644 --- a/test/functional/lua/inspector_spec.lua +++ b/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 diff --git a/test/functional/lua/iter_spec.lua b/test/functional/lua/iter_spec.lua index af49b8c5297..6e6e2bcb9eb 100644 --- a/test/functional/lua/iter_spec.lua +++ b/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 diff --git a/test/functional/lua/json_spec.lua b/test/functional/lua/json_spec.lua index 7d1ba36b7bd..735c5cd4597 100644 --- a/test/functional/lua/json_spec.lua +++ b/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 diff --git a/test/functional/lua/list_spec.lua b/test/functional/lua/list_spec.lua index 72e7f334d28..677862b127b 100644 --- a/test/functional/lua/list_spec.lua +++ b/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() diff --git a/test/functional/lua/loader_spec.lua b/test/functional/lua/loader_spec.lua index 20d3a940b25..8ddd5c96849 100644 --- a/test/functional/lua/loader_spec.lua +++ b/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 diff --git a/test/functional/lua/log_spec.lua b/test/functional/lua/log_spec.lua index ca5f3911322..0dc13e1a893 100644 --- a/test/functional/lua/log_spec.lua +++ b/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 diff --git a/test/functional/lua/luaeval_spec.lua b/test/functional/lua/luaeval_spec.lua index e4591a3a60c..86648684a2e 100644 --- a/test/functional/lua/luaeval_spec.lua +++ b/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 diff --git a/test/functional/lua/mpack_spec.lua b/test/functional/lua/mpack_spec.lua index 223e1c96e8f..b9b742301b7 100644 --- a/test/functional/lua/mpack_spec.lua +++ b/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 diff --git a/test/functional/lua/net_spec.lua b/test/functional/lua/net_spec.lua index 891de0a320e..6e9fc88cc9f 100644 --- a/test/functional/lua/net_spec.lua +++ b/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 diff --git a/test/functional/lua/option_and_var_spec.lua b/test/functional/lua/option_and_var_spec.lua index 20e99d65053..c3c60f6643e 100644 --- a/test/functional/lua/option_and_var_spec.lua +++ b/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 diff --git a/test/functional/lua/overrides_spec.lua b/test/functional/lua/overrides_spec.lua index f79dcb86d58..ab9f934a4c2 100644 --- a/test/functional/lua/overrides_spec.lua +++ b/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 diff --git a/test/functional/lua/pos_spec.lua b/test/functional/lua/pos_spec.lua index 1cd33de60ea..03a9de0c21d 100644 --- a/test/functional/lua/pos_spec.lua +++ b/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 diff --git a/test/functional/lua/range_spec.lua b/test/functional/lua/range_spec.lua index fff29acd7b5..5c83702ec38 100644 --- a/test/functional/lua/range_spec.lua +++ b/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 diff --git a/test/functional/lua/secure_spec.lua b/test/functional/lua/secure_spec.lua index bb1f68fb74c..ab72f3ae275 100644 --- a/test/functional/lua/secure_spec.lua +++ b/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 diff --git a/test/functional/lua/snippet_spec.lua b/test/functional/lua/snippet_spec.lua index be974ad1074..36cf2ef7f5a 100644 --- a/test/functional/lua/snippet_spec.lua +++ b/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 diff --git a/test/functional/lua/spell_spec.lua b/test/functional/lua/spell_spec.lua index af7d08b3909..c0694b6d346 100644 --- a/test/functional/lua/spell_spec.lua +++ b/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 diff --git a/test/functional/lua/ssh_spec.lua b/test/functional/lua/ssh_spec.lua index 925a902ef04..f0b9e9f6091 100644 --- a/test/functional/lua/ssh_spec.lua +++ b/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() diff --git a/test/functional/lua/system_spec.lua b/test/functional/lua/system_spec.lua index e7a7448fa75..4ebae80b3d3 100644 --- a/test/functional/lua/system_spec.lua +++ b/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 diff --git a/test/functional/lua/text_spec.lua b/test/functional/lua/text_spec.lua index 74cceb74553..a4a41dc8624 100644 --- a/test/functional/lua/text_spec.lua +++ b/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 diff --git a/test/functional/lua/thread_spec.lua b/test/functional/lua/thread_spec.lua index 1232b3843df..814c1bb611a 100644 --- a/test/functional/lua/thread_spec.lua +++ b/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 diff --git a/test/functional/lua/time_spec.lua b/test/functional/lua/time_spec.lua index a6d6f993dc4..6ae40cd9874 100644 --- a/test/functional/lua/time_spec.lua +++ b/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 diff --git a/test/functional/lua/ui_event_spec.lua b/test/functional/lua/ui_event_spec.lua index aa90c810c87..b0393feb8da 100644 --- a/test/functional/lua/ui_event_spec.lua +++ b/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 diff --git a/test/functional/lua/ui_select_spec.lua b/test/functional/lua/ui_select_spec.lua index e41be74a1f0..cac23aa1eda 100644 --- a/test/functional/lua/ui_select_spec.lua +++ b/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 diff --git a/test/functional/lua/ui_spec.lua b/test/functional/lua/ui_spec.lua index 5864dca484a..8cd371b7147 100644 --- a/test/functional/lua/ui_spec.lua +++ b/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 diff --git a/test/functional/lua/uri_spec.lua b/test/functional/lua/uri_spec.lua index 76e11d65a79..9cd8936b17c 100644 --- a/test/functional/lua/uri_spec.lua +++ b/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 diff --git a/test/functional/lua/uv_spec.lua b/test/functional/lua/uv_spec.lua index 49b60669d4d..d048fb0f54b 100644 --- a/test/functional/lua/uv_spec.lua +++ b/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 diff --git a/test/functional/lua/version_spec.lua b/test/functional/lua/version_spec.lua index 6033a715ef4..c40733ff192 100644 --- a/test/functional/lua/version_spec.lua +++ b/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 diff --git a/test/functional/lua/vim_spec.lua b/test/functional/lua/vim_spec.lua index f31f4257b53..844bef111f7 100644 --- a/test/functional/lua/vim_spec.lua +++ b/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 diff --git a/test/functional/lua/watch_spec.lua b/test/functional/lua/watch_spec.lua index 5684475056e..0bbb36b3bc9 100644 --- a/test/functional/lua/watch_spec.lua +++ b/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 diff --git a/test/functional/lua/with_spec.lua b/test/functional/lua/with_spec.lua index cbb3660216f..2d134c3da31 100644 --- a/test/functional/lua/with_spec.lua +++ b/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 diff --git a/test/functional/lua/xdiff_spec.lua b/test/functional/lua/xdiff_spec.lua index 963cb6b5fc5..aded8266bd1 100644 --- a/test/functional/lua/xdiff_spec.lua +++ b/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 diff --git a/test/functional/options/autochdir_spec.lua b/test/functional/options/autochdir_spec.lua index 612ede4681e..983e2a1c835 100644 --- a/test/functional/options/autochdir_spec.lua +++ b/test/functional/options/autochdir_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 fn = n.fn diff --git a/test/functional/options/autoread_spec.lua b/test/functional/options/autoread_spec.lua index 54625ba73fd..104d89a21ad 100644 --- a/test/functional/options/autoread_spec.lua +++ b/test/functional/options/autoread_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 diff --git a/test/functional/options/belloff_spec.lua b/test/functional/options/belloff_spec.lua index 575e79d1a9c..f6cddae22e4 100644 --- a/test/functional/options/belloff_spec.lua +++ b/test/functional/options/belloff_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 api = n.api diff --git a/test/functional/options/chars_spec.lua b/test/functional/options/chars_spec.lua index 42ca41a145e..07db2564a37 100644 --- a/test/functional/options/chars_spec.lua +++ b/test/functional/options/chars_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, command = n.clear, n.command local pcall_err = t.pcall_err local eval = n.eval diff --git a/test/functional/options/cursorbind_spec.lua b/test/functional/options/cursorbind_spec.lua index 21e0ba8e753..c9f242485a6 100644 --- a/test/functional/options/cursorbind_spec.lua +++ b/test/functional/options/cursorbind_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 exec = n.exec diff --git a/test/functional/options/defaults_spec.lua b/test/functional/options/defaults_spec.lua index 0f2db3fb4ef..17ca041d77d 100644 --- a/test/functional/options/defaults_spec.lua +++ b/test/functional/options/defaults_spec.lua @@ -8,6 +8,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 assert_alive = n.assert_alive local assert_log = t.assert_log local pcall_err = t.pcall_err diff --git a/test/functional/options/keymap_spec.lua b/test/functional/options/keymap_spec.lua index 21e6ab97ff5..902b47b3cb4 100644 --- a/test/functional/options/keymap_spec.lua +++ b/test/functional/options/keymap_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, feed, eq = n.clear, n.feed, t.eq local expect, command, eval = n.expect, n.command, n.eval local insert, call = n.insert, n.call diff --git a/test/functional/options/modified_spec.lua b/test/functional/options/modified_spec.lua index 956deb70fff..ff74c255014 100644 --- a/test/functional/options/modified_spec.lua +++ b/test/functional/options/modified_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 api = n.api diff --git a/test/functional/options/mousescroll_spec.lua b/test/functional/options/mousescroll_spec.lua index eaa23c4ab60..a437764f7e4 100644 --- a/test/functional/options/mousescroll_spec.lua +++ b/test/functional/options/mousescroll_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 command = n.command local clear = n.clear local eval = n.eval diff --git a/test/functional/options/num_options_spec.lua b/test/functional/options/num_options_spec.lua index e63e72e372a..33562756a56 100644 --- a/test/functional/options/num_options_spec.lua +++ b/test/functional/options/num_options_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 clear, command, eval, eq, api = n.clear, n.command, n.eval, t.eq, n.api local matches, pcall_err = t.matches, t.pcall_err diff --git a/test/functional/options/shell_spec.lua b/test/functional/options/shell_spec.lua index 32b368ff7b1..645b3c178ef 100644 --- a/test/functional/options/shell_spec.lua +++ b/test/functional/options/shell_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 eq = t.eq local is_os = t.is_os local skip = t.skip diff --git a/test/functional/options/shortmess_spec.lua b/test/functional/options/shortmess_spec.lua index 04dbada7d84..6aa3fd90bb3 100644 --- a/test/functional/options/shortmess_spec.lua +++ b/test/functional/options/shortmess_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 diff --git a/test/functional/options/tabstop_spec.lua b/test/functional/options/tabstop_spec.lua index 4ddbb13a0ed..a3d74e6d145 100644 --- a/test/functional/options/tabstop_spec.lua +++ b/test/functional/options/tabstop_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 assert_alive = n.assert_alive local clear = n.clear local feed = n.feed diff --git a/test/functional/options/winfixbuf_spec.lua b/test/functional/options/winfixbuf_spec.lua index b639f419baa..73e834b708b 100644 --- a/test/functional/options/winfixbuf_spec.lua +++ b/test/functional/options/winfixbuf_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 pcall_err = t.pcall_err local clear = n.clear diff --git a/test/functional/plugin/cfilter_spec.lua b/test/functional/plugin/cfilter_spec.lua index 220404a934b..7ffd94da326 100644 --- a/test/functional/plugin/cfilter_spec.lua +++ b/test/functional/plugin/cfilter_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 diff --git a/test/functional/plugin/difftool_spec.lua b/test/functional/plugin/difftool_spec.lua index c1ab1f92f98..00f3e560c0b 100644 --- a/test/functional/plugin/difftool_spec.lua +++ b/test/functional/plugin/difftool_spec.lua @@ -1,6 +1,8 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() +local describe, it, before_each, setup, teardown, finally = + t.describe, t.it, t.before_each, t.setup, t.teardown, t.finally local clear = n.clear local command = n.command local eq = t.eq diff --git a/test/functional/plugin/dir_spec.lua b/test/functional/plugin/dir_spec.lua index 4bf1ec75e24..5cc9e7fef86 100644 --- a/test/functional/plugin/dir_spec.lua +++ b/test/functional/plugin/dir_spec.lua @@ -1,6 +1,8 @@ local n = require('test.functional.testnvim')() local t = require('test.testutil') +local describe, it, after_each, pending, finally = + t.describe, t.it, t.after_each, t.pending, t.finally local api = n.api local command = n.command local eq = t.eq diff --git a/test/functional/plugin/editorconfig_spec.lua b/test/functional/plugin/editorconfig_spec.lua index 74307814fe3..f3f5fd31def 100644 --- a/test/functional/plugin/editorconfig_spec.lua +++ b/test/functional/plugin/editorconfig_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 diff --git a/test/functional/plugin/health_spec.lua b/test/functional/plugin/health_spec.lua index 5b786ec3cb5..bd3d9fae51d 100644 --- a/test/functional/plugin/health_spec.lua +++ b/test/functional/plugin/health_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 curbuf_contents = n.curbuf_contents local command = n.command diff --git a/test/functional/plugin/lsp/buf_spec.lua b/test/functional/plugin/lsp/buf_spec.lua index fe785c35dd0..f981ecbf81d 100644 --- a/test/functional/plugin/lsp/buf_spec.lua +++ b/test/functional/plugin/lsp/buf_spec.lua @@ -3,6 +3,8 @@ local n = require('test.functional.testnvim')() local t_lsp = require('test.functional.plugin.lsp.testutil') +local describe, it, before_each, after_each, teardown = + t.describe, t.it, t.before_each, t.after_each, t.teardown local command = n.command local eq = t.eq local exec_lua = n.exec_lua diff --git a/test/functional/plugin/lsp/codelens_spec.lua b/test/functional/plugin/lsp/codelens_spec.lua index 14c94bcc10e..799d6655da4 100644 --- a/test/functional/plugin/lsp/codelens_spec.lua +++ b/test/functional/plugin/lsp/codelens_spec.lua @@ -3,6 +3,7 @@ local n = require('test.functional.testnvim')() local t_lsp = require('test.functional.plugin.lsp.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 dedent = t.dedent local eq = t.eq diff --git a/test/functional/plugin/lsp/completion_spec.lua b/test/functional/plugin/lsp/completion_spec.lua index 70ef4fdbb65..1a6bd1f4f19 100644 --- a/test/functional/plugin/lsp/completion_spec.lua +++ b/test/functional/plugin/lsp/completion_spec.lua @@ -3,6 +3,7 @@ local t = require('test.testutil') local t_lsp = require('test.functional.plugin.lsp.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 eq = t.eq local neq = t.neq diff --git a/test/functional/plugin/lsp/diagnostic_spec.lua b/test/functional/plugin/lsp/diagnostic_spec.lua index 176be2dfad2..ec36a36741f 100644 --- a/test/functional/plugin/lsp/diagnostic_spec.lua +++ b/test/functional/plugin/lsp/diagnostic_spec.lua @@ -3,6 +3,7 @@ local n = require('test.functional.testnvim')() local t_lsp = require('test.functional.plugin.lsp.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 local eq = t.eq diff --git a/test/functional/plugin/lsp/document_color_spec.lua b/test/functional/plugin/lsp/document_color_spec.lua index 2c373c5ec6a..1d51611dc58 100644 --- a/test/functional/plugin/lsp/document_color_spec.lua +++ b/test/functional/plugin/lsp/document_color_spec.lua @@ -3,6 +3,7 @@ local n = require('test.functional.testnvim')() local t_lsp = require('test.functional.plugin.lsp.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 dedent = t.dedent local eq = t.eq diff --git a/test/functional/plugin/lsp/folding_range_spec.lua b/test/functional/plugin/lsp/folding_range_spec.lua index 5c85887503c..e9729e4bc35 100644 --- a/test/functional/plugin/lsp/folding_range_spec.lua +++ b/test/functional/plugin/lsp/folding_range_spec.lua @@ -3,6 +3,7 @@ local n = require('test.functional.testnvim')() local Screen = require('test.functional.ui.screen') local t_lsp = require('test.functional.plugin.lsp.testutil') +local describe, it, before_each, after_each = t.describe, t.it, t.before_each, t.after_each local eq = t.eq local clear_notrace = t_lsp.clear_notrace diff --git a/test/functional/plugin/lsp/incremental_sync_spec.lua b/test/functional/plugin/lsp/incremental_sync_spec.lua index 0bca1fa4ca6..cd7829ea7c6 100644 --- a/test/functional/plugin/lsp/incremental_sync_spec.lua +++ b/test/functional/plugin/lsp/incremental_sync_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 api = n.api local clear = n.clear local eq = t.eq diff --git a/test/functional/plugin/lsp/inlay_hint_spec.lua b/test/functional/plugin/lsp/inlay_hint_spec.lua index cb5f44ef394..aa8d92bf972 100644 --- a/test/functional/plugin/lsp/inlay_hint_spec.lua +++ b/test/functional/plugin/lsp/inlay_hint_spec.lua @@ -3,6 +3,7 @@ local n = require('test.functional.testnvim')() local Screen = require('test.functional.ui.screen') local t_lsp = require('test.functional.plugin.lsp.testutil') +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 dedent = t.dedent diff --git a/test/functional/plugin/lsp/inline_completion_spec.lua b/test/functional/plugin/lsp/inline_completion_spec.lua index a5ecf5fdd5a..529f0b41262 100644 --- a/test/functional/plugin/lsp/inline_completion_spec.lua +++ b/test/functional/plugin/lsp/inline_completion_spec.lua @@ -3,6 +3,7 @@ local n = require('test.functional.testnvim')() local t_lsp = require('test.functional.plugin.lsp.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 dedent = t.dedent local eq = t.eq diff --git a/test/functional/plugin/lsp/linked_editing_range_spec.lua b/test/functional/plugin/lsp/linked_editing_range_spec.lua index 601df123e03..8d022e6e72a 100644 --- a/test/functional/plugin/lsp/linked_editing_range_spec.lua +++ b/test/functional/plugin/lsp/linked_editing_range_spec.lua @@ -2,6 +2,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() local t_lsp = require('test.functional.plugin.lsp.testutil') +local describe, it, before_each = t.describe, t.it, t.before_each local eq = t.eq local exec_lua = n.exec_lua local insert = n.insert diff --git a/test/functional/plugin/lsp/on_type_formatting_spec.lua b/test/functional/plugin/lsp/on_type_formatting_spec.lua index c6ebcc425b2..7ac034309d2 100644 --- a/test/functional/plugin/lsp/on_type_formatting_spec.lua +++ b/test/functional/plugin/lsp/on_type_formatting_spec.lua @@ -1,6 +1,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() local t_lsp = require('test.functional.plugin.lsp.testutil') +local describe, it, before_each = t.describe, t.it, t.before_each local retry = t.retry local eq = t.eq diff --git a/test/functional/plugin/lsp/selection_range_spec.lua b/test/functional/plugin/lsp/selection_range_spec.lua index 074b1a29923..04a354ce568 100644 --- a/test/functional/plugin/lsp/selection_range_spec.lua +++ b/test/functional/plugin/lsp/selection_range_spec.lua @@ -3,6 +3,7 @@ local n = require('test.functional.testnvim')() local t_lsp = require('test.functional.plugin.lsp.testutil') local Screen = require('test.functional.ui.screen') +local describe, it, before_each = t.describe, t.it, t.before_each local dedent = t.dedent local exec_lua = n.exec_lua local insert = n.insert diff --git a/test/functional/plugin/lsp/semantic_tokens_spec.lua b/test/functional/plugin/lsp/semantic_tokens_spec.lua index 0853abf3fe8..354d60b0a68 100644 --- a/test/functional/plugin/lsp/semantic_tokens_spec.lua +++ b/test/functional/plugin/lsp/semantic_tokens_spec.lua @@ -3,6 +3,7 @@ local n = require('test.functional.testnvim')() local Screen = require('test.functional.ui.screen') local t_lsp = require('test.functional.plugin.lsp.testutil') +local describe, it, before_each, after_each = t.describe, t.it, t.before_each, t.after_each local command = n.command local dedent = t.dedent local eq = t.eq diff --git a/test/functional/plugin/lsp/snippet_spec.lua b/test/functional/plugin/lsp/snippet_spec.lua index 4cba151d3b4..ded79eadf96 100644 --- a/test/functional/plugin/lsp/snippet_spec.lua +++ b/test/functional/plugin/lsp/snippet_spec.lua @@ -2,6 +2,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() local snippet = require('vim.lsp._snippet_grammar') +local describe, it, before_each = t.describe, t.it, t.before_each local type = snippet.NodeType local eq = t.eq diff --git a/test/functional/plugin/lsp/util_spec.lua b/test/functional/plugin/lsp/util_spec.lua index aaeb383d6c1..8f65cc25390 100644 --- a/test/functional/plugin/lsp/util_spec.lua +++ b/test/functional/plugin/lsp/util_spec.lua @@ -4,6 +4,7 @@ local Screen = require('test.functional.ui.screen') local t_lsp = require('test.functional.plugin.lsp.testutil') +local describe, it, before_each, after_each = t.describe, t.it, t.before_each, t.after_each local feed = n.feed local eq = t.eq local exec_lua = n.exec_lua diff --git a/test/functional/plugin/lsp_spec.lua b/test/functional/plugin/lsp_spec.lua index 1f6d299d4c4..9738b6f6501 100644 --- a/test/functional/plugin/lsp_spec.lua +++ b/test/functional/plugin/lsp_spec.lua @@ -3,6 +3,8 @@ local n = require('test.functional.testnvim')() local t_lsp = require('test.functional.plugin.lsp.testutil') +local describe, it, before_each, after_each, setup, teardown, pending = + t.describe, t.it, t.before_each, t.after_each, t.setup, t.teardown, t.pending local buf_lines = n.buf_lines local command = n.command local dedent = t.dedent diff --git a/test/functional/plugin/man_spec.lua b/test/functional/plugin/man_spec.lua index 086e3f5f3a2..330b10e4dc2 100644 --- a/test/functional/plugin/man_spec.lua +++ b/test/functional/plugin/man_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 command, feed = n.command, n.feed local dedent = t.dedent local clear = n.clear diff --git a/test/functional/plugin/matchparen_spec.lua b/test/functional/plugin/matchparen_spec.lua index b2bbdb2ef6a..04a099a36dc 100644 --- a/test/functional/plugin/matchparen_spec.lua +++ b/test/functional/plugin/matchparen_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 api = n.api diff --git a/test/functional/plugin/msgpack_spec.lua b/test/functional/plugin/msgpack_spec.lua index 090b45b13b1..a2255a38554 100644 --- a/test/functional/plugin/msgpack_spec.lua +++ b/test/functional/plugin/msgpack_spec.lua @@ -1,6 +1,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() +local describe, it, setup = t.describe, t.it, t.setup local clear = n.clear local api = n.api local eq = t.eq diff --git a/test/functional/plugin/optwin_spec.lua b/test/functional/plugin/optwin_spec.lua index 2e9a990fee6..e2777b0d10e 100644 --- a/test/functional/plugin/optwin_spec.lua +++ b/test/functional/plugin/optwin_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 command = n.command local api = n.api local fn = n.fn diff --git a/test/functional/plugin/pack_spec.lua b/test/functional/plugin/pack_spec.lua index 6faed91a094..11a2a1bedc9 100644 --- a/test/functional/plugin/pack_spec.lua +++ b/test/functional/plugin/pack_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 = + t.describe, t.it, t.before_each, t.after_each, t.setup, t.teardown local skip_integ = os.getenv('NVIM_TEST_INTEG') ~= '1' local api = n.api diff --git a/test/functional/plugin/shada_spec.lua b/test/functional/plugin/shada_spec.lua index 98fba656ff6..ef0574a69be 100644 --- a/test/functional/plugin/shada_spec.lua +++ b/test/functional/plugin/shada_spec.lua @@ -3,6 +3,8 @@ local n = require('test.functional.testnvim')() local Screen = require('test.functional.ui.screen') local t_shada = require('test.functional.shada.testutil') +local describe, it, before_each, setup, teardown, finally = + t.describe, t.it, t.before_each, t.setup, t.teardown, t.finally local clear = n.clear local eq, api, nvim_eval, nvim_command, fn, nvim_feed = t.eq, n.api, n.eval, n.command, n.fn, n.feed local neq = t.neq diff --git a/test/functional/plugin/spellfile_spec.lua b/test/functional/plugin/spellfile_spec.lua index 38ffb6e6c09..31581426afc 100644 --- a/test/functional/plugin/spellfile_spec.lua +++ b/test/functional/plugin/spellfile_spec.lua @@ -1,6 +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 eq = t.eq local neq = t.neq local exec_lua = n.exec_lua diff --git a/test/functional/plugin/tohtml_spec.lua b/test/functional/plugin/tohtml_spec.lua index f6773922344..c359fb37228 100644 --- a/test/functional/plugin/tohtml_spec.lua +++ b/test/functional/plugin/tohtml_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 exec = n.exec local exec_lua = n.exec_lua diff --git a/test/functional/plugin/tutor_spec.lua b/test/functional/plugin/tutor_spec.lua index e777e764375..9de1e5564de 100644 --- a/test/functional/plugin/tutor_spec.lua +++ b/test/functional/plugin/tutor_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 feed = n.feed diff --git a/test/functional/plugin/undotree_spec.lua b/test/functional/plugin/undotree_spec.lua index c21932e58c8..1a9b55006ab 100644 --- a/test/functional/plugin/undotree_spec.lua +++ b/test/functional/plugin/undotree_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 diff --git a/test/functional/plugin/vim_syntax_spec.lua b/test/functional/plugin/vim_syntax_spec.lua index bdb4534cbaf..fd751b4fea5 100644 --- a/test/functional/plugin/vim_syntax_spec.lua +++ b/test/functional/plugin/vim_syntax_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 = n.exec local api = n.api diff --git a/test/functional/provider/clipboard_spec.lua b/test/functional/provider/clipboard_spec.lua index 5666927d6e4..adf92172120 100644 --- a/test/functional/provider/clipboard_spec.lua +++ b/test/functional/provider/clipboard_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, eq, eval, source = n.expect, t.eq, n.eval, n.source local command = n.command diff --git a/test/functional/provider/define_spec.lua b/test/functional/provider/define_spec.lua index 3945486d98f..c5d6bcf63db 100644 --- a/test/functional/provider/define_spec.lua +++ b/test/functional/provider/define_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 eval, command = n.eval, n.command local eq, run, stop = t.eq, n.run, n.stop local clear = n.clear diff --git a/test/functional/provider/nodejs_spec.lua b/test/functional/provider/nodejs_spec.lua index a67ad36f791..f7368058464 100644 --- a/test/functional/provider/nodejs_spec.lua +++ b/test/functional/provider/nodejs_spec.lua @@ -1,6 +1,8 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() +local describe, it, before_each, teardown, pending = + t.describe, t.it, t.before_each, t.teardown, t.pending local eq, clear = t.eq, n.clear local missing_provider = n.missing_provider local command = n.command diff --git a/test/functional/provider/perl_spec.lua b/test/functional/provider/perl_spec.lua index 411e684a3e3..583005d6f34 100644 --- a/test/functional/provider/perl_spec.lua +++ b/test/functional/provider/perl_spec.lua @@ -1,6 +1,8 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() +local describe, it, before_each, teardown, pending = + t.describe, t.it, t.before_each, t.teardown, t.pending local eq, clear = t.eq, n.clear local missing_provider = n.missing_provider local command = n.command diff --git a/test/functional/provider/provider_spec.lua b/test/functional/provider/provider_spec.lua index caed30ab0b8..6bf2082f7fe 100644 --- a/test/functional/provider/provider_spec.lua +++ b/test/functional/provider/provider_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 = n.clear, n.eval local command = n.command local eq = t.eq diff --git a/test/functional/provider/python3_spec.lua b/test/functional/provider/python3_spec.lua index 8b2756c0196..0c14466af61 100644 --- a/test/functional/provider/python3_spec.lua +++ b/test/functional/provider/python3_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 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 diff --git a/test/functional/provider/ruby_spec.lua b/test/functional/provider/ruby_spec.lua index 8a72a78c642..54f2ee63f56 100644 --- a/test/functional/provider/ruby_spec.lua +++ b/test/functional/provider/ruby_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 assert_alive = n.assert_alive local clear = n.clear local command = n.command diff --git a/test/functional/script/clint_spec.lua b/test/functional/script/clint_spec.lua index aca1cd2bcbe..93d2f6c50fa 100644 --- a/test/functional/script/clint_spec.lua +++ b/test/functional/script/clint_spec.lua @@ -1,6 +1,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() +local describe, it = t.describe, t.it describe('clint.lua', function() local clint_path = 'src/clint.lua' local test_file = 'test/functional/fixtures/clint_test.c' diff --git a/test/functional/script/luacats_grammar_spec.lua b/test/functional/script/luacats_grammar_spec.lua index 467d85d3a69..ccb5bbbeb2a 100644 --- a/test/functional/script/luacats_grammar_spec.lua +++ b/test/functional/script/luacats_grammar_spec.lua @@ -1,5 +1,6 @@ local t = require('test.testutil') +local describe, it = t.describe, t.it local eq = t.eq local grammar = require('gen.luacats_grammar') diff --git a/test/functional/script/luacats_parser_spec.lua b/test/functional/script/luacats_parser_spec.lua index 68b322285e0..98b6d08ca42 100644 --- a/test/functional/script/luacats_parser_spec.lua +++ b/test/functional/script/luacats_parser_spec.lua @@ -1,5 +1,6 @@ local t = require('test.testutil') +local describe, it = t.describe, t.it local dedent = t.dedent local eq = t.eq diff --git a/test/functional/script/text_utils_spec.lua b/test/functional/script/text_utils_spec.lua index 72239f5f5e7..65e5ef8297a 100644 --- a/test/functional/script/text_utils_spec.lua +++ b/test/functional/script/text_utils_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 diff --git a/test/functional/shada/buffers_spec.lua b/test/functional/shada/buffers_spec.lua index 2c1425058cb..eea6e997f85 100644 --- a/test/functional/shada/buffers_spec.lua +++ b/test/functional/shada/buffers_spec.lua @@ -3,6 +3,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() local t_shada = require('test.functional.shada.testutil') +local describe, it, after_each = t.describe, t.it, t.after_each local nvim_command, fn, eq, api = n.command, n.fn, t.eq, n.api local expect_exit = n.expect_exit diff --git a/test/functional/shada/compatibility_spec.lua b/test/functional/shada/compatibility_spec.lua index 7abbe7975c3..0eb6add8189 100644 --- a/test/functional/shada/compatibility_spec.lua +++ b/test/functional/shada/compatibility_spec.lua @@ -3,6 +3,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() local t_shada = require('test.functional.shada.testutil') +local describe, it, before_each, after_each = t.describe, t.it, t.before_each, t.after_each local nvim_command, fn, eq = n.command, n.fn, t.eq local reset, clear, get_shada_rw = t_shada.reset, t_shada.clear, t_shada.get_shada_rw local read_shada_file = t_shada.read_shada_file diff --git a/test/functional/shada/errors_spec.lua b/test/functional/shada/errors_spec.lua index fa7aa7d71f3..1ab68b2bf21 100644 --- a/test/functional/shada/errors_spec.lua +++ b/test/functional/shada/errors_spec.lua @@ -3,6 +3,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() local t_shada = require('test.functional.shada.testutil') +local describe, it, before_each, after_each = t.describe, t.it, t.before_each, t.after_each local nvim_command, eq = n.command, t.eq local reset, clear, get_shada_rw = t_shada.reset, t_shada.clear, t_shada.get_shada_rw diff --git a/test/functional/shada/history_spec.lua b/test/functional/shada/history_spec.lua index 84d5415af85..20b0c211efc 100644 --- a/test/functional/shada/history_spec.lua +++ b/test/functional/shada/history_spec.lua @@ -3,6 +3,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() local t_shada = require('test.functional.shada.testutil') +local describe, it, before_each, after_each = t.describe, t.it, t.before_each, t.after_each local nvim_command, fn, api, nvim_feed, eq = n.command, n.fn, n.api, n.feed, t.eq local assert_alive = n.assert_alive local expect_exit = n.expect_exit diff --git a/test/functional/shada/marks_spec.lua b/test/functional/shada/marks_spec.lua index 8ec73b8dafb..29c88ef01bf 100644 --- a/test/functional/shada/marks_spec.lua +++ b/test/functional/shada/marks_spec.lua @@ -1,5 +1,6 @@ -- ShaDa marks saving/reading support local t = require('test.testutil') +local describe, it, before_each, after_each = t.describe, t.it, t.before_each, t.after_each local pcall_err = t.pcall_err local n = require('test.functional.testnvim')() local t_shada = require('test.functional.shada.testutil') diff --git a/test/functional/shada/merging_spec.lua b/test/functional/shada/merging_spec.lua index d5744d42f1b..8834ba994d5 100644 --- a/test/functional/shada/merging_spec.lua +++ b/test/functional/shada/merging_spec.lua @@ -3,6 +3,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() local t_shada = require('test.functional.shada.testutil') +local describe, it, before_each, after_each = t.describe, t.it, t.before_each, t.after_each local nvim_command, fn, eq = n.command, n.fn, t.eq local exec_capture = n.exec_capture local api = n.api diff --git a/test/functional/shada/registers_spec.lua b/test/functional/shada/registers_spec.lua index 1e6249807e5..74e5b96565e 100644 --- a/test/functional/shada/registers_spec.lua +++ b/test/functional/shada/registers_spec.lua @@ -3,6 +3,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() local t_shada = require('test.functional.shada.testutil') +local describe, it, before_each, after_each = t.describe, t.it, t.before_each, t.after_each local nvim_command, fn, eq = n.command, n.fn, t.eq local reset, clear = t_shada.reset, t_shada.clear local expect_exit = n.expect_exit diff --git a/test/functional/shada/shada_spec.lua b/test/functional/shada/shada_spec.lua index 5ecfd3d9ff1..f04644858ae 100644 --- a/test/functional/shada/shada_spec.lua +++ b/test/functional/shada/shada_spec.lua @@ -2,6 +2,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() local t_shada = require('test.functional.shada.testutil') +local describe, it, before_each, after_each = t.describe, t.it, t.before_each, t.after_each local uv = vim.uv local paths = t.paths local pcall_err = t.pcall_err diff --git a/test/functional/shada/variables_spec.lua b/test/functional/shada/variables_spec.lua index 2fea7278ef3..8b7733d6b4c 100644 --- a/test/functional/shada/variables_spec.lua +++ b/test/functional/shada/variables_spec.lua @@ -3,6 +3,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() local t_shada = require('test.functional.shada.testutil') +local describe, it, before_each, after_each = t.describe, t.it, t.before_each, t.after_each local api, fn, nvim_command, eq, eval = n.api, n.fn, n.command, t.eq, n.eval local expect_exit = n.expect_exit local reset, clear = t_shada.reset, t_shada.clear diff --git a/test/functional/terminal/altscreen_spec.lua b/test/functional/terminal/altscreen_spec.lua index 40917dd0f70..4453cc1480d 100644 --- a/test/functional/terminal/altscreen_spec.lua +++ b/test/functional/terminal/altscreen_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 = t.describe, t.it, t.before_each local clear, eq, api = n.clear, t.eq, n.api local feed = n.feed local feed_data = tt.feed_data diff --git a/test/functional/terminal/api_spec.lua b/test/functional/terminal/api_spec.lua index 691f64ae3e0..5187aefe461 100644 --- a/test/functional/terminal/api_spec.lua +++ b/test/functional/terminal/api_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, after_each = t.describe, t.it, t.before_each, t.after_each local ok = t.ok if t.skip(t.is_os('win')) then diff --git a/test/functional/terminal/buffer_spec.lua b/test/functional/terminal/buffer_spec.lua index bf1800effc6..4ec34f17ff0 100644 --- a/test/functional/terminal/buffer_spec.lua +++ b/test/functional/terminal/buffer_spec.lua @@ -3,6 +3,7 @@ local n = require('test.functional.testnvim')() local Screen = require('test.functional.ui.screen') local tt = require('test.functional.testterm') +local describe, it, before_each, finally = t.describe, t.it, t.before_each, t.finally local assert_alive = n.assert_alive local feed, clear = n.feed, n.clear local poke_eventloop = n.poke_eventloop diff --git a/test/functional/terminal/channel_spec.lua b/test/functional/terminal/channel_spec.lua index 4cb71889254..8d6d8d7896e 100644 --- a/test/functional/terminal/channel_spec.lua +++ b/test/functional/terminal/channel_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 eval = n.eval diff --git a/test/functional/terminal/clipboard_spec.lua b/test/functional/terminal/clipboard_spec.lua index f0ce407eaab..77721f72c8e 100644 --- a/test/functional/terminal/clipboard_spec.lua +++ b/test/functional/terminal/clipboard_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 retry = t.retry diff --git a/test/functional/terminal/cursor_spec.lua b/test/functional/terminal/cursor_spec.lua index cee50971c60..495e74b24f3 100644 --- a/test/functional/terminal/cursor_spec.lua +++ b/test/functional/terminal/cursor_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 = t.describe, t.it, t.before_each local feed, clear = n.feed, n.clear local testprg, command = n.testprg, n.command local eq, eval = t.eq, n.eval diff --git a/test/functional/terminal/edit_spec.lua b/test/functional/terminal/edit_spec.lua index a9073b822ac..d9652cdcff1 100644 --- a/test/functional/terminal/edit_spec.lua +++ b/test/functional/terminal/edit_spec.lua @@ -3,6 +3,7 @@ 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 testprg = n.testprg local command = n.command local fn = n.fn diff --git a/test/functional/terminal/ex_terminal_spec.lua b/test/functional/terminal/ex_terminal_spec.lua index 62f238e6b59..96f62a4883f 100644 --- a/test/functional/terminal/ex_terminal_spec.lua +++ b/test/functional/terminal/ex_terminal_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 assert_alive = n.assert_alive local clear, poke_eventloop = n.clear, n.poke_eventloop local testprg, source, eq, neq = n.testprg, n.source, t.eq, t.neq diff --git a/test/functional/terminal/highlight_spec.lua b/test/functional/terminal/highlight_spec.lua index 7f32682a8ac..9df2777d1f0 100644 --- a/test/functional/terminal/highlight_spec.lua +++ b/test/functional/terminal/highlight_spec.lua @@ -3,6 +3,7 @@ local n = require('test.functional.testnvim')() local Screen = require('test.functional.ui.screen') local tt = require('test.functional.testterm') +local describe, it, before_each = t.describe, t.it, t.before_each local assert_alive = n.assert_alive local feed, clear = n.feed, n.clear local api = n.api diff --git a/test/functional/terminal/mouse_spec.lua b/test/functional/terminal/mouse_spec.lua index 7e7469e30f1..3aac88f73c3 100644 --- a/test/functional/terminal/mouse_spec.lua +++ b/test/functional/terminal/mouse_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 = t.describe, t.it, t.before_each local clear, eq, eval = n.clear, t.eq, n.eval local feed, api, command = n.feed, n.api, n.command local feed_data = tt.feed_data diff --git a/test/functional/terminal/parser_spec.lua b/test/functional/terminal/parser_spec.lua index 962ca24793d..208050d9f30 100644 --- a/test/functional/terminal/parser_spec.lua +++ b/test/functional/terminal/parser_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 api = n.api local assert_alive = n.assert_alive local clear = n.clear diff --git a/test/functional/terminal/scrollback_spec.lua b/test/functional/terminal/scrollback_spec.lua index 2a766040e3e..45f6ce4e9a1 100644 --- a/test/functional/terminal/scrollback_spec.lua +++ b/test/functional/terminal/scrollback_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, setup, teardown = + t.describe, t.it, t.before_each, t.setup, t.teardown local clear, eq, neq = n.clear, t.eq, t.neq local feed, testprg = n.feed, n.testprg local fn = n.fn diff --git a/test/functional/terminal/synchronized_output_spec.lua b/test/functional/terminal/synchronized_output_spec.lua index 16db6255d15..c0a9a6467f7 100644 --- a/test/functional/terminal/synchronized_output_spec.lua +++ b/test/functional/terminal/synchronized_output_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 api = n.api local eq = t.eq diff --git a/test/functional/terminal/tui_spec.lua b/test/functional/terminal/tui_spec.lua index b7578adfedd..ec288c5b8a2 100644 --- a/test/functional/terminal/tui_spec.lua +++ b/test/functional/terminal/tui_spec.lua @@ -9,6 +9,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, pending, finally = + t.describe, t.it, t.before_each, t.after_each, t.pending, t.finally local eq = t.eq local feed_data = tt.feed_data local clear = n.clear diff --git a/test/functional/terminal/window_spec.lua b/test/functional/terminal/window_spec.lua index 1754f2f9146..74d5b40790c 100644 --- a/test/functional/terminal/window_spec.lua +++ b/test/functional/terminal/window_spec.lua @@ -3,6 +3,7 @@ local n = require('test.functional.testnvim')() local Screen = require('test.functional.ui.screen') local tt = require('test.functional.testterm') +local describe, it, before_each = t.describe, t.it, t.before_each local feed_data = tt.feed_data local feed_csi = tt.feed_csi local feed, clear = n.feed, n.clear diff --git a/test/functional/terminal/window_split_tab_spec.lua b/test/functional/terminal/window_split_tab_spec.lua index 0c3da5b3a5b..8fa76f0eb5e 100644 --- a/test/functional/terminal/window_split_tab_spec.lua +++ b/test/functional/terminal/window_split_tab_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 = t.describe, t.it, t.before_each local assert_alive = n.assert_alive local clear = n.clear local feed = n.feed diff --git a/test/functional/testnvim.lua b/test/functional/testnvim.lua index c9b94a9e212..7ee91de5ad7 100644 --- a/test/functional/testnvim.lua +++ b/test/functional/testnvim.lua @@ -1167,22 +1167,13 @@ local testid = (function() end)() return function() - local g = getfenv(2) - - --- @type function? - local before_each = g.before_each - --- @type function? - local after_each = g.after_each - - if before_each then - before_each(function() + if harness.is_defining() then + harness.before_each(function() local id = ('T%d'):format(testid()) _G._nvim_test_id = id end) - end - if after_each then - after_each(function() + harness.after_each(function() close_extra_sessions(_G._nvim_test_id, true) if not vim.endswith(_G._nvim_test_id, 'x') then -- Use a different test ID for skipped tests as well as Nvim instances spawned diff --git a/test/functional/treesitter/fold_spec.lua b/test/functional/treesitter/fold_spec.lua index 5861bc51172..5cd028b3acb 100644 --- a/test/functional/treesitter/fold_spec.lua +++ b/test/functional/treesitter/fold_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 insert = n.insert diff --git a/test/functional/treesitter/highlight_spec.lua b/test/functional/treesitter/highlight_spec.lua index e88e920a63b..6d70b4718b1 100644 --- a/test/functional/treesitter/highlight_spec.lua +++ b/test/functional/treesitter/highlight_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 insert = n.insert local exec_lua = n.exec_lua diff --git a/test/functional/treesitter/inspect_tree_spec.lua b/test/functional/treesitter/inspect_tree_spec.lua index b44cf7fce65..ff5b447fc52 100644 --- a/test/functional/treesitter/inspect_tree_spec.lua +++ b/test/functional/treesitter/inspect_tree_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 dedent = t.dedent diff --git a/test/functional/treesitter/language_spec.lua b/test/functional/treesitter/language_spec.lua index 96305a611a6..d81bd7b8e56 100644 --- a/test/functional/treesitter/language_spec.lua +++ b/test/functional/treesitter/language_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 command = n.command diff --git a/test/functional/treesitter/node_spec.lua b/test/functional/treesitter/node_spec.lua index 6cba8db81c1..8bd03627d57 100644 --- a/test/functional/treesitter/node_spec.lua +++ b/test/functional/treesitter/node_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 diff --git a/test/functional/treesitter/parser_spec.lua b/test/functional/treesitter/parser_spec.lua index 56182590c64..8d201c032f7 100644 --- a/test/functional/treesitter/parser_spec.lua +++ b/test/functional/treesitter/parser_spec.lua @@ -2,6 +2,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() local ts_t = require('test.functional.treesitter.testutil') +local describe, it, before_each = t.describe, t.it, t.before_each local clear = n.clear local dedent = t.dedent local eq = t.eq diff --git a/test/functional/treesitter/query_spec.lua b/test/functional/treesitter/query_spec.lua index ed5a5bae791..04f2f519e9a 100644 --- a/test/functional/treesitter/query_spec.lua +++ b/test/functional/treesitter/query_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 dedent = t.dedent local eq = t.eq diff --git a/test/functional/treesitter/select_spec.lua b/test/functional/treesitter/select_spec.lua index 5a12d3934c9..b4b4fcbe21f 100644 --- a/test/functional/treesitter/select_spec.lua +++ b/test/functional/treesitter/select_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 fn = n.fn local clear = n.clear diff --git a/test/functional/treesitter/util_spec.lua b/test/functional/treesitter/util_spec.lua index 6b25bbbf335..c2395e8d8b4 100644 --- a/test/functional/treesitter/util_spec.lua +++ b/test/functional/treesitter/util_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 eq = t.eq diff --git a/test/functional/treesitter/wasm_spec.lua b/test/functional/treesitter/wasm_spec.lua index a3014133a93..88050990b91 100644 --- a/test/functional/treesitter/wasm_spec.lua +++ b/test/functional/treesitter/wasm_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 diff --git a/test/functional/ui/bufhl_spec.lua b/test/functional/ui/bufhl_spec.lua index f8151f5c550..05b694fb870 100644 --- a/test/functional/ui/bufhl_spec.lua +++ b/test/functional/ui/bufhl_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 clear, feed, insert = n.clear, n.feed, n.insert local command, neq = n.command, t.neq local api = n.api diff --git a/test/functional/ui/cmdline2_spec.lua b/test/functional/ui/cmdline2_spec.lua index 48e6047e8b2..731d6e31d93 100644 --- a/test/functional/ui/cmdline2_spec.lua +++ b/test/functional/ui/cmdline2_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, exec, exec_lua, feed = n.clear, n.exec, n.exec_lua, n.feed describe('cmdline2', function() diff --git a/test/functional/ui/cmdline_highlight_spec.lua b/test/functional/ui/cmdline_highlight_spec.lua index 7df14345c69..88864aacead 100644 --- a/test/functional/ui/cmdline_highlight_spec.lua +++ b/test/functional/ui/cmdline_highlight_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 feed = n.feed local clear = n.clear diff --git a/test/functional/ui/cmdline_spec.lua b/test/functional/ui/cmdline_spec.lua index 66489ccba47..aa05f04fe08 100644 --- a/test/functional/ui/cmdline_spec.lua +++ b/test/functional/ui/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, pending = t.describe, t.it, t.before_each, t.pending local clear, feed = n.clear, n.feed local source = n.source local command = n.command diff --git a/test/functional/ui/cursor_spec.lua b/test/functional/ui/cursor_spec.lua index fb636df3af4..1220121093b 100644 --- a/test/functional/ui/cursor_spec.lua +++ b/test/functional/ui/cursor_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, api = n.clear, n.api local eq = t.eq local command = n.command diff --git a/test/functional/ui/decorations_spec.lua b/test/functional/ui/decorations_spec.lua index 9b1df7fdb6e..6564f78cc59 100644 --- a/test/functional/ui/decorations_spec.lua +++ b/test/functional/ui/decorations_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 clear = n.clear local feed = n.feed local insert = n.insert diff --git a/test/functional/ui/diff_spec.lua b/test/functional/ui/diff_spec.lua index e62e3b0a959..85289cea4d5 100644 --- a/test/functional/ui/diff_spec.lua +++ b/test/functional/ui/diff_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 feed = n.feed local clear = n.clear local command = n.command diff --git a/test/functional/ui/embed_spec.lua b/test/functional/ui/embed_spec.lua index 56fb59feac1..d8dd62a7c81 100644 --- a/test/functional/ui/embed_spec.lua +++ b/test/functional/ui/embed_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, after_each, pending, finally = + t.describe, t.it, t.after_each, t.pending, t.finally local uv = vim.uv local api = n.api diff --git a/test/functional/ui/float_spec.lua b/test/functional/ui/float_spec.lua index 2b1fb1d7331..375348caea1 100644 --- a/test/functional/ui/float_spec.lua +++ b/test/functional/ui/float_spec.lua @@ -3,6 +3,7 @@ local n = require('test.functional.testnvim')() local Screen = require('test.functional.ui.screen') local os = require('os') +local describe, it, before_each, after_each, pending = t.describe, t.it, t.before_each, t.after_each, t.pending local clear, feed = n.clear, n.feed local assert_alive = n.assert_alive local command, feed_command = n.command, n.feed_command diff --git a/test/functional/ui/fold_spec.lua b/test/functional/ui/fold_spec.lua index ab8a5ccafc5..9df4aae5003 100644 --- a/test/functional/ui/fold_spec.lua +++ b/test/functional/ui/fold_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, eq = n.clear, n.feed, t.eq local command = n.command local feed_command = n.feed_command diff --git a/test/functional/ui/highlight_spec.lua b/test/functional/ui/highlight_spec.lua index c7bf2883ba0..3e33e7ace40 100644 --- a/test/functional/ui/highlight_spec.lua +++ b/test/functional/ui/highlight_spec.lua @@ -3,6 +3,7 @@ local n = require('test.functional.testnvim')() local Screen = require('test.functional.ui.screen') local os = require('os') +local describe, it, before_each, after_each = t.describe, t.it, t.before_each, t.after_each local clear, feed, insert = n.clear, n.feed, n.insert local command, exec = n.command, n.exec local eval = n.eval diff --git a/test/functional/ui/hlstate_spec.lua b/test/functional/ui/hlstate_spec.lua index 00e22bba8c8..f387c16a640 100644 --- a/test/functional/ui/hlstate_spec.lua +++ b/test/functional/ui/hlstate_spec.lua @@ -3,6 +3,7 @@ local n = require('test.functional.testnvim')() local Screen = require('test.functional.ui.screen') local tt = require('test.functional.testterm') +local describe, it, before_each = t.describe, t.it, t.before_each local clear, insert = n.clear, n.insert local command = n.command local api = n.api diff --git a/test/functional/ui/img_spec.lua b/test/functional/ui/img_spec.lua index 385f6a6a5b2..cbfe4d415f6 100644 --- a/test/functional/ui/img_spec.lua +++ b/test/functional/ui/img_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 diff --git a/test/functional/ui/inccommand_spec.lua b/test/functional/ui/inccommand_spec.lua index f1553cec7e7..f98449bb532 100644 --- a/test/functional/ui/inccommand_spec.lua +++ b/test/functional/ui/inccommand_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 @@ -2544,7 +2545,7 @@ describe(':substitute', function() end) it(':substitute with inccommand during :terminal activity', function() - if t.skip_fragile(pending) then + if t.skip_fragile(t.pending) then return end retry(2, 40000, function() diff --git a/test/functional/ui/inccommand_user_spec.lua b/test/functional/ui/inccommand_user_spec.lua index f4251329112..1ed493a3535 100644 --- a/test/functional/ui/inccommand_user_spec.lua +++ b/test/functional/ui/inccommand_user_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 clear = n.clear local eq = t.eq diff --git a/test/functional/ui/input_spec.lua b/test/functional/ui/input_spec.lua index 694543531e6..b1b4ba2789d 100644 --- a/test/functional/ui/input_spec.lua +++ b/test/functional/ui/input_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, next_msg, eq = n.feed, n.next_msg, t.eq local command = n.command diff --git a/test/functional/ui/linematch_spec.lua b/test/functional/ui/linematch_spec.lua index d0f0fac1b6e..1177f3f1b1c 100644 --- a/test/functional/ui/linematch_spec.lua +++ b/test/functional/ui/linematch_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, setup, teardown = + t.describe, t.it, t.before_each, t.setup, t.teardown local feed = n.feed local clear = n.clear local write_file = t.write_file diff --git a/test/functional/ui/messages2_spec.lua b/test/functional/ui/messages2_spec.lua index cee80fc8fb9..f600cd8ed46 100644 --- a/test/functional/ui/messages2_spec.lua +++ b/test/functional/ui/messages2_spec.lua @@ -4,6 +4,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, clear, command, exec_lua, feed = n.api, n.clear, n.command, n.exec_lua, n.feed local msg_timeout = 400 @@ -450,7 +452,7 @@ describe('messages2', function() it('showmode does not overwrite Visual word count #40824', function() if t.is_os('win') then - pending('FIXME #40843') + t.pending('FIXME #40843') end api.nvim_buf_set_lines(0, 0, -1, true, { 'one two', 'three four' }) feed('Vj') diff --git a/test/functional/ui/messages_spec.lua b/test/functional/ui/messages_spec.lua index 7e3928fc35d..427649d2293 100644 --- a/test/functional/ui/messages_spec.lua +++ b/test/functional/ui/messages_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, pending, finally = + t.describe, t.it, t.before_each, t.after_each, t.pending, t.finally local clear, feed = n.clear, n.feed local eval = n.eval local eq = t.eq diff --git a/test/functional/ui/mode_spec.lua b/test/functional/ui/mode_spec.lua index 3ca14cf1a45..84fac14c258 100644 --- a/test/functional/ui/mode_spec.lua +++ b/test/functional/ui/mode_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, insert = n.clear, n.feed, n.insert local command = n.command local retry = t.retry diff --git a/test/functional/ui/mouse_spec.lua b/test/functional/ui/mouse_spec.lua index e463b9dfbfe..a1b0648c2a1 100644 --- a/test/functional/ui/mouse_spec.lua +++ b/test/functional/ui/mouse_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, api = n.clear, n.feed, n.api local insert, feed_command = n.insert, n.feed_command local eq, fn = t.eq, n.fn diff --git a/test/functional/ui/multibyte_spec.lua b/test/functional/ui/multibyte_spec.lua index 55976a13719..2f15be9d4b5 100644 --- a/test/functional/ui/multibyte_spec.lua +++ b/test/functional/ui/multibyte_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 feed = n.feed diff --git a/test/functional/ui/multigrid_spec.lua b/test/functional/ui/multigrid_spec.lua index 0330ccf7ee7..602f34d4e5c 100644 --- a/test/functional/ui/multigrid_spec.lua +++ b/test/functional/ui/multigrid_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 feed, command, insert = n.feed, n.command, n.insert local eq = t.eq diff --git a/test/functional/ui/options_spec.lua b/test/functional/ui/options_spec.lua index 0ce427fbb10..89820c17619 100644 --- a/test/functional/ui/options_spec.lua +++ b/test/functional/ui/options_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 diff --git a/test/functional/ui/output_spec.lua b/test/functional/ui/output_spec.lua index c5a35a7ebef..896e7738975 100644 --- a/test/functional/ui/output_spec.lua +++ b/test/functional/ui/output_spec.lua @@ -3,6 +3,7 @@ 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 = t.describe, t.it, t.before_each, t.after_each local assert_alive = n.assert_alive local mkdir, write_file, rmdir = t.mkdir, t.write_file, n.rmdir local eq = t.eq diff --git a/test/functional/ui/popupmenu_spec.lua b/test/functional/ui/popupmenu_spec.lua index a865ede4250..61115c9339a 100644 --- a/test/functional/ui/popupmenu_spec.lua +++ b/test/functional/ui/popupmenu_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, feed = n.clear, n.feed local source = n.source diff --git a/test/functional/ui/quickfix_spec.lua b/test/functional/ui/quickfix_spec.lua index 477ba3ff793..6d63a49917b 100644 --- a/test/functional/ui/quickfix_spec.lua +++ b/test/functional/ui/quickfix_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, feed, api = n.clear, n.feed, n.api local insert, command = n.insert, n.command diff --git a/test/functional/ui/screen_basic_spec.lua b/test/functional/ui/screen_basic_spec.lua index db010660a35..194d1fb1c7b 100644 --- a/test/functional/ui/screen_basic_spec.lua +++ b/test/functional/ui/screen_basic_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 set_session, clear, assert_alive = n.set_session, n.clear, n.assert_alive local feed, command = n.feed, n.command local exec, exec_lua = n.exec, n.exec_lua diff --git a/test/functional/ui/scrollbind_spec.lua b/test/functional/ui/scrollbind_spec.lua index 84316762e49..1818a5c5f45 100644 --- a/test/functional/ui/scrollbind_spec.lua +++ b/test/functional/ui/scrollbind_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 Screen = require('test.functional.ui.screen') diff --git a/test/functional/ui/searchhl_spec.lua b/test/functional/ui/searchhl_spec.lua index 4e5e7e41d95..569c2b4e436 100644 --- a/test/functional/ui/searchhl_spec.lua +++ b/test/functional/ui/searchhl_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, insert = n.clear, n.feed, n.insert local command = n.command local feed_command = n.feed_command diff --git a/test/functional/ui/sign_spec.lua b/test/functional/ui/sign_spec.lua index fdbe4114ab7..9a0c4355730 100644 --- a/test/functional/ui/sign_spec.lua +++ b/test/functional/ui/sign_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, clear, eq = n.api, n.clear, t.eq local eval, exec, feed = n.eval, n.exec, n.feed local exec_lua = n.exec_lua diff --git a/test/functional/ui/spell_spec.lua b/test/functional/ui/spell_spec.lua index 01bc2564d9b..ac8c473c745 100644 --- a/test/functional/ui/spell_spec.lua +++ b/test/functional/ui/spell_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, pending = t.describe, t.it, t.before_each, t.pending local clear = n.clear local exec = n.exec local feed = n.feed diff --git a/test/functional/ui/statuscolumn_spec.lua b/test/functional/ui/statuscolumn_spec.lua index 5fe5a79826c..d7f0dcc0460 100644 --- a/test/functional/ui/statuscolumn_spec.lua +++ b/test/functional/ui/statuscolumn_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 diff --git a/test/functional/ui/statusline_spec.lua b/test/functional/ui/statusline_spec.lua index c60e1e8ee48..6d5e12625b5 100644 --- a/test/functional/ui/statusline_spec.lua +++ b/test/functional/ui/statusline_spec.lua @@ -3,6 +3,7 @@ local n = require('test.functional.testnvim')() local tt = require('test.functional.testterm') 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 command = n.command diff --git a/test/functional/ui/syntax_conceal_spec.lua b/test/functional/ui/syntax_conceal_spec.lua index 80e38d974a9..860a9bc37a3 100644 --- a/test/functional/ui/syntax_conceal_spec.lua +++ b/test/functional/ui/syntax_conceal_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, command = n.clear, n.feed, n.command local eq = t.eq local insert = n.insert diff --git a/test/functional/ui/tabline_spec.lua b/test/functional/ui/tabline_spec.lua index 6d212823ebb..25d3255437c 100644 --- a/test/functional/ui/tabline_spec.lua +++ b/test/functional/ui/tabline_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, command, eq = n.clear, n.command, t.eq local insert = n.insert local api = n.api diff --git a/test/functional/ui/title_spec.lua b/test/functional/ui/title_spec.lua index 876919d43cb..23c3b066751 100644 --- a/test/functional/ui/title_spec.lua +++ b/test/functional/ui/title_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 curwin = n.api.nvim_get_current_win diff --git a/test/functional/ui/wildmode_spec.lua b/test/functional/ui/wildmode_spec.lua index fe98abb441e..89408100485 100644 --- a/test/functional/ui/wildmode_spec.lua +++ b/test/functional/ui/wildmode_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, feed, command = n.clear, n.feed, n.command local fn = n.fn local api = n.api diff --git a/test/functional/ui/winbar_spec.lua b/test/functional/ui/winbar_spec.lua index 09810108c62..4eb45dc73d6 100644 --- a/test/functional/ui/winbar_spec.lua +++ b/test/functional/ui/winbar_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 insert = n.insert diff --git a/test/functional/vimscript/api_functions_spec.lua b/test/functional/vimscript/api_functions_spec.lua index cc08108d154..98d3434d9e2 100644 --- a/test/functional/vimscript/api_functions_spec.lua +++ b/test/functional/vimscript/api_functions_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 neq, eq, command = t.neq, t.eq, n.command local clear = n.clear local expect, eval = n.expect, n.eval diff --git a/test/functional/vimscript/buf_functions_spec.lua b/test/functional/vimscript/buf_functions_spec.lua index d2907cd22b8..23262acc81c 100644 --- a/test/functional/vimscript/buf_functions_spec.lua +++ b/test/functional/vimscript/buf_functions_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 clear = n.clear local fn = n.fn diff --git a/test/functional/vimscript/changedtick_spec.lua b/test/functional/vimscript/changedtick_spec.lua index 8842de436d6..a65700d84fe 100644 --- a/test/functional/vimscript/changedtick_spec.lua +++ b/test/functional/vimscript/changedtick_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 diff --git a/test/functional/vimscript/container_functions_spec.lua b/test/functional/vimscript/container_functions_spec.lua index 1d95bf64703..ef6556a52ad 100644 --- a/test/functional/vimscript/container_functions_spec.lua +++ b/test/functional/vimscript/container_functions_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 api = n.api diff --git a/test/functional/vimscript/environ_spec.lua b/test/functional/vimscript/environ_spec.lua index 30763d3157c..c96c25c75bd 100644 --- a/test/functional/vimscript/environ_spec.lua +++ b/test/functional/vimscript/environ_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 eq = t.eq local environ = n.fn.environ diff --git a/test/functional/vimscript/errorlist_spec.lua b/test/functional/vimscript/errorlist_spec.lua index 267a200b87f..bbb0d4885c2 100644 --- a/test/functional/vimscript/errorlist_spec.lua +++ b/test/functional/vimscript/errorlist_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 diff --git a/test/functional/vimscript/eval_spec.lua b/test/functional/vimscript/eval_spec.lua index 589c9488525..5514b1812f6 100644 --- a/test/functional/vimscript/eval_spec.lua +++ b/test/functional/vimscript/eval_spec.lua @@ -13,6 +13,8 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() local Screen = require('test.functional.ui.screen') +local describe, it, before_each, setup, teardown, pending, finally = + t.describe, t.it, t.before_each, t.setup, t.teardown, t.pending, t.finally local mkdir = t.mkdir local pcall_err = t.pcall_err local clear = n.clear diff --git a/test/functional/vimscript/executable_spec.lua b/test/functional/vimscript/executable_spec.lua index 4101d8f32d8..7b3f81fb7ca 100644 --- a/test/functional/vimscript/executable_spec.lua +++ b/test/functional/vimscript/executable_spec.lua @@ -1,6 +1,8 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() +local describe, it, before_each, setup, teardown, pending = + t.describe, t.it, t.before_each, t.setup, t.teardown, t.pending local eq, clear, call, write_file, command = t.eq, n.clear, n.call, t.write_file, n.command local eval, fn = n.eval, n.fn local is_os = t.is_os diff --git a/test/functional/vimscript/execute_spec.lua b/test/functional/vimscript/execute_spec.lua index f57f6307ea6..8a5a6d91b34 100644 --- a/test/functional/vimscript/execute_spec.lua +++ b/test/functional/vimscript/execute_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 eval = n.eval local clear = n.clear diff --git a/test/functional/vimscript/exepath_spec.lua b/test/functional/vimscript/exepath_spec.lua index 7f5214cfdc0..1dd14a079e5 100644 --- a/test/functional/vimscript/exepath_spec.lua +++ b/test/functional/vimscript/exepath_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, clear, call = t.eq, n.clear, n.call local command = n.command local matches = t.matches diff --git a/test/functional/vimscript/fnamemodify_spec.lua b/test/functional/vimscript/fnamemodify_spec.lua index 60e4a5f3df7..65a1ec72e9a 100644 --- a/test/functional/vimscript/fnamemodify_spec.lua +++ b/test/functional/vimscript/fnamemodify_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 eq = t.eq local exec_lua = n.exec_lua diff --git a/test/functional/vimscript/functions_spec.lua b/test/functional/vimscript/functions_spec.lua index 82a1497341f..56b6aa87ae9 100644 --- a/test/functional/vimscript/functions_spec.lua +++ b/test/functional/vimscript/functions_spec.lua @@ -8,6 +8,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() +local it, before_each = t.it, t.before_each local clear = n.clear local eval = n.eval local matches = t.matches diff --git a/test/functional/vimscript/getchar_spec.lua b/test/functional/vimscript/getchar_spec.lua index 4ecf082f970..9049906ca0d 100644 --- a/test/functional/vimscript/getchar_spec.lua +++ b/test/functional/vimscript/getchar_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 = n.exec local feed = n.feed diff --git a/test/functional/vimscript/getline_spec.lua b/test/functional/vimscript/getline_spec.lua index 32be6b5702a..ce5b913e560 100644 --- a/test/functional/vimscript/getline_spec.lua +++ b/test/functional/vimscript/getline_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 call = n.call local clear = n.clear local eq = t.eq diff --git a/test/functional/vimscript/glob_spec.lua b/test/functional/vimscript/glob_spec.lua index 754381231e6..ac5454a13e8 100644 --- a/test/functional/vimscript/glob_spec.lua +++ b/test/functional/vimscript/glob_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, command, eval, eq = n.clear, n.command, n.eval, t.eq local mkdir = t.mkdir diff --git a/test/functional/vimscript/has_spec.lua b/test/functional/vimscript/has_spec.lua index 78a79ffe76b..66b9e848e3f 100644 --- a/test/functional/vimscript/has_spec.lua +++ b/test/functional/vimscript/has_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 clear = n.clear local connect = n.connect local get_session = n.get_session diff --git a/test/functional/vimscript/hostname_spec.lua b/test/functional/vimscript/hostname_spec.lua index e6b2499775d..b7de035e2b4 100644 --- a/test/functional/vimscript/hostname_spec.lua +++ b/test/functional/vimscript/hostname_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 call = n.call diff --git a/test/functional/vimscript/input_spec.lua b/test/functional/vimscript/input_spec.lua index c0ab4adebbc..f490733a7e0 100644 --- a/test/functional/vimscript/input_spec.lua +++ b/test/functional/vimscript/input_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 pcall_err = t.pcall_err local feed = n.feed diff --git a/test/functional/vimscript/json_functions_spec.lua b/test/functional/vimscript/json_functions_spec.lua index 6be8157608d..ed9a84083e7 100644 --- a/test/functional/vimscript/json_functions_spec.lua +++ b/test/functional/vimscript/json_functions_spec.lua @@ -1,6 +1,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() +local describe, it, setup = t.describe, t.it, t.setup local clear = n.clear local fn = n.fn local api = n.api diff --git a/test/functional/vimscript/lang_spec.lua b/test/functional/vimscript/lang_spec.lua index 183a525180f..7b4f106e639 100644 --- a/test/functional/vimscript/lang_spec.lua +++ b/test/functional/vimscript/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, eval, eq = n.clear, n.eval, t.eq local source = n.source diff --git a/test/functional/vimscript/let_spec.lua b/test/functional/vimscript/let_spec.lua index 412e06df201..1cd12f42d15 100644 --- a/test/functional/vimscript/let_spec.lua +++ b/test/functional/vimscript/let_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 diff --git a/test/functional/vimscript/map_functions_spec.lua b/test/functional/vimscript/map_functions_spec.lua index 4b06af8afc3..8f14b9724fa 100644 --- a/test/functional/vimscript/map_functions_spec.lua +++ b/test/functional/vimscript/map_functions_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 diff --git a/test/functional/vimscript/match_functions_spec.lua b/test/functional/vimscript/match_functions_spec.lua index 5e78176195c..a18f2bc82b6 100644 --- a/test/functional/vimscript/match_functions_spec.lua +++ b/test/functional/vimscript/match_functions_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 pcall_err = t.pcall_err local clear = n.clear diff --git a/test/functional/vimscript/minmax_functions_spec.lua b/test/functional/vimscript/minmax_functions_spec.lua index 22288e5f94e..0bb51ce8226 100644 --- a/test/functional/vimscript/minmax_functions_spec.lua +++ b/test/functional/vimscript/minmax_functions_spec.lua @@ -1,6 +1,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() +local describe, it, setup = t.describe, t.it, t.setup local eq = t.eq local eval = n.eval local command = n.command diff --git a/test/functional/vimscript/modeline_spec.lua b/test/functional/vimscript/modeline_spec.lua index 53a5e9b6928..5005093f43c 100644 --- a/test/functional/vimscript/modeline_spec.lua +++ b/test/functional/vimscript/modeline_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 assert_alive = n.assert_alive local clear, command, write_file = n.clear, n.command, t.write_file diff --git a/test/functional/vimscript/msgpack_functions_spec.lua b/test/functional/vimscript/msgpack_functions_spec.lua index f7fae113cb3..77214f84f03 100644 --- a/test/functional/vimscript/msgpack_functions_spec.lua +++ b/test/functional/vimscript/msgpack_functions_spec.lua @@ -1,4 +1,5 @@ local t = require('test.testutil') +local describe, it, setup = t.describe, t.it, t.setup local pcall_err = t.pcall_err local n = require('test.functional.testnvim')() diff --git a/test/functional/vimscript/null_spec.lua b/test/functional/vimscript/null_spec.lua index 8dbf44805d5..26333559ccb 100644 --- a/test/functional/vimscript/null_spec.lua +++ b/test/functional/vimscript/null_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 command = n.command local clear = n.clear local api = n.api diff --git a/test/functional/vimscript/operators_spec.lua b/test/functional/vimscript/operators_spec.lua index 73bd868b06c..769710dfb95 100644 --- a/test/functional/vimscript/operators_spec.lua +++ b/test/functional/vimscript/operators_spec.lua @@ -1,6 +1,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() +local describe, it, setup = t.describe, t.it, t.setup local eq = t.eq local eval = n.eval local clear = n.clear diff --git a/test/functional/vimscript/printf_spec.lua b/test/functional/vimscript/printf_spec.lua index cc2d114512b..66cabddbb90 100644 --- a/test/functional/vimscript/printf_spec.lua +++ b/test/functional/vimscript/printf_spec.lua @@ -1,6 +1,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() +local describe, it, setup = t.describe, t.it, t.setup local clear = n.clear local eq = t.eq local pcall_err = t.pcall_err diff --git a/test/functional/vimscript/reltime_spec.lua b/test/functional/vimscript/reltime_spec.lua index fa110d602ab..512db94217a 100644 --- a/test/functional/vimscript/reltime_spec.lua +++ b/test/functional/vimscript/reltime_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, ok = n.clear, t.eq, t.ok local neq, command, fn = t.neq, n.command, n.fn local matches = t.matches diff --git a/test/functional/vimscript/screenchar_spec.lua b/test/functional/vimscript/screenchar_spec.lua index ba653d99425..03a2d56f43d 100644 --- a/test/functional/vimscript/screenchar_spec.lua +++ b/test/functional/vimscript/screenchar_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, setup = t.describe, t.it, t.before_each, t.setup local clear, eq, neq = n.clear, t.eq, t.neq local command, api, fn = n.command, n.api, n.fn local tbl_deep_extend = vim.tbl_deep_extend diff --git a/test/functional/vimscript/screenpos_spec.lua b/test/functional/vimscript/screenpos_spec.lua index 630e19b841d..60bf2f44b0e 100644 --- a/test/functional/vimscript/screenpos_spec.lua +++ b/test/functional/vimscript/screenpos_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, api = n.clear, t.eq, n.api local command, fn = n.command, n.fn local feed = n.feed diff --git a/test/functional/vimscript/screenrowcol_spec.lua b/test/functional/vimscript/screenrowcol_spec.lua index ba9aea1cb05..2e99189cf86 100644 --- a/test/functional/vimscript/screenrowcol_spec.lua +++ b/test/functional/vimscript/screenrowcol_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, before_each, pending = t.describe, t.before_each, t.pending local clear, eq, api = n.clear, t.eq, n.api local command, fn = n.command, n.fn local feed = n.feed diff --git a/test/functional/vimscript/setpos_spec.lua b/test/functional/vimscript/setpos_spec.lua index 9975e7f7642..4597fa64cc7 100644 --- a/test/functional/vimscript/setpos_spec.lua +++ b/test/functional/vimscript/setpos_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 setpos = n.fn.setpos local getpos = n.fn.getpos local insert = n.insert diff --git a/test/functional/vimscript/sort_spec.lua b/test/functional/vimscript/sort_spec.lua index 33a564349bb..669cdc6f293 100644 --- a/test/functional/vimscript/sort_spec.lua +++ b/test/functional/vimscript/sort_spec.lua @@ -1,6 +1,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() +local describe, it, setup = t.describe, t.it, t.setup local eq = t.eq local NIL = vim.NIL local eval = n.eval diff --git a/test/functional/vimscript/special_vars_spec.lua b/test/functional/vimscript/special_vars_spec.lua index 9af531594c9..8668a55cf83 100644 --- a/test/functional/vimscript/special_vars_spec.lua +++ b/test/functional/vimscript/special_vars_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 command = n.command local fn = n.fn local clear = n.clear diff --git a/test/functional/vimscript/state_spec.lua b/test/functional/vimscript/state_spec.lua index 211d79928a6..2cbbaebd6f5 100644 --- a/test/functional/vimscript/state_spec.lua +++ b/test/functional/vimscript/state_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 diff --git a/test/functional/vimscript/string_spec.lua b/test/functional/vimscript/string_spec.lua index 6e86e116670..e3b93bc3f85 100644 --- a/test/functional/vimscript/string_spec.lua +++ b/test/functional/vimscript/string_spec.lua @@ -1,6 +1,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() +local describe, it, setup = t.describe, t.it, t.setup local clear = n.clear local eq = t.eq local command = n.command diff --git a/test/functional/vimscript/system_spec.lua b/test/functional/vimscript/system_spec.lua index d4e085cf9fe..d4e6bbc5b6e 100644 --- a/test/functional/vimscript/system_spec.lua +++ b/test/functional/vimscript/system_spec.lua @@ -4,6 +4,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, pending, finally = + t.describe, t.it, t.before_each, t.after_each, t.pending, t.finally local assert_alive = n.assert_alive local testprg = n.testprg local eq, call, clear, eval, feed_command, feed, api = diff --git a/test/functional/vimscript/timer_spec.lua b/test/functional/vimscript/timer_spec.lua index c91708c27ea..90670444d33 100644 --- a/test/functional/vimscript/timer_spec.lua +++ b/test/functional/vimscript/timer_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 feed, eq, eval, ok = n.feed, t.eq, n.eval, t.ok local source, async_meths, run = n.source, n.async_meths, n.run local clear, command, fn = n.clear, n.command, n.fn diff --git a/test/functional/vimscript/uniq_spec.lua b/test/functional/vimscript/uniq_spec.lua index 1e4e1592ac1..d79dcbe0c38 100644 --- a/test/functional/vimscript/uniq_spec.lua +++ b/test/functional/vimscript/uniq_spec.lua @@ -1,6 +1,7 @@ local t = require('test.testutil') local n = require('test.functional.testnvim')() +local describe, it, setup = t.describe, t.it, t.setup local eq = t.eq local clear = n.clear local command = n.command diff --git a/test/functional/vimscript/vvars_spec.lua b/test/functional/vimscript/vvars_spec.lua index 8afe7192992..4196152f138 100644 --- a/test/functional/vimscript/vvars_spec.lua +++ b/test/functional/vimscript/vvars_spec.lua @@ -1,4 +1,5 @@ local t = require('test.testutil') +local describe, it, before_each = t.describe, t.it, t.before_each local pcall_err = t.pcall_err local n = require('test.functional.testnvim')() diff --git a/test/functional/vimscript/wait_spec.lua b/test/functional/vimscript/wait_spec.lua index 3ac7399c527..0d221ea6110 100644 --- a/test/functional/vimscript/wait_spec.lua +++ b/test/functional/vimscript/wait_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 call = n.call local clear = n.clear local command = n.command diff --git a/test/functional/vimscript/writefile_spec.lua b/test/functional/vimscript/writefile_spec.lua index 4501cc5c7d7..7012ed93fdb 100644 --- a/test/functional/vimscript/writefile_spec.lua +++ b/test/functional/vimscript/writefile_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 mkdir = t.mkdir local clear = n.clear local eq = t.eq diff --git a/test/harness.lua b/test/harness.lua index 7d86d4694f7..56cf89af5cc 100644 --- a/test/harness.lua +++ b/test/harness.lua @@ -5,7 +5,7 @@ ---| 'failure' ---| 'error' ---- Hook phases supported by the chunk environment. +--- Hook phases supported by the test framework. --- @alias test.harness.HookKind ---| 'setup' ---| 'teardown' @@ -132,6 +132,7 @@ local uv = vim.uv --- Public test harness module surface. --- @class test.harness --- @field is_ci fun(name?: 'github'): boolean +--- @field is_defining fun(): boolean --- @field on_suite_end fun(callback: fun()): fun() --- @field read_nvim_log fun(logfile?: string, ci_rename?: boolean): string? local M = {} @@ -386,6 +387,13 @@ local function current_suite() return state.current_define_suite end +--- Whether a test file/suite is currently being defined (vs. executing, or neither: e.g. when this +--- module is loaded from a preload/helper). Lets callers register hooks at a valid stage. +--- @return boolean +function M.is_defining() + return state.current_define_suite ~= nil +end + --- Add a test node to the current suite. --- @param name string --- @param fn? fun() @@ -410,7 +418,7 @@ local function register_test(name, fn, pending_message) return test end ---- Build a hook registrar exposed in the test chunk environment. +--- Build a hook registrar exposed in the test framework. --- @param kind test.harness.HookKind --- @return fun(fn: fun()) local function chunk_hook(kind) @@ -423,21 +431,18 @@ local function chunk_hook(kind) end end --- Chunk environment -local chunk_env = { - _G = _G, - assert = test_assert, - setup = chunk_hook('setup'), - teardown = chunk_hook('teardown'), - before_each = chunk_hook('before_each'), - after_each = chunk_hook('after_each'), -} +-- Busted-style test API. +-- Specs import it explicitly (`local describe, it = require('test.testutil').describe, …`). +M.setup = chunk_hook('setup') +M.teardown = chunk_hook('teardown') +M.before_each = chunk_hook('before_each') +M.after_each = chunk_hook('after_each') ---- Define a nested suite in the chunk environment. +--- Define a nested suite. --- @param name string --- @param fn fun() --- @return test.harness.Suite -function chunk_env.describe(name, fn) +function M.describe(name, fn) assert(type(name) == 'string', 'describe() expects a string') assert(type(fn) == 'function', 'describe() expects a function body') @@ -457,11 +462,11 @@ function chunk_env.describe(name, fn) return suite end ---- Define a test in the chunk environment. +--- Define a test. --- @param name string --- @param fn? fun() --- @return test.harness.Test -function chunk_env.it(name, fn) +function M.it(name, fn) return register_test(name, fn, nil) end @@ -475,7 +480,7 @@ end --- @param name? string --- @param block? fun()|string --- @return boolean -function chunk_env.pending(name, block) +function M.pending(name, block) if state.current_execution then error({ __harness_pending = true, @@ -489,7 +494,7 @@ end --- Register a finalizer to run after the current test body. --- @param fn fun() -function chunk_env.finally(fn) +function M.finally(fn) assert(type(fn) == 'function', 'finally() expects a function') assert( state.current_execution and state.current_execution.scope == 'test', @@ -1401,17 +1406,14 @@ local function parse_args(argv) return opts end ---- Load a Lua chunk and bind it to a shallow copy of the given environment. +--- Load a Lua chunk. +--- +--- Note: Tests run in the real global environment and import the "framework" explicitly +--- (`testutil.it()`, …), so we no longer inject it into the spec environment via `setfenv`. --- @param path string ---- @param env table --- @return function?, string? -local function load_chunk(path, env) - local chunk, err = loadfile(path) - if not chunk then - return nil, err - end - - return setfenv(chunk, setmetatable(vim._copy(env), { __index = _G })) +local function load_chunk(path) + return loadfile(path) end --- Load a helper file before the test baseline is captured. @@ -1421,10 +1423,7 @@ end --- @return boolean?, string? local function load_helper(path) local helper_path = normalize_path(path) - local chunk, err = load_chunk(helper_path, { - _G = _G, - assert = test_assert, - }) + local chunk, err = load_chunk(helper_path) if not chunk then return nil, err end @@ -1448,7 +1447,7 @@ local function evaluate_test_file(file, root_suite) table.insert(root_suite.children, file_suite) state.current_define_suite = file_suite - local chunk, load_err = load_chunk(file.path, chunk_env) + local chunk, load_err = load_chunk(file.path) if not chunk then state.current_define_suite = nil return file_suite, diff --git a/test/testutil.lua b/test/testutil.lua index 0d6199322ca..0f3ae9805c5 100644 --- a/test/testutil.lua +++ b/test/testutil.lua @@ -8,6 +8,16 @@ local Paths = require('test.cmakeconfig.paths') --- @class test.testutil local M = { paths = Paths, + + -- Test framework: + after_each = harness.after_each, + before_each = harness.before_each, + describe = harness.describe, + finally = harness.finally, + it = harness.it, + pending = harness.pending, + setup = harness.setup, + teardown = harness.teardown, } --- @param path string @@ -869,9 +879,7 @@ end --- @return boolean function M.skip(cond, reason) if cond then - --- @type fun(reason: string) - local pending = getfenv(2).pending - pending(reason or 'FIXME') + M.pending(reason or 'FIXME') return true end return false diff --git a/test/unit/api/private_helpers_spec.lua b/test/unit/api/private_helpers_spec.lua index 4d9c2e50462..78985e8734e 100644 --- a/test/unit/api/private_helpers_spec.lua +++ b/test/unit/api/private_helpers_spec.lua @@ -1,5 +1,6 @@ local t = require('test.unit.testutil') -local itp = t.gen_itp(it) +local describe = t.describe +local itp = t.gen_itp(t.it) local t_eval = require('test.unit.eval.testutil') local api_t = require('test.unit.api.testutil') diff --git a/test/unit/buffer_spec.lua b/test/unit/buffer_spec.lua index 76cca1242e8..de7f4f8843f 100644 --- a/test/unit/buffer_spec.lua +++ b/test/unit/buffer_spec.lua @@ -1,5 +1,6 @@ local t = require('test.unit.testutil') -local itp = t.gen_itp(it) +local describe, setup, teardown = t.describe, t.setup, t.teardown +local itp = t.gen_itp(t.it) local to_cstr = t.to_cstr local eq = t.eq diff --git a/test/unit/charset/vim_str2nr_spec.lua b/test/unit/charset/vim_str2nr_spec.lua index a70ee777161..e28260d8bd8 100644 --- a/test/unit/charset/vim_str2nr_spec.lua +++ b/test/unit/charset/vim_str2nr_spec.lua @@ -1,7 +1,8 @@ local t = require('test.unit.testutil') local bit = require('bit') -local itp = t.gen_itp(it) +local describe = t.describe +local itp = t.gen_itp(t.it) local child_call_once = t.child_call_once local cimport = t.cimport diff --git a/test/unit/eval/decode_spec.lua b/test/unit/eval/decode_spec.lua index 96e04dbbe5d..2ce75307364 100644 --- a/test/unit/eval/decode_spec.lua +++ b/test/unit/eval/decode_spec.lua @@ -1,5 +1,6 @@ local t = require('test.unit.testutil') -local itp = t.gen_itp(it) +local describe = t.describe +local itp = t.gen_itp(t.it) local cimport = t.cimport local eq = t.eq diff --git a/test/unit/eval/encode_spec.lua b/test/unit/eval/encode_spec.lua index 9f193bc2f94..df5fd59bb4e 100644 --- a/test/unit/eval/encode_spec.lua +++ b/test/unit/eval/encode_spec.lua @@ -1,5 +1,6 @@ local t = require('test.unit.testutil') -local itp = t.gen_itp(it) +local describe = t.describe +local itp = t.gen_itp(t.it) local t_eval = require('test.unit.eval.testutil') local cimport = t.cimport diff --git a/test/unit/eval/tricks_spec.lua b/test/unit/eval/tricks_spec.lua index 20ecf0d9203..5c52d520068 100644 --- a/test/unit/eval/tricks_spec.lua +++ b/test/unit/eval/tricks_spec.lua @@ -1,7 +1,8 @@ local t = require('test.unit.testutil') local t_eval = require('test.unit.eval.testutil') -local itp = t.gen_itp(it) +local describe = t.describe +local itp = t.gen_itp(t.it) local cimport = t.cimport local eq = t.eq diff --git a/test/unit/eval/tv_clear_spec.lua b/test/unit/eval/tv_clear_spec.lua index 1ad537d8bf0..018ffe31370 100644 --- a/test/unit/eval/tv_clear_spec.lua +++ b/test/unit/eval/tv_clear_spec.lua @@ -1,5 +1,6 @@ local t = require('test.unit.testutil') -local itp = t.gen_itp(it) +local describe, before_each, after_each = t.describe, t.before_each, t.after_each +local itp = t.gen_itp(t.it) local t_eval = require('test.unit.eval.testutil') local alloc_log_new = t.alloc_log_new diff --git a/test/unit/eval/typval_spec.lua b/test/unit/eval/typval_spec.lua index b46e1e1e4f9..435019282ef 100644 --- a/test/unit/eval/typval_spec.lua +++ b/test/unit/eval/typval_spec.lua @@ -2,7 +2,9 @@ local bit = require('bit') local t = require('test.unit.testutil') local t_eval = require('test.unit.eval.testutil') -local itp = t.gen_itp(it) +local describe, before_each, after_each, pending = + t.describe, t.before_each, t.after_each, t.pending +local itp = t.gen_itp(t.it) local OK = t.OK local eq = t.eq diff --git a/test/unit/fileio_spec.lua b/test/unit/fileio_spec.lua index 8f915372fe1..105b706cef9 100644 --- a/test/unit/fileio_spec.lua +++ b/test/unit/fileio_spec.lua @@ -1,5 +1,6 @@ local t = require('test.unit.testutil') -local itp = t.gen_itp(it) +local describe = t.describe +local itp = t.gen_itp(t.it) --{:cimport, :internalize, :eq, :neq, :ffi, :lib, :cstr, :to_cstr} = require 'test.unit.testutil' local eq = t.eq diff --git a/test/unit/garray_spec.lua b/test/unit/garray_spec.lua index 465a6c08e6d..761f77ca62e 100644 --- a/test/unit/garray_spec.lua +++ b/test/unit/garray_spec.lua @@ -1,5 +1,6 @@ local t = require('test.unit.testutil') -local itp = t.gen_itp(it) +local describe = t.describe +local itp = t.gen_itp(t.it) local cimport = t.cimport local internalize = t.internalize diff --git a/test/unit/indent_spec.lua b/test/unit/indent_spec.lua index a1c3dc4a758..cf5a16ab37e 100644 --- a/test/unit/indent_spec.lua +++ b/test/unit/indent_spec.lua @@ -1,5 +1,6 @@ local t = require('test.unit.testutil') -local itp = t.gen_itp(it) +local describe = t.describe +local itp = t.gen_itp(t.it) local to_cstr = t.to_cstr local ffi = t.ffi diff --git a/test/unit/keycodes_spec.lua b/test/unit/keycodes_spec.lua index 948f0a3eadc..008e4bce151 100644 --- a/test/unit/keycodes_spec.lua +++ b/test/unit/keycodes_spec.lua @@ -1,5 +1,6 @@ local t = require('test.unit.testutil') -local itp = t.gen_itp(it) +local describe = t.describe +local itp = t.gen_itp(t.it) local ffi = t.ffi local eq = t.eq diff --git a/test/unit/marktree_spec.lua b/test/unit/marktree_spec.lua index 37ac501b897..ad5073e5037 100644 --- a/test/unit/marktree_spec.lua +++ b/test/unit/marktree_spec.lua @@ -1,5 +1,6 @@ local t = require('test.unit.testutil') -local itp = t.gen_itp(it) +local describe, before_each = t.describe, t.before_each +local itp = t.gen_itp(t.it) local ffi = t.ffi local eq = t.eq diff --git a/test/unit/mbyte_spec.lua b/test/unit/mbyte_spec.lua index 2c52aa92179..b9ce24fb4f0 100644 --- a/test/unit/mbyte_spec.lua +++ b/test/unit/mbyte_spec.lua @@ -1,5 +1,6 @@ local t = require('test.unit.testutil') -local itp = t.gen_itp(it) +local describe, before_each = t.describe, t.before_each +local itp = t.gen_itp(t.it) local ffi = t.ffi local eq = t.eq diff --git a/test/unit/memory_spec.lua b/test/unit/memory_spec.lua index 169d6b9cb09..fd210152008 100644 --- a/test/unit/memory_spec.lua +++ b/test/unit/memory_spec.lua @@ -1,5 +1,6 @@ local t = require('test.unit.testutil') -local itp = t.gen_itp(it) +local describe = t.describe +local itp = t.gen_itp(t.it) local cimport = t.cimport local cstr = t.cstr diff --git a/test/unit/message_spec.lua b/test/unit/message_spec.lua index fee8f5124d3..d6d53351dd8 100644 --- a/test/unit/message_spec.lua +++ b/test/unit/message_spec.lua @@ -1,5 +1,6 @@ local t = require('test.unit.testutil') -local itp = t.gen_itp(it) +local describe = t.describe +local itp = t.gen_itp(t.it) local ffi = t.ffi local eq = t.eq diff --git a/test/unit/msgpack_spec.lua b/test/unit/msgpack_spec.lua index d2ba4a1839f..8d5c935df16 100644 --- a/test/unit/msgpack_spec.lua +++ b/test/unit/msgpack_spec.lua @@ -1,6 +1,7 @@ local t = require('test.unit.testutil') +local describe = t.describe local cimport = t.cimport -local itp = t.gen_itp(it) +local itp = t.gen_itp(t.it) local lib = cimport('./src/nvim/msgpack_rpc/unpacker.h', './src/nvim/memory.h', './src/mpack/conv.h') local ffi = t.ffi diff --git a/test/unit/multiqueue_spec.lua b/test/unit/multiqueue_spec.lua index 36dae403be8..f96332f583f 100644 --- a/test/unit/multiqueue_spec.lua +++ b/test/unit/multiqueue_spec.lua @@ -1,5 +1,6 @@ local t = require('test.unit.testutil') -local itp = t.gen_itp(it) +local describe, before_each = t.describe, t.before_each +local itp = t.gen_itp(t.it) local child_call_once = t.child_call_once local cimport = t.cimport diff --git a/test/unit/optionstr_spec.lua b/test/unit/optionstr_spec.lua index 1f5b42485f4..52eb9b2ce1d 100644 --- a/test/unit/optionstr_spec.lua +++ b/test/unit/optionstr_spec.lua @@ -1,5 +1,6 @@ local t = require('test.unit.testutil') -local itp = t.gen_itp(it) +local describe = t.describe +local itp = t.gen_itp(t.it) local to_cstr = t.to_cstr local eq = t.eq diff --git a/test/unit/os/env_spec.lua b/test/unit/os/env_spec.lua index 0f508f50199..bf2f3af8e55 100644 --- a/test/unit/os/env_spec.lua +++ b/test/unit/os/env_spec.lua @@ -1,5 +1,6 @@ local t = require('test.unit.testutil') -local itp = t.gen_itp(it) +local describe = t.describe +local itp = t.gen_itp(t.it) local cimport = t.cimport local eq = t.eq diff --git a/test/unit/os/fileio_spec.lua b/test/unit/os/fileio_spec.lua index fd9eb2bafba..ecb3a57b906 100644 --- a/test/unit/os/fileio_spec.lua +++ b/test/unit/os/fileio_spec.lua @@ -1,7 +1,8 @@ local uv = vim.uv local t = require('test.unit.testutil') -local itp = t.gen_itp(it) +local describe, before_each, after_each = t.describe, t.before_each, t.after_each +local itp = t.gen_itp(t.it) local eq = t.eq local ffi = t.ffi diff --git a/test/unit/os/fs_spec.lua b/test/unit/os/fs_spec.lua index d22ee2d912e..d4333a7d7fe 100644 --- a/test/unit/os/fs_spec.lua +++ b/test/unit/os/fs_spec.lua @@ -2,7 +2,9 @@ local uv = vim.uv local bit = require('bit') local t = require('test.unit.testutil') -local itp = t.gen_itp(it) +local describe, before_each, after_each, pending = + t.describe, t.before_each, t.after_each, t.pending +local itp = t.gen_itp(t.it) local cimport = t.cimport local cppimport = t.cppimport diff --git a/test/unit/os/shell_spec.lua b/test/unit/os/shell_spec.lua index 94ad6f4a108..4bf7d7c4c9e 100644 --- a/test/unit/os/shell_spec.lua +++ b/test/unit/os/shell_spec.lua @@ -1,5 +1,6 @@ local t = require('test.unit.testutil') -local itp = t.gen_itp(it) +local describe, before_each = t.describe, t.before_each +local itp = t.gen_itp(t.it) local cimported = t.cimport( './src/nvim/os/shell.h', './src/nvim/option_vars.h', diff --git a/test/unit/os/users_spec.lua b/test/unit/os/users_spec.lua index 21d47fdb6ea..350a8ed7830 100644 --- a/test/unit/os/users_spec.lua +++ b/test/unit/os/users_spec.lua @@ -1,5 +1,6 @@ local t = require('test.unit.testutil') -local itp = t.gen_itp(it) +local describe = t.describe +local itp = t.gen_itp(t.it) local cimport = t.cimport local eq = t.eq diff --git a/test/unit/path_spec.lua b/test/unit/path_spec.lua index 82b9d89d255..d3956ec5022 100644 --- a/test/unit/path_spec.lua +++ b/test/unit/path_spec.lua @@ -1,6 +1,8 @@ local uv = vim.uv local t = require('test.unit.testutil') -local itp = t.gen_itp(it) +local describe, before_each, after_each, setup, teardown = + t.describe, t.before_each, t.after_each, t.setup, t.teardown +local itp = t.gen_itp(t.it) local cimport = t.cimport local eq = t.eq diff --git a/test/unit/profile_spec.lua b/test/unit/profile_spec.lua index ed760c37d90..fd702693b75 100644 --- a/test/unit/profile_spec.lua +++ b/test/unit/profile_spec.lua @@ -1,5 +1,6 @@ local t = require('test.unit.testutil') -local itp = t.gen_itp(it) +local describe = t.describe +local itp = t.gen_itp(t.it) local cimport = t.cimport local ffi = t.ffi diff --git a/test/unit/search_spec.lua b/test/unit/search_spec.lua index 9171cf9f066..675b459af83 100644 --- a/test/unit/search_spec.lua +++ b/test/unit/search_spec.lua @@ -1,5 +1,6 @@ local t = require('test.unit.testutil') -local itp = t.gen_itp(it) +local describe = t.describe +local itp = t.gen_itp(t.it) local to_cstr = t.to_cstr local eq = t.eq diff --git a/test/unit/statusline_spec.lua b/test/unit/statusline_spec.lua index 0fd7c6d0b7d..fabfdb13ba6 100644 --- a/test/unit/statusline_spec.lua +++ b/test/unit/statusline_spec.lua @@ -1,5 +1,6 @@ local t = require('test.unit.testutil') -local itp = t.gen_itp(it) +local describe = t.describe +local itp = t.gen_itp(t.it) local to_cstr = t.to_cstr local get_str = t.ffi.string diff --git a/test/unit/strings_spec.lua b/test/unit/strings_spec.lua index 8df9837c901..68d87284cd5 100644 --- a/test/unit/strings_spec.lua +++ b/test/unit/strings_spec.lua @@ -1,5 +1,6 @@ local t = require('test.unit.testutil') -local itp = t.gen_itp(it) +local describe = t.describe +local itp = t.gen_itp(t.it) local child_call_once = t.child_call_once local cimport = t.cimport diff --git a/test/unit/tempfile_spec.lua b/test/unit/tempfile_spec.lua index 74073b48545..ec9b5357cec 100644 --- a/test/unit/tempfile_spec.lua +++ b/test/unit/tempfile_spec.lua @@ -1,5 +1,6 @@ local t = require('test.unit.testutil') -local itp = t.gen_itp(it) +local describe, before_each = t.describe, t.before_each +local itp = t.gen_itp(t.it) local eq = t.eq local neq = t.neq diff --git a/test/unit/termkey_spec.lua b/test/unit/termkey_spec.lua index ec213907825..4faf282a1fc 100644 --- a/test/unit/termkey_spec.lua +++ b/test/unit/termkey_spec.lua @@ -1,5 +1,6 @@ local t = require('test.unit.testutil') -local itp = t.gen_itp(it) +local describe = t.describe +local itp = t.gen_itp(t.it) local bit = require('bit') --- @alias TermKeyKey {utf8: string, type: integer, modifiers: integer, code: {codepoint: integer, sym: any, number: integer}} diff --git a/test/unit/testtest_spec.lua b/test/unit/testtest_spec.lua index dc63af05464..dadcdd15070 100644 --- a/test/unit/testtest_spec.lua +++ b/test/unit/testtest_spec.lua @@ -1,6 +1,7 @@ local t = require('test.unit.testutil') -local itp = t.gen_itp(it) +local describe = t.describe +local itp = t.gen_itp(t.it) local sc = t.sc diff --git a/test/unit/tui/terminfo_spec.lua b/test/unit/tui/terminfo_spec.lua index ae1d6d0833c..6730d0f118d 100644 --- a/test/unit/tui/terminfo_spec.lua +++ b/test/unit/tui/terminfo_spec.lua @@ -1,5 +1,6 @@ local t = require('test.unit.testutil') -local itp = t.gen_itp(it) +local describe = t.describe +local itp = t.gen_itp(t.it) local ffi = t.ffi local cimport = t.cimport diff --git a/test/unit/undo_spec.lua b/test/unit/undo_spec.lua index 5a96280caff..556c3fbf8cc 100644 --- a/test/unit/undo_spec.lua +++ b/test/unit/undo_spec.lua @@ -1,5 +1,6 @@ local t = require('test.unit.testutil') -local itp = t.gen_itp(it) +local describe, setup, teardown = t.describe, t.setup, t.teardown +local itp = t.gen_itp(t.it) local uv = vim.uv local child_call_once = t.child_call_once local sleep = uv.sleep diff --git a/test/unit/viml/expressions/lexer_spec.lua b/test/unit/viml/expressions/lexer_spec.lua index 30483f4c1d2..f68bad461ab 100644 --- a/test/unit/viml/expressions/lexer_spec.lua +++ b/test/unit/viml/expressions/lexer_spec.lua @@ -1,5 +1,6 @@ local t = require('test.unit.testutil') -local itp = t.gen_itp(it) +local describe = t.describe +local itp = t.gen_itp(t.it) local t_viml = require('test.unit.viml.testutil') local child_call_once = t.child_call_once diff --git a/test/unit/viml/expressions/parser_spec.lua b/test/unit/viml/expressions/parser_spec.lua index 1c8a8ebbd89..02ada1a3cc6 100644 --- a/test/unit/viml/expressions/parser_spec.lua +++ b/test/unit/viml/expressions/parser_spec.lua @@ -1,5 +1,6 @@ local t = require('test.unit.testutil') -local itp = t.gen_itp(it) +local describe = t.describe +local itp = t.gen_itp(t.it) local t_viml = require('test.unit.viml.testutil') local make_enum_conv_tab = t.make_enum_conv_tab diff --git a/test/unit/vterm_spec.lua b/test/unit/vterm_spec.lua index 3492487effa..27cf65c34cc 100644 --- a/test/unit/vterm_spec.lua +++ b/test/unit/vterm_spec.lua @@ -1,5 +1,6 @@ local t = require('test.unit.testutil') -local itp = t.gen_itp(it) +local describe, before_each, pending = t.describe, t.before_each, t.pending +local itp = t.gen_itp(t.it) local bit = require('bit') --- @class vterm