From 6d8c8b18d551d0be0490640c00fabb816727ec10 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Mon, 20 Jul 2026 17:16:51 +0200 Subject: [PATCH 1/2] 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 cdefcbbab4..75139b172e 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 e69345a370..0000000000 --- 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 af5fa1c258..4dec7447df 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 2c2b8dc359..6e042d0f2e 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 ddf6a9b390..d44ed133d1 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 dc8655f19c..caef407316 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 2d774436a7..e6abb4d8cc 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 d176079997..5d908ca891 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 8925dcaec4..d60f8fe249 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 f24c545810..d708c46a2c 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 db8f918817..65c8e5fabc 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 895e8c8898..52e97f4412 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 222a2ae8fb..2baa301599 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 3318d1b73b..1a2def8f09 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 8d0172fd86..e908b3d8f7 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 ab7e3683cb..d46a704773 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 26670c9261..9046cdbfbc 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 c1eb1f92c3..554bd5b695 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 8a941e7af7..c49641f227 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 28e0d8aa9c..5c1e2da291 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 d8f4ed3dfa..851d345de3 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 a82bffcf03..f57d385bd2 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 fe28739c97..e1fc4ca0c0 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 7556a5bc3f..0ef72f4b77 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 d2dd655b17..4399bf6bbf 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 1a13c15b43..a5dfd5ad4d 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 8c6c5ba1b4..22974d6218 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 9193d96c4b..cb8feff515 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 40403aa2e6..6600ae89ea 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 9beb012ec3..2b5ef149ae 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 e17335f56a..fb85d2f7a9 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 adfb6e2c1c..8d8113dff3 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 dadf5095ce..9810fe92a0 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 9fc529992a..7814687add 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 72e650cae4..6143039027 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 a8e185e6b7..4216f8256c 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 97c156dba4..12575a27db 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 3c030d2911..f575956919 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 7cc3a26bfb..7fa07c46bd 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 bf7d628357..4c940b293d 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 da2d2050fb..72ce5cb836 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 e78cda49ce..964a411b6a 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 392481474b..51d5783692 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 61ce15d91d..94d38afc2e 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 3bfc7b89fc..1004968835 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 6ee61c5676..7f1aa1454b 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 c45a64e373..0e2e552ea2 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 0c0b3595ca..00bf985a88 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 395e6d5144..ad848ffceb 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 33ccba4464..af6529aee5 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 38bdcfa441..3367070d2b 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 ba01111fb3..948511ac31 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 80ab5a1944..59c9e3b02f 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 5ed585a32d..ad1d91d487 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 d1393e3a33..58bcd49d25 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 7c679cd4c0..8be09e2f0f 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 cf8cbe25c1..14f80ded5c 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 295f3a8865..51e79c5c6c 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 896e8146f8..4d48d5cffb 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 6aa0e6fb6a..b41a7f6cac 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 852d9fd1a2..ffbc946bae 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 cd23e00b03..6b9ac4b21b 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 8550a03006..d12df338bc 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 35516ed9ab..d77d299de3 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 e74b32c926..f155ed5ac0 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 d185156d7d..40ea60db23 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 68fb1dfecb..2760346c80 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 1cfa0535f6..6e743a8846 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 dd136cdaaa..9396b53929 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 42e83c2969..ade3298120 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 982a7859b7..cd8ea7027f 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 837329cc90..2b86606987 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 0deb4040c9..e883391e83 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 26fa2ea34c..d863c5a481 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 d158497cb8..9746e6548c 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 cb6bc57681..9758e07df8 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 2a33a4fdaa..4b29c7f8b6 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 2198a974f6..61a0e7375f 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 78ceb30390..672a476c79 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 406786594e..fac8f294ff 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 940915823c..741f5deca0 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 42544d42b0..e7f54eeefa 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 b6bba61915..b7c43e0469 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 495c603a3f..3a94c0d5c1 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 30027e2fd6..a3e7d2e7cc 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 52f2bf7f8c..e879b8bce3 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 5e3afa9da2..c0897e17b2 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 c3ffa2cfed..8d42c25e36 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 b44c0cd3b9..44c3a4f243 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 a3a34df544..3915b4451c 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 770a4f387d..b50d8dd917 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 da8597adfb..0eff990c25 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 c6c30a80a8..6ee31ce73a 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 f079f92146..533d64d937 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 8e67dd9870..59521c9a94 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 c0412a8167..8c03dc6757 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 9b89823dcc..6cece89e40 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 a9156b5beb..b6d5b195e7 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 871b1cb424..e38a2d9b8d 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 d657f9aa6d..5a9d4dd78b 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 ca80d9b445..999909d645 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 b34c6e4bbb..f21579b45b 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 cd1ca978aa..1dedf6f39b 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 54924b18d6..bfe528eb5d 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 bdf534188b..efdc29c850 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 4939f844c8..002d1d136e 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 cf5f781d1c..eb6ee0be8b 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 0c51f1c17b..2646c5f19e 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 88fab7101e..3d75d69dd2 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 7edb0556c5..9263e23e3a 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 8a0c54c5e0..e481ffec14 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 fbf5e3e03f..9483d9cf13 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 591f20b76a..1c21e4d42b 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 3922c55b14..0c1e797d35 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 106eefe290..2726b05a60 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 e827b9534b..0c74ea4da6 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 b620c2f038..5d310b4dbf 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 5276fc2d2d..9fa8681701 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 37a88a8a11..40d6564eba 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 7cc0b1da83..394a1aac39 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 ccc649120f..d2d72b3a91 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 63ed19fc77..36e7ddd613 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 950fc40365..88253b60fb 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 2ce7eb48ea..548d902cc3 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 365583948b..3609a600ff 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 0fd66bff92..dc1054db07 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 83b1c5a540..74d7894e17 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 92628caae1..319803756a 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 f55976276b..7cb7ca5951 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 79cbd6bdd8..729a2b4076 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 4a235dd3f3..383fe672ef 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 f6d93f9670..1d2fae7123 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 efb82d6cb0..9262f24ee3 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 631961ac4b..50a7ab6fac 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 638ca16639..39352a82f3 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 cc3af84c87..4e55e657d3 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 283f0991cb..a9aff0b439 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 003a191f68..e8b60e4978 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 9b81c6d06d..06ab74163d 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 7c76d92228..42b9c2a816 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 4b22be23e3..d475fde110 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 df15a8a05d..2e57f3912c 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 d9117b5a9a..51e5b9ba26 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 dd1335df94..d7bc6a67ed 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 6865153452..8dcc1f4fe8 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 4d2d06f942..807eafa43d 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 15f3b0b9b8..10c4ffe360 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 a25862918a..872d0a9535 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 b47143e791..ddca82174e 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 d6f2203aa2..114b806a6e 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 ac90f3f98b..182b041b0e 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 851b3264d3..49d4d0cba8 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 3bdc76c220..e03a4e609c 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 f8df3dbf7e..defae7e1d0 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 64dbc47201..31abe92934 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 97dc5b0153..4c25d9cb0a 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 b7090662e6..df30a8670a 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 143985c726..649d1a6fa9 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 79c452a817..8c3be1c1be 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 6ee2ff4dfa..fa67b85b08 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 1a44ed6cb6..d72be4d8b1 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 974df0c21d..0c32a23593 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 e3d06be6bf..30697315da 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 ebac1adcb8..7e4a05ddd0 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 b6486a8a27..59e092a0a1 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 febe6a36ce..daa75fa9e7 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 b2edc5933f..43de4b6744 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 98bcfd8261..76c4e29b02 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 ba4c2dab02..4004b22cd9 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 99cb64c7e5..aa4cbe94a9 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 a103b55581..f084e68a00 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 afde6f220a..e5779d365f 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 737417126b..e1c1e82276 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 dd99224edb..6ce8c2a300 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 e04a171cbc..f0912937d0 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 ec29b6cf04..46a7d5f90d 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 8feafa2cee..51f0c68179 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 639a97f68f..57081f1d29 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 0835a3df52..48153acfb2 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 6e92bd4c65..d817a38276 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 82b9c4bfa3..d00eddcc2e 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 179c15fb0f..1bd2d136ad 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 de31b8d396..4ac798c303 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 f7185dacff..fbd429d1dc 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 eb5e36120f..5cfcadd9bd 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 cfa65f5c8a..39beb2151d 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 3d91dc4b34..215ed266e8 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 05154f660d..45013aa59a 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 648eb65550..a2102c5151 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 cc3ee6787a..690336b148 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 d478545077..2eda4e39eb 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 5e5e465c01..6fc85ac818 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 279c6a432a..425783d5f7 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 296bf00b58..b6a29c9fd3 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 27bbe706bb..7bcd6cded4 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 b2d22e2a89..5647e53e4c 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 88f1c31b23..2b7911f0f1 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 f0361c2f5a..4a0151fbef 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 b6fdf8cc68..4f59984919 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 4189b568a2..24ee07d7b6 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 e97c9c074b..3aeaf4e4c5 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 aac25cca23..71d1e335be 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 288a182f36..f342114e35 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 96c60e9e61..c66e6d0fd6 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 7e8f109334..0bcd34ae69 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 fca368f6bd..9c6ef067b4 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 5e88301c65..aedd257d54 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 9a240c8bda..4566678981 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 42d28b1231..64aa1c2328 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 e2f87351de..0a55d0f24f 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 da13b61e0f..ac4cbd2177 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 0a08ad9fe6..938e7cc4cc 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 6495239208..cc8c31bb7c 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 a6be459a4d..e0b779d327 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 86df5b1c41..3e7ccdbd64 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 6c347eac85..1cc67d15f0 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 bd1390c874..e25dd60b99 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 24d72f4c4f..b15aa0d6d3 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 7c1d704cd7..fa65f32700 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 8c97341c8e..2c1a17554c 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 a90eb48f17..0f90aee6ad 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 875c739975..83d830365a 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 dad1f7b579..6e27bb980e 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 3042c52784..a266ef8cb8 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 293c23d844..8bab252d37 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 af4490e7f2..5ed572674d 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 df79750549..5eaf495b63 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 21f0b9f001..8a00727945 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 ce8c710a46..5d64008aca 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 b5e6a98b96..8c5e3c5aaf 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 840364d0d8..95a22721d8 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 c95a010c5a..c54b32302c 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 4c98edf8e0..87abf22a43 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 6d08a77386..9b27a45c8e 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 a39e7d5d38..906eb7aab9 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 af9e99fc9b..4ccca98490 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 53402c2163..e500c3dc5e 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 018edae321..b4c5e685cb 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 b0130320ed..bb833d0d84 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 76b2966443..5399de5987 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 09835bf97d..c5dedd54cf 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 c1a2b340a0..ef6187f13b 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 8593868c83..86ea1352a1 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 fd968eb355..fd9ab5b504 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 64e223ab8c..63cba3c0d3 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 083db22fcf..f87aaead78 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 af72013b8d..82f5cd754a 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 e02dd87bc1..786e916d00 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 28d4637954..f4eb6cc98c 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 ae01193049..ac0e437095 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 5e981b5862..872e56c6ee 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 dbac8bbc54..1f16bc7f4f 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 58a08b9a13..b9723a3a26 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 d3a3944ea4..15833a548d 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 05e6979435..ee7642f716 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 2656142176..d6c709a3db 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 26b096d633..953d0fb7bf 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 df470f3009..ad951782ee 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 505d479418..d041d0e3c9 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 6457567176..7247661e14 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 70b610c859..d8781cec18 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 05def8a7d9..650ef86e41 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 af355f27e6..6484f7f67b 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 7358ba2d57..1755f3365a 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 cad7165270..bf3bc2315a 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 30ff13140f..b72c4e4c2b 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 155eb9ce11..f869280856 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 949bec6dea..3988ec8956 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 fac0fd85ff..08cfc9ce8a 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 cdb0c2ca58..e2fb28d84f 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 e2e3493be8..ae1a685808 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 e52d12bba9..5b03976cca 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 d6120678a9..d4f714bd87 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 85f2a1623c..ca50876fac 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 a5a2c3c682..b8a51446fd 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 d100ee446d..9511e876c0 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 529f5f56e8..0f801510c7 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 3a0f6875cc..0910218c08 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 6c06aa5b70..5093ce76f7 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 70ac8f2e7c..5d1196d891 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 518abc84dd..dbf7864e93 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 182b7e89de..3dd9bfcbb1 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 5b7bb4f372..56be26440a 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 136e2e7c69..a9b7204513 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 efbac45570..fdc6e8c757 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 2c9b0043e1..db8ff2a9c0 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 ca518ab88d..f542c31465 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 4792731c0c..00f33f8058 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 7d7ec4dcb8..8151ed5694 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 59b85874b1..703d0c3687 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 af49b8c529..6e6e2bcb9e 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 7d1ba36b7b..735c5cd459 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 72e7f334d2..677862b127 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 20d3a940b2..8ddd5c9684 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 ca5f391132..0dc13e1a89 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 e4591a3a60..86648684a2 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 223e1c96e8..b9b742301b 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 891de0a320..6e9fc88cc9 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 20e99d6505..c3c60f6643 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 f79dcb86d5..ab9f934a4c 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 1cd33de60e..03a9de0c21 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 fff29acd7b..5c83702ec3 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 bb1f68fb74..ab72f3ae27 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 be974ad107..36cf2ef7f5 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 af7d08b390..c0694b6d34 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 925a902ef0..f0b9e9f609 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 e7a7448fa7..4ebae80b3d 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 74cceb7455..a4a41dc862 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 1232b3843d..814c1bb611 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 a6d6f993dc..6ae40cd987 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 aa90c810c8..b0393feb8d 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 e41be74a1f..cac23aa1ed 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 5864dca484..8cd371b714 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 76e11d65a7..9cd8936b17 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 49b60669d4..d048fb0f54 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 6033a715ef..c40733ff19 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 f31f4257b5..844bef111f 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 5684475056..0bbb36b3bc 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 cbb3660216..2d134c3da3 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 963cb6b5fc..aded8266bd 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 612ede4681..983e2a1c83 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 54625ba73f..104d89a21a 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 575e79d1a9..f6cddae22e 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 42ca41a145..07db2564a3 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 21e0ba8e75..c9f242485a 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 0f2db3fb4e..17ca041d77 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 21e6ab97ff..902b47b3cb 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 956deb70ff..ff74c25501 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 eaa23c4ab6..a437764f7e 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 e63e72e372..33562756a5 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 32b368ff7b..645b3c178e 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 04dbada7d8..6aa3fd90bb 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 4ddbb13a0e..a3d74e6d14 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 b639f419ba..73e834b708 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 220404a934..7ffd94da32 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 c1ab1f92f9..00f3e560c0 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 4bf1ec75e2..5cc9e7fef8 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 74307814fe..f3f5fd31de 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 5b786ec3cb..bd3d9fae51 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 fe785c35dd..f981ecbf81 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 14c94bcc10..799d6655da 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 70ef4fdbb6..1a6bd1f4f1 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 176be2dfad..ec36a36741 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 2c373c5ec6..1d51611dc5 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 5c85887503..e9729e4bc3 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 0bca1fa4ca..cd7829ea7c 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 cb5f44ef39..aa8d92bf97 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 a5ecf5fdd5..529f0b4126 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 601df123e0..8d022e6e72 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 c6ebcc425b..7ac034309d 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 074b1a2992..04a354ce56 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 0853abf3fe..354d60b0a6 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 4cba151d3b..ded79eadf9 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 aaeb383d6c..8f65cc2539 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 1f6d299d4c..9738b6f650 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 086e3f5f3a..330b10e4dc 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 b2bbdb2ef6..04a099a36d 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 090b45b13b..a2255a3855 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 2e9a990fee..e2777b0d10 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 6faed91a09..11a2a1bedc 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 98fba656ff..ef0574a69b 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 38ffb6e6c0..31581426af 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 f677392234..c359fb3722 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 e777e76437..9de1e5564d 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 c21932e58c..1a9b55006a 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 bdb4534cba..fd751b4fea 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 5666927d6e..adf9217212 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 3945486d98..c5d6bcf63d 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 a67ad36f79..f736805846 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 411e684a3e..583005d6f3 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 caed30ab0b..6bf2082f7f 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 8b2756c019..0c14466af6 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 8a72a78c64..54f2ee63f5 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 aca1cd2bcb..93d2f6c50f 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 467d85d3a6..ccb5bbbeb2 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 68b322285e..98b6d08ca4 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 72239f5f5e..65e5ef8297 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 2c1425058c..eea6e997f8 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 7abbe7975c..0eb6add818 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 fa7aa7d71f..1ab68b2bf2 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 84d5415af8..20b0c211ef 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 8ec73b8daf..29c88ef01b 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 d5744d42f1..8834ba994d 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 1e6249807e..74e5b96565 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 5ecfd3d9ff..f04644858a 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 2fea7278ef..8b7733d6b4 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 40917dd0f7..4453cc1480 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 691f64ae3e..5187aefe46 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 bf1800effc..4ec34f17ff 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 4cb7188925..8d6d8d7896 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 f0ce407eaa..77721f72c8 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 cee50971c6..495e74b24f 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 a9073b822a..d9652cdcff 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 62f238e6b5..96f62a4883 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 7f32682a8a..9df2777d1f 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 7e7469e30f..3aac88f73c 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 962ca24793..208050d9f3 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 2a766040e3..45f6ce4e9a 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 16db6255d1..c0a9a6467f 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 b7578adfed..ec288c5b8a 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 1754f2f914..74d5b40790 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 0c3da5b3a5..8fa76f0eb5 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 c9b94a9e21..7ee91de5ad 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 5861bc5117..5cd028b3ac 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 e88e920a63..6d70b4718b 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 b44cf7fce6..ff5b447fc5 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 96305a611a..d81bd7b8e5 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 6cba8db81c..8bd03627d5 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 56182590c6..8d201c032f 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 ed5a5bae79..04f2f519e9 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 5a12d3934c..b4b4fcbe21 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 6b25bbbf33..c2395e8d8b 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 a3014133a9..88050990b9 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 f8151f5c55..05b694fb87 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 48e6047e8b..731d6e31d9 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 7df14345c6..88864aacea 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 66489ccba4..aa05f04fe0 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 fb636df3af..1220121093 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 9b1df7fdb6..6564f78cc5 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 e62e3b0a95..85289cea4d 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 56fb59feac..d8dd62a7c8 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 2b1fb1d733..375348caea 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 ab8a5ccafc..9df4aae500 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 c7bf2883ba..3e33e7ace4 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 00e22bba8c..f387c16a64 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 385f6a6a5b..cbfe4d415f 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 f1553cec7e..f98449bb53 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 f425132911..1ed493a353 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 694543531e..b1b4ba2789 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 d0f0fac1b6..1177f3f1b1 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 cee80fc8fb..f600cd8ed4 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 7e3928fc35..427649d229 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 3ca14cf1a4..84fac14c25 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 e463b9dfbf..a1b0648c2a 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 55976a1371..2f15be9d4b 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 0330ccf7ee..602f34d4e5 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 0ce427fbb1..89820c1761 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 c5a35a7ebe..896e773897 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 a865ede425..61115c9339 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 477ba3ff79..6d63a49917 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 db010660a3..194d1fb1c7 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 84316762e4..1818a5c5f4 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 4e5e7e41d9..569c2b4e43 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 fdbe4114ab..9a0c435573 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 01bc2564d9..ac8c473c74 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 5fe5a79826..d7f0dcc046 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 c60e1e8ee4..6d5e12625b 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 80e38d974a..860a9bc37a 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 6d212823eb..25d3255437 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 876919d43c..23c3b06675 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 fe98abb441..8940810048 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 09810108c6..4eb45dc73d 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 cc08108d15..98d3434d9e 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 d2907cd22b..23262acc81 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 8842de436d..a65700d84f 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 1d95bf6470..ef6556a52a 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 30763d3157..c96c25c75b 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 267a200b87..bbb0d4885c 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 589c948852..5514b1812f 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 4101d8f32d..7b3f81fb7c 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 f57f6307ea..8a5a6d91b3 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 7f5214cfdc..1dd14a079e 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 60e4a5f3df..65a1ec72e9 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 82a1497341..56b6aa87ae 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 4ecf082f97..9049906ca0 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 32be6b5702..ce5b913e56 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 754381231e..ac5454a13e 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 78a79ffe76..66b9e848e3 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 e6b2499775..b7de035e2b 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 c0ab4adebb..f490733a7e 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 6be8157608..ed9a84083e 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 183a525180..7b4f106e63 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 412e06df20..1cd12f42d1 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 4b06af8afc..8f14b9724f 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 5e78176195..a18f2bc82b 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 22288e5f94..0bb51ce822 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 53a5e9b692..5005093f43 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 f7fae113cb..77214f84f0 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 8dbf44805d..26333559cc 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 73bd868b06..769710dfb9 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 cc2d114512..66cabddbb9 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 fa110d602a..512db94217 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 ba653d9942..03a2d56f43 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 630e19b841..60bf2f44b0 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 ba9aea1cb0..2e99189cf8 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 9975e7f764..4597fa64cc 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 33a564349b..669cdc6f29 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 9af531594c..8668a55cf8 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 211d79928a..2cbbaebd6f 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 6e86e11667..e3b93bc3f8 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 d4e085cf9f..d4e6bbc5b6 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 c91708c27e..90670444d3 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 1e4e1592ac..d79dcbe0c3 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 8afe719299..4196152f13 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 3ac7399c52..0d221ea611 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 4501cc5c7d..7012ed93fd 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 7d86d4694f..56cf89af5c 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 0d6199322c..0f3ae9805c 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 4d9c2e5046..78985e8734 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 76cca1242e..de7f4f8843 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 a70ee77716..e28260d8bd 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 96e04dbbe5..2ce7530736 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 9f193bc2f9..df5fd59bb4 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 20ecf0d920..5c52d52006 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 1ad537d8bf..018ffe3137 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 b46e1e1e4f..435019282e 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 8f915372fe..105b706cef 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 465a6c08e6..761f77ca62 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 a1c3dc4a75..cf5a16ab37 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 948f0a3ead..008e4bce15 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 37ac501b89..ad5073e503 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 2c52aa9217..b9ce24fb4f 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 169d6b9cb0..fd21015200 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 fee8f5124d..d6d53351dd 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 d2ba4a1839..8d5c935df1 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 36dae403be..f96332f583 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 1f5b42485f..52eb9b2ce1 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 0f508f5019..bf2f3af8e5 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 fd9eb2bafb..ecb3a57b90 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 d22ee2d912..d4333a7d7f 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 94ad6f4a10..4bf7d7c4c9 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 21d47fdb6e..350a8ed783 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 82b9d89d25..d3956ec502 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 ed760c37d9..fd702693b7 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 9171cf9f06..675b459af8 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 0fd7c6d0b7..fabfdb13ba 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 8df9837c90..68d87284cd 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 74073b4854..ec9b5357ce 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 ec21390782..4faf282a1f 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 dc63af0546..dadcdd1507 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 ae1d6d0833..6730d0f118 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 5a96280caf..556c3fbf8c 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 30483f4c1d..f68bad461a 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 1c8a8ebbd8..02ada1a3cc 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 3492487eff..27cf65c34c 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 From 1250821ba817bffe14b25cd95421b122ba91dfc7 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Mon, 20 Jul 2026 18:11:52 +0200 Subject: [PATCH 2/2] test: drop `assert.is_true()` and friends --- test/assert.lua | 28 +----- test/functional/autocmd/filetype_spec.lua | 2 +- test/functional/harness/harness_spec.lua | 105 +++++++++++----------- test/functional/terminal/parser_spec.lua | 8 +- test/unit/garray_spec.lua | 8 +- test/unit/memory_spec.lua | 4 +- test/unit/os/env_spec.lua | 6 +- test/unit/os/fs_spec.lua | 90 +++++++++---------- test/unit/os/users_spec.lua | 4 +- test/unit/profile_spec.lua | 26 +++--- test/unit/tempfile_spec.lua | 6 +- 11 files changed, 131 insertions(+), 156 deletions(-) diff --git a/test/assert.lua b/test/assert.lua index 4ec1c610ae..5be7d21f00 100644 --- a/test/assert.lua +++ b/test/assert.lua @@ -5,7 +5,7 @@ local FORMAT_DEPTH = 100 --- @param value any --- @return string -local function format_value(value) +local function fmt(value) if type(value) == 'string' then return string.format('%q', value) end @@ -36,8 +36,8 @@ end local function comparison_message(expected, actual, comparator) return ('Expected values to be %s.\nExpected:\n%s\nActual:\n%s'):format( comparator, - format_value(expected), - format_value(actual) + fmt(expected), + fmt(actual) ) end @@ -63,30 +63,10 @@ function M.neq(expected, actual, context) not vim.deep_equal(expected, actual), actual, context, - ('Expected values to differ.\nValue:\n%s'):format(format_value(actual)) + ('Expected values to differ.\nValue:\n%s'):format(fmt(actual)) ) end ---- @param value any ---- @param context? any ---- @return any -function M.is_true(value, context) - return M.eq(true, value, context) -end - ---- @param value any ---- @param context? any ---- @return any -function M.is_false(value, context) - return M.eq(false, value, context) -end - --- TODO(lewis6991): remove these aliases -M.True = M.is_true -M.False = M.is_false -M.equals = M.eq -M.Equal = M.eq - return setmetatable(M, { --- @param condition any --- @param message? string diff --git a/test/functional/autocmd/filetype_spec.lua b/test/functional/autocmd/filetype_spec.lua index 72ce5cb836..4841377946 100644 --- a/test/functional/autocmd/filetype_spec.lua +++ b/test/functional/autocmd/filetype_spec.lua @@ -14,6 +14,6 @@ describe('autocmd FileType', function() command('let g:foo = 0') command('autocmd FileType help let g:foo = g:foo + 1') command('help help') - assert.eq(1, eval('g:foo')) + t.eq(1, eval('g:foo')) end) end) diff --git a/test/functional/harness/harness_spec.lua b/test/functional/harness/harness_spec.lua index 51e5b9ba26..8ef99f5db6 100644 --- a/test/functional/harness/harness_spec.lua +++ b/test/functional/harness/harness_spec.lua @@ -1,8 +1,7 @@ -- 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 describe, it, pending, finally = t.describe, t.it, t.pending, t.finally local uv = vim.uv local eq = t.eq @@ -19,6 +18,11 @@ local function mkdir(path) assert(t.mkdir(path), ('failed to create directory: %s'):format(path)) end +-- Prepended to each *_spec.lua fixture so it can use the test framework. +local spec_preamble = "local h = require('test.harness'); local eq = require('test.assert').eq; " + .. 'local describe, it, before_each, after_each, setup, teardown, pending, finally = ' + .. 'h.describe, h.it, h.before_each, h.after_each, h.setup, h.teardown, h.pending, h.finally; ' + ---@param suite_files table ---@return string local function write_suite(suite_files) @@ -26,6 +30,9 @@ local function write_suite(suite_files) mkdir(dir) for name, contents in pairs(suite_files) do + if name:match('_spec%.lua$') then + contents = spec_preamble .. contents + end t.write_file(dir .. '/' .. name, contents) end @@ -148,7 +155,7 @@ describe('test harness', function() describe('one', function() it('defines a preload entry', function() - assert.Equal('leak', require('leak_mod')) + eq('leak', require('leak_mod')) end) end) ]], @@ -156,7 +163,7 @@ describe('test harness', function() describe('two', function() it('does not see the preload entry from another file', function() local ok = pcall(require, 'leak_mod') - assert.False(ok) + assert(not ok) end) end) ]], @@ -173,9 +180,9 @@ describe('test harness', function() ['one_spec.lua'] = [[ describe('one', function() it('mutates package.loaded', function() - assert.Equal('file', require('loaded_mod').source) + eq('file', require('loaded_mod').source) package.loaded.loaded_mod = 'leak' - assert.Equal('leak', require('loaded_mod')) + eq('leak', require('loaded_mod')) end) end) ]], @@ -183,7 +190,7 @@ describe('test harness', function() describe('two', function() it('does not see package.loaded leaks from another file', function() local mod = require('loaded_mod') - assert.Equal('file', mod.source) + eq('file', mod.source) end) end) ]], @@ -200,7 +207,7 @@ describe('test harness', function() describe('one', function() it('mutates the environment', function() vim.uv.os_setenv(%q, 'leak') - assert.Equal('leak', vim.uv.os_getenv(%q)) + eq('leak', vim.uv.os_getenv(%q)) end) end) ]], @@ -211,7 +218,7 @@ describe('test harness', function() [[ describe('two', function() it('does not see environment leaks from another file', function() - assert.Equal(nil, vim.uv.os_getenv(%q)) + eq(nil, vim.uv.os_getenv(%q)) end) end) ]], @@ -228,14 +235,14 @@ describe('test harness', function() describe('one', function() it('mutates a global', function() _G.__harness_leak = 'leak' - assert.Equal('leak', _G.__harness_leak) + eq('leak', _G.__harness_leak) end) end) ]], ['two_spec.lua'] = [[ describe('two', function() it('does not see global leaks from another file', function() - assert.Equal(nil, _G.__harness_leak) + eq(nil, _G.__harness_leak) end) end) ]], @@ -250,14 +257,14 @@ describe('test harness', function() describe('one', function() it('mutates arg', function() _G.arg.__leak = 'leak' - assert.Equal('leak', _G.arg.__leak) + eq('leak', _G.arg.__leak) end) end) ]], ['two_spec.lua'] = [[ describe('two', function() it('does not see arg leaks from another file', function() - assert.Equal(nil, _G.arg.__leak) + eq(nil, _G.arg.__leak) end) end) ]], @@ -274,16 +281,16 @@ describe('test harness', function() ['one_spec.lua'] = [[ describe('one', function() it('mutates a helper-provided global', function() - assert.Equal('baseline', _G.helper_value) + eq('baseline', _G.helper_value) _G.helper_value = 'leak' - assert.Equal('leak', _G.helper_value) + eq('leak', _G.helper_value) end) end) ]], ['two_spec.lua'] = [[ describe('two', function() it('restores the helper baseline between files', function() - assert.Equal('baseline', _G.helper_value) + eq('baseline', _G.helper_value) end) end) ]], @@ -302,16 +309,16 @@ describe('test harness', function() ['one_spec.lua'] = [[ describe('one', function() it('mutates nested helper state in place', function() - assert.Equal('baseline', _G.helper_value.nested) + eq('baseline', _G.helper_value.nested) _G.helper_value.nested = 'leak' - assert.Equal('leak', _G.helper_value.nested) + eq('leak', _G.helper_value.nested) end) end) ]], ['two_spec.lua'] = [[ describe('two', function() it('keeps the same nested helper table', function() - assert.Equal('leak', _G.helper_value.nested) + eq('leak', _G.helper_value.nested) end) end) ]], @@ -334,14 +341,14 @@ describe('test harness', function() ['one_spec.lua'] = [[ describe('one', function() it('uses the helper-loaded module', function() - assert.Equal(1, require('helper_mod').loads) + eq(1, require('helper_mod').loads) end) end) ]], ['two_spec.lua'] = [[ describe('two', function() it('does not reload the helper module', function() - assert.Equal(1, require('helper_mod').loads) + eq(1, require('helper_mod').loads) end) end) ]], @@ -416,7 +423,7 @@ describe('test harness', function() describe('one', function() it('works', function() - assert.True(true) + assert(true) end) end) ]], @@ -425,7 +432,7 @@ describe('test harness', function() describe('two', function() it('works', function() - assert.True(true) + assert(true) end) end) ]], @@ -464,10 +471,8 @@ describe('test harness', function() end end - t.write_file( - left .. '/same_spec.lua', - string.format( - [[ + t.write_file(left .. '/same_spec.lua', spec_preamble .. string.format( + [[ local harness = require('test.harness') harness.on_suite_end(function() @@ -480,13 +485,10 @@ describe('test harness', function() it('works', function() end) end) ]], - marker - ) - ) - t.write_file( - right .. '/same_spec.lua', - string.format( - [[ + marker + )) + t.write_file(right .. '/same_spec.lua', spec_preamble .. string.format( + [[ local harness = require('test.harness') harness.on_suite_end(function() @@ -499,9 +501,8 @@ describe('test harness', function() it('works', function() end) end) ]], - marker - ) - ) + marker + )) assert_harness_passes(suite_dir) eq('left\nright\n', t.read_file(marker)) @@ -524,7 +525,7 @@ describe('test harness', function() describe('one', function() it('works', function() - assert.True(true) + assert(true) end) end) ]], @@ -568,7 +569,7 @@ describe('test harness', function() describe('one', function() it('works', function() - assert.True(true) + assert(true) end) end) ]], @@ -601,7 +602,7 @@ describe('test harness', function() ['one_spec.lua'] = [[ describe('one', function() it('works', function() - assert.True(true) + assert(true) end) end) ]], @@ -625,7 +626,7 @@ describe('test harness', function() describe('one', function() it('starts clean', function() - assert.Equal(nil, _G.__repeat_leak) + eq(nil, _G.__repeat_leak) end) end) ]], @@ -748,7 +749,7 @@ describe('test harness', function() describe('one', function() it('skipped', function() - assert.True(true) + assert(true) end) end) ]], @@ -757,7 +758,7 @@ describe('test harness', function() ['two_spec.lua'] = [[ describe('two', function() it('chosen', function() - assert.True(true) + assert(true) end) end) ]], @@ -900,25 +901,19 @@ describe('test harness', function() local suite_dir = t.tmpname(false) mkdir(suite_dir) - t.write_file( - suite_dir .. '/one_spec.lua', - [[ + t.write_file(suite_dir .. '/one_spec.lua', spec_preamble .. [[ describe('one', function() it('works', function() end) end) - ]] - ) + ]]) local blocked = suite_dir .. '/blocked' mkdir(blocked) - t.write_file( - blocked .. '/two_spec.lua', - [[ + t.write_file(blocked .. '/two_spec.lua', spec_preamble .. [[ describe('two', function() it('is hidden behind permissions', function() end) end) - ]] - ) + ]]) finally(function() assert(uv.fs_chmod(blocked, 448)) end) @@ -1079,7 +1074,7 @@ describe('test harness', function() ['one_spec.lua'] = [[ describe('one', function() it('equal fail', function() - assert.Equal(1, 2) + eq(1, 2) end) end) ]], @@ -1222,7 +1217,7 @@ describe('test harness', function() end) it('afterwrap', function() - assert.True(true) + assert(true) end) end) ]], diff --git a/test/functional/terminal/parser_spec.lua b/test/functional/terminal/parser_spec.lua index 208050d9f3..d2cfae0794 100644 --- a/test/functional/terminal/parser_spec.lua +++ b/test/functional/terminal/parser_spec.lua @@ -28,7 +28,7 @@ describe(':terminal', function() api.nvim_chan_send(chan, input) --- @type string local term_title = api.nvim_buf_get_var(0, 'term_title') - assert.Equal(term_title, 'This title set with OSC 2') + t.eq(term_title, 'This title set with OSC 2') assert_alive() end) @@ -40,7 +40,7 @@ describe(':terminal', function() api.nvim_chan_send(chan, input) --- @type string local term_title = api.nvim_buf_get_var(0, 'term_title') - assert.Equal(term_title, 'This title set with OSC 0') + t.eq(term_title, 'This title set with OSC 0') assert_alive() end) @@ -82,14 +82,14 @@ describe(':terminal', function() send_osc_with_terminator(BEL) --- @type string - assert.eq( + t.eq( { sequence = OSC_PREFIX .. '10;?', terminator = BEL }, exec_lua([[return _G.osc10_response]]) ) send_osc_with_terminator(ST) --- @type string - assert.eq( + t.eq( { sequence = OSC_PREFIX .. '10;?', terminator = ST }, exec_lua([[return _G.osc10_response]]) ) diff --git a/test/unit/garray_spec.lua b/test/unit/garray_spec.lua index 761f77ca62..ffd4f750ff 100644 --- a/test/unit/garray_spec.lua +++ b/test/unit/garray_spec.lua @@ -74,7 +74,7 @@ local ga_clear = function(garr) end local ga_clear_strings = function(garr) - assert.is_true(ga_itemsize(garr) == ffi.sizeof('char *')) + t.ok(ga_itemsize(garr) == ffi.sizeof('char *')) return garray.ga_clear_strings(garr) end @@ -104,7 +104,7 @@ end -- derived manipulators local ga_set_len = function(garr, len) - assert.is_true(len <= ga_maxlen(garr)) + t.ok(len <= ga_maxlen(garr)) garr[0].ga_len = len end @@ -115,7 +115,7 @@ end -- custom append functions -- not the C ga_append, which only works for bytes local ga_append_int = function(garr, it) - assert.is_true(ga_itemsize(garr) == ffi.sizeof('int')) + t.ok(ga_itemsize(garr) == ffi.sizeof('int')) ga_grow(garr, 1) local data = ga_data_as_ints(garr) data[ga_len(garr)] = it @@ -123,7 +123,7 @@ local ga_append_int = function(garr, it) end local ga_append_string = function(garr, it) - assert.is_true(ga_itemsize(garr) == ffi.sizeof('char *')) + t.ok(ga_itemsize(garr) == ffi.sizeof('char *')) -- make a non-garbage collected string and copy the lua string into it, -- TODO(aktau): we should probably call xmalloc here, though as long as -- xmalloc is based on malloc it should work. diff --git a/test/unit/memory_spec.lua b/test/unit/memory_spec.lua index fd21015200..2f5d8e7343 100644 --- a/test/unit/memory_spec.lua +++ b/test/unit/memory_spec.lua @@ -12,7 +12,7 @@ local cimp = cimport('stdlib.h', './src/nvim/memory.h') describe('xstrlcat()', function() local function test_xstrlcat(dst, src, dsize) - assert.is_true(dsize >= 1 + string.len(dst)) -- sanity check for tests + t.ok(dsize >= 1 + string.len(dst)) -- sanity check for tests local dst_cstr = cstr(dsize, dst) local src_cstr = to_cstr(src) eq(string.len(dst .. src), cimp.xstrlcat(dst_cstr, src_cstr, dsize)) @@ -20,7 +20,7 @@ describe('xstrlcat()', function() end local function test_xstrlcat_overlap(dst, src_idx, dsize) - assert.is_true(dsize >= 1 + string.len(dst)) -- sanity check for tests + t.ok(dsize >= 1 + string.len(dst)) -- sanity check for tests local dst_cstr = cstr(dsize, dst) local src_cstr = dst_cstr + src_idx -- pointer into `dst` (overlaps) eq(string.len(dst) + string.len(dst) - src_idx, cimp.xstrlcat(dst_cstr, src_cstr, dsize)) diff --git a/test/unit/os/env_spec.lua b/test/unit/os/env_spec.lua index bf2f3af8e5..994e2cdf1f 100644 --- a/test/unit/os/env_spec.lua +++ b/test/unit/os/env_spec.lua @@ -255,7 +255,7 @@ describe('env.c', function() eq(OK, os_unsetenv(name)) neq(value, os_getenv(name)) -- Depending on the platform the var might be unset or set as '' - assert.True(os_getenv(name) == nil or os_getenv(name) == '') + t.ok(os_getenv(name) == nil or os_getenv(name) == '') if os_getenv(name) == nil then eq(false, os_env_exists(name, false)) end @@ -373,8 +373,8 @@ describe('env.c', function() local dst = cstr(256, '~' .. curuser) cimp.expand_env_esc(src, dst, 256, NULL, false, NULL) local len = string.len(ffi.string(dst)) - assert.True(len > 56) - assert.True(len < 256) + t.ok(len > 56) + t.ok(len < 256) end) itp('respects `dstlen` without expansion', function() diff --git a/test/unit/os/fs_spec.lua b/test/unit/os/fs_spec.lua index d4333a7d7f..1d6ae312ec 100644 --- a/test/unit/os/fs_spec.lua +++ b/test/unit/os/fs_spec.lua @@ -247,12 +247,12 @@ describe('fs.c', function() end) itp('returns a perm > 0 when given an existing file', function() - assert.is_true((os_getperm('unit-test-directory')) > 0) + t.ok((os_getperm('unit-test-directory')) > 0) end) itp('returns S_IRUSR when the file is readable', function() local perm = os_getperm('unit-test-directory') - assert.is_true((bit_set(perm, ffi.C.kS_IRUSR))) + t.ok((bit_set(perm, ffi.C.kS_IRUSR))) end) end) @@ -262,11 +262,11 @@ describe('fs.c', function() perm = unset_bit(perm, ffi.C.kS_IXUSR) eq(OK, (os_setperm('unit-test-directory/test.file', perm))) perm = os_getperm('unit-test-directory/test.file') - assert.is_false((bit_set(perm, ffi.C.kS_IXUSR))) + assert(not (bit_set(perm, ffi.C.kS_IXUSR))) perm = set_bit(perm, ffi.C.kS_IXUSR) eq(OK, os_setperm('unit-test-directory/test.file', perm)) perm = os_getperm('unit-test-directory/test.file') - assert.is_true((bit_set(perm, ffi.C.kS_IXUSR))) + t.ok((bit_set(perm, ffi.C.kS_IXUSR))) end) itp('fails if given file does not exist', function() @@ -534,7 +534,7 @@ describe('fs.c', function() function() assert_file_does_not_exist(new_file) local fd = os_open(new_file, ffi.C.kO_CREAT, 0) - assert.is_true(0 <= fd) + t.ok(0 <= fd) eq(0, os_close(fd)) end ) @@ -542,7 +542,7 @@ describe('fs.c', function() itp('returns non-negative for O_CREAT on a existing file which then can be closed', function() assert_file_exists(existing_file) local fd = os_open(existing_file, ffi.C.kO_CREAT, 0) - assert.is_true(0 <= fd) + t.ok(0 <= fd) eq(0, os_close(fd)) end) @@ -573,7 +573,7 @@ describe('fs.c', function() 'returns a non-negative file descriptor for an existing file which then can be closed', function() local fd = os_open(existing_file, ffi.C.kO_RDWR, 0) - assert.is_true(0 <= fd) + t.ok(0 <= fd) eq(0, os_close(fd)) end ) @@ -916,26 +916,26 @@ describe('fs.c', function() describe('os_fileinfo', function() itp('returns false if path=NULL', function() local info = file_info_new() - assert.is_false((fs.os_fileinfo(nil, info))) + assert(not (fs.os_fileinfo(nil, info))) end) itp('returns false if given a non-existing file', function() local info = file_info_new() - assert.is_false((fs.os_fileinfo('/non-existent', info))) + assert(not (fs.os_fileinfo('/non-existent', info))) end) itp('returns true if given an existing file and fills FileInfo', function() local info = file_info_new() local path = 'unit-test-directory/test.file' - assert.is_true((fs.os_fileinfo(path, info))) - assert.is_true((has_fileinfo(info))) + t.ok((fs.os_fileinfo(path, info))) + t.ok((has_fileinfo(info))) end) itp('returns the FileInfo of the linked file, not the link', function() local info = file_info_new() local path = 'unit-test-directory/test_link.file' - assert.is_true((fs.os_fileinfo(path, info))) - assert.is_true((has_fileinfo(info))) + t.ok((fs.os_fileinfo(path, info))) + t.ok((has_fileinfo(info))) local mode = tonumber(info[0].stat.st_mode) return eq(ffi.C.kS_IFREG, (bit.band(mode, ffi.C.kS_IFMT))) end) @@ -944,21 +944,21 @@ describe('fs.c', function() describe('os_fileinfo_link', function() itp('returns false for non-existing file', function() local info = file_info_new() - assert.is_false((fs.os_fileinfo_link('/non-existent', info))) + assert(not (fs.os_fileinfo_link('/non-existent', info))) end) itp('returns true and fills FileInfo for existing file', function() local info = file_info_new() local path = 'unit-test-directory/test.file' - assert.is_true((fs.os_fileinfo_link(path, info))) - assert.is_true((has_fileinfo(info))) + t.ok((fs.os_fileinfo_link(path, info))) + t.ok((has_fileinfo(info))) end) itp('returns FileInfo of the link, not its target', function() local info = file_info_new() local link = 'unit-test-directory/test_link.file' - assert.is_true((fs.os_fileinfo_link(link, info))) - assert.is_true((has_fileinfo(info))) + t.ok((fs.os_fileinfo_link(link, info))) + t.ok((has_fileinfo(info))) local mode = tonumber(info[0].stat.st_mode) eq(ffi.C.kS_IFLNK, (bit.band(mode, ffi.C.kS_IFMT))) end) @@ -967,15 +967,15 @@ describe('fs.c', function() describe('os_fileinfo_fd', function() itp('returns false if given an invalid file descriptor', function() local info = file_info_new() - assert.is_false((fs.os_fileinfo_fd(-1, info))) + assert(not (fs.os_fileinfo_fd(-1, info))) end) itp('returns true if given a file descriptor and fills FileInfo', function() local info = file_info_new() local path = 'unit-test-directory/test.file' local fd = ffi.C.open(path, 0) - assert.is_true((fs.os_fileinfo_fd(fd, info))) - assert.is_true((has_fileinfo(info))) + t.ok((fs.os_fileinfo_fd(fd, info))) + t.ok((has_fileinfo(info))) ffi.C.close(fd) end) end) @@ -986,18 +986,18 @@ describe('fs.c', function() local file_info_2 = file_info_new() local path_1 = 'unit-test-directory/test.file' local path_2 = 'unit-test-directory/test_2.file' - assert.is_true((fs.os_fileinfo(path_1, file_info_1))) - assert.is_true((fs.os_fileinfo(path_2, file_info_2))) - assert.is_false((fs.os_fileinfo_id_equal(file_info_1, file_info_2))) + t.ok((fs.os_fileinfo(path_1, file_info_1))) + t.ok((fs.os_fileinfo(path_2, file_info_2))) + assert(not (fs.os_fileinfo_id_equal(file_info_1, file_info_2))) end) itp('returns true if file infos represent the same file', function() local file_info_1 = file_info_new() local file_info_2 = file_info_new() local path = 'unit-test-directory/test.file' - assert.is_true((fs.os_fileinfo(path, file_info_1))) - assert.is_true((fs.os_fileinfo(path, file_info_2))) - assert.is_true((fs.os_fileinfo_id_equal(file_info_1, file_info_2))) + t.ok((fs.os_fileinfo(path, file_info_1))) + t.ok((fs.os_fileinfo(path, file_info_2))) + t.ok((fs.os_fileinfo_id_equal(file_info_1, file_info_2))) end) itp('returns true if file infos represent the same file (symlink)', function() @@ -1005,9 +1005,9 @@ describe('fs.c', function() local file_info_2 = file_info_new() local path_1 = 'unit-test-directory/test.file' local path_2 = 'unit-test-directory/test_link.file' - assert.is_true((fs.os_fileinfo(path_1, file_info_1))) - assert.is_true((fs.os_fileinfo(path_2, file_info_2))) - assert.is_true((fs.os_fileinfo_id_equal(file_info_1, file_info_2))) + t.ok((fs.os_fileinfo(path_1, file_info_1))) + t.ok((fs.os_fileinfo(path_2, file_info_2))) + t.ok((fs.os_fileinfo_id_equal(file_info_1, file_info_2))) end) end) @@ -1016,7 +1016,7 @@ describe('fs.c', function() local info = file_info_new() local file_id = file_id_new() local path = 'unit-test-directory/test.file' - assert.is_true((fs.os_fileinfo(path, info))) + t.ok((fs.os_fileinfo(path, info))) fs.os_fileinfo_id(info, file_id) eq(info[0].stat.st_ino, file_id[0].inode) eq(info[0].stat.st_dev, file_id[0].device_id) @@ -1027,7 +1027,7 @@ describe('fs.c', function() itp('returns the inode from FileInfo', function() local info = file_info_new() local path = 'unit-test-directory/test.file' - assert.is_true((fs.os_fileinfo(path, info))) + t.ok((fs.os_fileinfo(path, info))) local inode = fs.os_fileinfo_inode(info) eq(info[0].stat.st_ino, inode) end) @@ -1042,7 +1042,7 @@ describe('fs.c', function() file:close() local size = uv.fs_stat(path).size local info = file_info_new() - assert.is_true(fs.os_fileinfo(path, info)) + t.ok(fs.os_fileinfo(path, info)) eq(size, fs.os_fileinfo_size(info)) end) end) @@ -1052,10 +1052,10 @@ describe('fs.c', function() local path = 'unit-test-directory/test.file' local path_link = 'unit-test-directory/test_hlink.file' local info = file_info_new() - assert.is_true(fs.os_fileinfo(path, info)) + t.ok(fs.os_fileinfo(path, info)) eq(1, fs.os_fileinfo_hardlinks(info)) uv.fs_link(path, path_link) - assert.is_true(fs.os_fileinfo(path, info)) + t.ok(fs.os_fileinfo(path, info)) eq(2, fs.os_fileinfo_hardlinks(info)) end) end) @@ -1065,7 +1065,7 @@ describe('fs.c', function() local path = 'unit-test-directory/test.file' local blksize = uv.fs_stat(path).blksize local info = file_info_new() - assert.is_true(fs.os_fileinfo(path, info)) + t.ok(fs.os_fileinfo(path, info)) if blksize then eq(blksize, fs.os_fileinfo_blocksize(info)) else @@ -1080,15 +1080,15 @@ describe('fs.c', function() describe('os_fileid', function() itp('returns false if given an non-existing file', function() local file_id = file_id_new() - assert.is_false((fs.os_fileid('/non-existent', file_id))) + assert(not (fs.os_fileid('/non-existent', file_id))) end) itp('returns true if given an existing file and fills file_id', function() local file_id = file_id_new() local path = 'unit-test-directory/test.file' - assert.is_true((fs.os_fileid(path, file_id))) - assert.is_true(0 < file_id[0].inode) - assert.is_true(0 < file_id[0].device_id) + t.ok((fs.os_fileid(path, file_id))) + t.ok(0 < file_id[0].inode) + t.ok(0 < file_id[0].device_id) end) end) @@ -1096,8 +1096,8 @@ describe('fs.c', function() itp('returns true if two FileIDs are equal', function() local file_id = file_id_new() local path = 'unit-test-directory/test.file' - assert.is_true((fs.os_fileid(path, file_id))) - assert.is_true((fs.os_fileid_equal(file_id, file_id))) + t.ok((fs.os_fileid(path, file_id))) + t.ok((fs.os_fileid_equal(file_id, file_id))) end) itp('returns false if two FileIDs are not equal', function() @@ -1105,9 +1105,9 @@ describe('fs.c', function() local file_id_2 = file_id_new() local path_1 = 'unit-test-directory/test.file' local path_2 = 'unit-test-directory/test_2.file' - assert.is_true((fs.os_fileid(path_1, file_id_1))) - assert.is_true((fs.os_fileid(path_2, file_id_2))) - assert.is_false((fs.os_fileid_equal(file_id_1, file_id_2))) + t.ok((fs.os_fileid(path_1, file_id_1))) + t.ok((fs.os_fileid(path_2, file_id_2))) + assert(not (fs.os_fileid_equal(file_id_1, file_id_2))) end) end) end) diff --git a/test/unit/os/users_spec.lua b/test/unit/os/users_spec.lua index 350a8ed783..0b4c6fe4cd 100644 --- a/test/unit/os/users_spec.lua +++ b/test/unit/os/users_spec.lua @@ -37,7 +37,7 @@ describe('users function', function() local ga_users = garray_new() eq(OK, users.os_get_usernames(ga_users)) local user_count = garray_get_len(ga_users) - assert.is_true(user_count > 0) + t.ok(user_count > 0) local current_username_found = false for i = 0, user_count - 1 do local name = ffi.string((garray_get_item(ga_users, i))) @@ -45,7 +45,7 @@ describe('users function', function() current_username_found = true end end - assert.is_true(current_username_found) + t.ok(current_username_found) end) end) diff --git a/test/unit/profile_spec.lua b/test/unit/profile_spec.lua index fd702693b7..7d7c2074d8 100644 --- a/test/unit/profile_spec.lua +++ b/test/unit/profile_spec.lua @@ -37,7 +37,7 @@ local function cmp_assert(v1, v2, op, opstr) if res == false then print(string.format('expected: %f %s %f', v1, opstr, v2)) end - assert.is_true(res) + t.ok(res) end local function lt(a, b) -- luacheck: ignore @@ -114,17 +114,17 @@ describe('profiling related functions', function() describe('profile_cmp', function() itp('can compare subsequent starts', function() local s1, s2 = profile_start(), profile_start() - assert.is_true(profile_cmp(s1, s2) > 0) - assert.is_true(profile_cmp(s2, s1) < 0) + t.ok(profile_cmp(s1, s2) > 0) + t.ok(profile_cmp(s2, s1) < 0) end) itp('can compare the zero element', function() - assert.is_true(profile_cmp(profile_zero(), profile_zero()) == 0) + t.ok(profile_cmp(profile_zero(), profile_zero()) == 0) end) itp('correctly orders divisions', function() local start = profile_start() - assert.is_true(profile_cmp(start, profile_divide(start, 10)) <= 0) + t.ok(profile_cmp(start, profile_divide(start, 10)) <= 0) end) end) @@ -145,8 +145,8 @@ describe('profiling related functions', function() -- res should be in the range [start - divisor, start + divisor] local start_min, start_max = profile_sub(start, divisor), profile_add(start, divisor) - assert.is_true(profile_cmp(start_min, res) >= 0) - assert.is_true(profile_cmp(start_max, res) <= 0) + t.ok(profile_cmp(start_min, res) >= 0) + t.ok(profile_cmp(start_max, res) <= 0) end) end) @@ -192,7 +192,7 @@ describe('profiling related functions', function() itp('sets a limit in the future otherwise', function() local future = profile_setlimit(1000) local now = profile_start() - assert.is_true(profile_cmp(future, now) < 0) + t.ok(profile_cmp(future, now) < 0) end) end) @@ -232,14 +232,14 @@ describe('profiling related functions', function() -- more or less the same goes for the microsecond part, if it doesn't -- start with 0, it's too slow. - assert.is_true(starts(us, '0')) + t.ok(starts(us, '0')) end) end) describe('profile_add', function() itp('adds profiling times', function() local start = profile_start() - assert.equals(start, profile_add(profile_zero(), start)) + t.eq(start, profile_add(profile_zero(), start)) end) end) @@ -247,16 +247,16 @@ describe('profiling related functions', function() itp('subtracts profiling times', function() -- subtracting zero does nothing local start = profile_start() - assert.equals(start, profile_sub(start, profile_zero())) + t.eq(start, profile_sub(start, profile_zero())) local start1, start2, start3 = profile_start(), profile_start(), profile_start() local cmp = profile_cmp(profile_sub(start2, start1), profile_sub(start3, start1)) -- t2 >= t1 => profile_cmp(t1, t2) >= 0 - assert.is_true(cmp >= 0) + t.ok(cmp >= 0) cmp = profile_cmp(profile_sub(start3, start1), profile_sub(start2, start1)) -- t2 <= t1 => profile_cmp(t1, t2) <= 0 - assert.is_true(cmp <= 0) + t.ok(cmp <= 0) end) end) end) diff --git a/test/unit/tempfile_spec.lua b/test/unit/tempfile_spec.lua index ec9b5357ce..44b1bdeda7 100644 --- a/test/unit/tempfile_spec.lua +++ b/test/unit/tempfile_spec.lua @@ -26,12 +26,12 @@ describe('tempfile related functions', function() describe('vim_gettempdir', function() itp('returns path to Nvim own temp directory', function() local dir = vim_gettempdir() - assert.True(dir ~= nil and dir:len() > 0) + t.ok(dir ~= nil and dir:len() > 0) -- os_file_is_writable returns 2 for a directory which we have rights -- to write into. eq(2, lib.os_file_is_writable(t.to_cstr(dir))) for entry in vim.fs.dir(dir) do - assert.True(entry == '.' or entry == '..') + t.ok(entry == '.' or entry == '..') end end) @@ -48,7 +48,7 @@ describe('tempfile related functions', function() itp('generate name of non-existing file', function() local file = vim_tempname() assert(file) - assert.False(lib.os_path_exists(file)) + assert(not lib.os_path_exists(file)) end) itp('generate different names on each call', function()