diff options
Diffstat (limited to 'test/functional/autocmd')
23 files changed, 165 insertions, 137 deletions
diff --git a/test/functional/autocmd/autocmd_oldtest_spec.lua b/test/functional/autocmd/autocmd_oldtest_spec.lua index e0df54e20e..1a3b723ac2 100644 --- a/test/functional/autocmd/autocmd_oldtest_spec.lua +++ b/test/functional/autocmd/autocmd_oldtest_spec.lua @@ -1,14 +1,15 @@ -local t = require('test.functional.testutil')() +local t = require('test.testutil') +local n = require('test.functional.testnvim')() local Screen = require('test.functional.ui.screen') -local clear = t.clear +local clear = n.clear local eq = t.eq -local api = t.api -local fn = t.fn -local exec = t.exec -local feed = t.feed +local api = n.api +local fn = n.fn +local exec = n.exec +local feed = n.feed local assert_log = t.assert_log -local check_close = t.check_close +local check_close = n.check_close local is_os = t.is_os local testlog = 'Xtest_autocmd_oldtest_log' diff --git a/test/functional/autocmd/autocmd_spec.lua b/test/functional/autocmd/autocmd_spec.lua index d5c4625b72..5e407a9986 100644 --- a/test/functional/autocmd/autocmd_spec.lua +++ b/test/functional/autocmd/autocmd_spec.lua @@ -1,24 +1,25 @@ -local t = require('test.functional.testutil')() +local t = require('test.testutil') +local n = require('test.functional.testnvim')() local Screen = require('test.functional.ui.screen') -local assert_visible = t.assert_visible -local assert_alive = t.assert_alive +local assert_visible = n.assert_visible +local assert_alive = n.assert_alive local dedent = t.dedent local eq = t.eq local neq = t.neq -local eval = t.eval -local feed = t.feed -local clear = t.clear +local eval = n.eval +local feed = n.feed +local clear = n.clear local matches = t.matches -local api = t.api +local api = n.api local pcall_err = t.pcall_err -local fn = t.fn -local expect = t.expect -local command = t.command -local exc_exec = t.exc_exec -local exec_lua = t.exec_lua +local fn = n.fn +local expect = n.expect +local command = n.command +local exc_exec = n.exc_exec +local exec_lua = n.exec_lua local retry = t.retry -local source = t.source +local source = n.source describe('autocmd', function() before_each(clear) diff --git a/test/functional/autocmd/bufenter_spec.lua b/test/functional/autocmd/bufenter_spec.lua index 7851ed5fe3..72e650cae4 100644 --- a/test/functional/autocmd/bufenter_spec.lua +++ b/test/functional/autocmd/bufenter_spec.lua @@ -1,11 +1,12 @@ -local t = require('test.functional.testutil')() +local t = require('test.testutil') +local n = require('test.functional.testnvim')() -local clear = t.clear -local command = t.command +local clear = n.clear +local command = n.command local eq = t.eq -local eval = t.eval -local request = t.request -local source = t.source +local eval = n.eval +local request = n.request +local source = n.source describe('autocmd BufEnter', function() before_each(clear) @@ -33,7 +34,7 @@ describe('autocmd BufEnter', function() end) it('triggered by ":split normal|:help|:bw"', function() - t.add_builddir_to_rtp() + n.add_builddir_to_rtp() command('split normal') command('wincmd j') command('help') diff --git a/test/functional/autocmd/bufmodifiedset_spec.lua b/test/functional/autocmd/bufmodifiedset_spec.lua index 25d6adee21..fb8f160b05 100644 --- a/test/functional/autocmd/bufmodifiedset_spec.lua +++ b/test/functional/autocmd/bufmodifiedset_spec.lua @@ -1,10 +1,11 @@ -local t = require('test.functional.testutil')() +local t = require('test.testutil') +local n = require('test.functional.testnvim')() -local clear = t.clear +local clear = n.clear local eq = t.eq -local eval = t.eval -local source = t.source -local request = t.request +local eval = n.eval +local source = n.source +local request = n.request describe('BufModified', function() before_each(clear) diff --git a/test/functional/autocmd/cmdline_spec.lua b/test/functional/autocmd/cmdline_spec.lua index 84cd3f838f..ad3bc3576f 100644 --- a/test/functional/autocmd/cmdline_spec.lua +++ b/test/functional/autocmd/cmdline_spec.lua @@ -1,14 +1,15 @@ -local t = require('test.functional.testutil')() +local t = require('test.testutil') +local n = require('test.functional.testnvim')() local Screen = require('test.functional.ui.screen') -local clear = t.clear -local command = t.command +local clear = n.clear +local command = n.command local eq = t.eq -local expect = t.expect -local eval = t.eval -local next_msg = t.next_msg -local feed = t.feed -local api = t.api +local expect = n.expect +local eval = n.eval +local next_msg = n.next_msg +local feed = n.feed +local api = n.api describe('cmdline autocommands', function() local channel diff --git a/test/functional/autocmd/cursorhold_spec.lua b/test/functional/autocmd/cursorhold_spec.lua index 788630308f..c2815be5c6 100644 --- a/test/functional/autocmd/cursorhold_spec.lua +++ b/test/functional/autocmd/cursorhold_spec.lua @@ -1,12 +1,13 @@ -local t = require('test.functional.testutil')() +local t = require('test.testutil') +local n = require('test.functional.testnvim')() -local clear = t.clear +local clear = n.clear local eq = t.eq -local feed = t.feed +local feed = n.feed local retry = t.retry -local exec = t.source +local exec = n.source local sleep = vim.uv.sleep -local api = t.api +local api = n.api before_each(clear) diff --git a/test/functional/autocmd/cursormoved_spec.lua b/test/functional/autocmd/cursormoved_spec.lua index 58436dc4e7..2cf02e00f3 100644 --- a/test/functional/autocmd/cursormoved_spec.lua +++ b/test/functional/autocmd/cursormoved_spec.lua @@ -1,11 +1,12 @@ -local t = require('test.functional.testutil')() +local t = require('test.testutil') +local n = require('test.functional.testnvim')() -local clear = t.clear +local clear = n.clear local eq = t.eq -local eval = t.eval -local api = t.api -local source = t.source -local command = t.command +local eval = n.eval +local api = n.api +local source = n.source +local command = n.command describe('CursorMoved', function() before_each(clear) diff --git a/test/functional/autocmd/dirchanged_spec.lua b/test/functional/autocmd/dirchanged_spec.lua index 2634b99ea4..24ac737b5b 100644 --- a/test/functional/autocmd/dirchanged_spec.lua +++ b/test/functional/autocmd/dirchanged_spec.lua @@ -1,10 +1,11 @@ -local t = require('test.functional.testutil')() +local t = require('test.testutil') +local n = require('test.functional.testnvim')() -local clear = t.clear -local command = t.command +local clear = n.clear +local command = n.command local eq = t.eq -local eval = t.eval -local request = t.request +local eval = n.eval +local request = n.request local is_os = t.is_os describe('autocmd DirChanged and DirChangedPre', function() @@ -27,7 +28,7 @@ describe('autocmd DirChanged and DirChangedPre', function() end) teardown(function() for _, dir in pairs(dirs) do - t.rmdir(dir) + n.rmdir(dir) end end) diff --git a/test/functional/autocmd/filetype_spec.lua b/test/functional/autocmd/filetype_spec.lua index d1280e322f..91843c7910 100644 --- a/test/functional/autocmd/filetype_spec.lua +++ b/test/functional/autocmd/filetype_spec.lua @@ -1,14 +1,14 @@ -local t = require('test.functional.testutil')() +local n = require('test.functional.testnvim')() -local eval = t.eval -local clear = t.clear -local command = t.command +local eval = n.eval +local clear = n.clear +local command = n.command describe('autocmd FileType', function() before_each(clear) it('is triggered by :help only once', function() - t.add_builddir_to_rtp() + n.add_builddir_to_rtp() command('let g:foo = 0') command('autocmd FileType help let g:foo = g:foo + 1') command('help help') diff --git a/test/functional/autocmd/focus_spec.lua b/test/functional/autocmd/focus_spec.lua index acb7fed22e..5163b576db 100644 --- a/test/functional/autocmd/focus_spec.lua +++ b/test/functional/autocmd/focus_spec.lua @@ -1,7 +1,9 @@ -local t = require('test.functional.testutil')() +local t = require('test.testutil') +local n = require('test.functional.testnvim')() local tt = require('test.functional.terminal.testutil') -local clear = t.clear -local feed_command = t.feed_command + +local clear = n.clear +local feed_command = n.feed_command local feed_data = tt.feed_data if t.skip(t.is_os('win')) then diff --git a/test/functional/autocmd/modechanged_spec.lua b/test/functional/autocmd/modechanged_spec.lua index f0321ff71d..61ce15d91d 100644 --- a/test/functional/autocmd/modechanged_spec.lua +++ b/test/functional/autocmd/modechanged_spec.lua @@ -1,7 +1,9 @@ -local t = require('test.functional.testutil')() -local clear, eval, eq = t.clear, t.eval, t.eq -local feed, command = t.feed, t.command -local exec_lua = t.exec_lua +local t = require('test.testutil') +local n = require('test.functional.testnvim')() + +local clear, eval, eq = n.clear, n.eval, t.eq +local feed, command = n.feed, n.command +local exec_lua = n.exec_lua describe('ModeChanged', function() before_each(function() diff --git a/test/functional/autocmd/recording_spec.lua b/test/functional/autocmd/recording_spec.lua index f6ef1c56c5..6ee61c5676 100644 --- a/test/functional/autocmd/recording_spec.lua +++ b/test/functional/autocmd/recording_spec.lua @@ -1,9 +1,10 @@ -local t = require('test.functional.testutil')() +local t = require('test.testutil') +local n = require('test.functional.testnvim')() -local clear = t.clear +local clear = n.clear local eq = t.eq -local eval = t.eval -local source_vim = t.source +local eval = n.eval +local source_vim = n.source describe('RecordingEnter', function() before_each(clear) diff --git a/test/functional/autocmd/safestate_spec.lua b/test/functional/autocmd/safestate_spec.lua index 746a1aeb98..c45a64e373 100644 --- a/test/functional/autocmd/safestate_spec.lua +++ b/test/functional/autocmd/safestate_spec.lua @@ -1,9 +1,11 @@ -local t = require('test.functional.testutil')() -local clear = t.clear +local t = require('test.testutil') +local n = require('test.functional.testnvim')() + +local clear = n.clear local eq = t.eq -local exec = t.exec -local feed = t.feed -local api = t.api +local exec = n.exec +local feed = n.feed +local api = n.api before_each(clear) diff --git a/test/functional/autocmd/searchwrapped_spec.lua b/test/functional/autocmd/searchwrapped_spec.lua index bcb8fef046..0c0b3595ca 100644 --- a/test/functional/autocmd/searchwrapped_spec.lua +++ b/test/functional/autocmd/searchwrapped_spec.lua @@ -1,11 +1,12 @@ -local t = require('test.functional.testutil')() +local t = require('test.testutil') +local n = require('test.functional.testnvim')() -local clear = t.clear -local command = t.command -local api = t.api +local clear = n.clear +local command = n.command +local api = n.api local eq = t.eq -local eval = t.eval -local feed = t.feed +local eval = n.eval +local feed = n.feed describe('autocmd SearchWrapped', function() before_each(function() diff --git a/test/functional/autocmd/show_spec.lua b/test/functional/autocmd/show_spec.lua index cb3e655029..7e1818c4fd 100644 --- a/test/functional/autocmd/show_spec.lua +++ b/test/functional/autocmd/show_spec.lua @@ -1,14 +1,15 @@ -local t = require('test.functional.testutil')() +local t = require('test.testutil') +local n = require('test.functional.testnvim')() local Screen = require('test.functional.ui.screen') -local clear = t.clear -local command = t.command +local clear = n.clear +local command = n.command local dedent = t.dedent local eq = t.eq -local fn = t.fn -local eval = t.eval -local exec = t.exec -local feed = t.feed +local fn = n.fn +local eval = n.eval +local exec = n.exec +local feed = n.feed describe(':autocmd', function() before_each(function() diff --git a/test/functional/autocmd/signal_spec.lua b/test/functional/autocmd/signal_spec.lua index 8ff7ee9e0f..4416afb3ba 100644 --- a/test/functional/autocmd/signal_spec.lua +++ b/test/functional/autocmd/signal_spec.lua @@ -1,10 +1,11 @@ -local t = require('test.functional.testutil')() +local t = require('test.testutil') +local n = require('test.functional.testnvim')() -local clear = t.clear -local command = t.command +local clear = n.clear +local command = n.command local eq = t.eq -local fn = t.fn -local next_msg = t.next_msg +local fn = n.fn +local next_msg = n.next_msg local is_os = t.is_os local skip = t.skip diff --git a/test/functional/autocmd/tabclose_spec.lua b/test/functional/autocmd/tabclose_spec.lua index c29fb08642..fde72cf4d7 100644 --- a/test/functional/autocmd/tabclose_spec.lua +++ b/test/functional/autocmd/tabclose_spec.lua @@ -1,7 +1,9 @@ -local t = require('test.functional.testutil')() -local clear, eq = t.clear, t.eq -local api = t.api -local command = t.command +local t = require('test.testutil') +local n = require('test.functional.testnvim')() + +local clear, eq = n.clear, t.eq +local api = n.api +local command = n.command describe('TabClosed', function() before_each(clear) diff --git a/test/functional/autocmd/tabnew_spec.lua b/test/functional/autocmd/tabnew_spec.lua index 314b27bdba..80ab5a1944 100644 --- a/test/functional/autocmd/tabnew_spec.lua +++ b/test/functional/autocmd/tabnew_spec.lua @@ -1,9 +1,10 @@ -local t = require('test.functional.testutil')() +local t = require('test.testutil') +local n = require('test.functional.testnvim')() -local clear = t.clear -local command = t.command +local clear = n.clear +local command = n.command local eq = t.eq -local eval = t.eval +local eval = n.eval describe('autocmd TabNew', function() before_each(clear) diff --git a/test/functional/autocmd/tabnewentered_spec.lua b/test/functional/autocmd/tabnewentered_spec.lua index fa3c2cf658..fcfebd7af5 100644 --- a/test/functional/autocmd/tabnewentered_spec.lua +++ b/test/functional/autocmd/tabnewentered_spec.lua @@ -1,13 +1,14 @@ -local t = require('test.functional.testutil')() +local t = require('test.testutil') +local n = require('test.functional.testnvim')() -local clear = t.clear -local command = t.command +local clear = n.clear +local command = n.command local dedent = t.dedent -local eval = t.eval +local eval = n.eval local eq = t.eq -local feed = t.feed -local api = t.api -local exec_capture = t.exec_capture +local feed = n.feed +local api = n.api +local exec_capture = n.exec_capture describe('TabNewEntered', function() describe('au TabNewEntered', function() diff --git a/test/functional/autocmd/termxx_spec.lua b/test/functional/autocmd/termxx_spec.lua index 88850cea52..a63996ae36 100644 --- a/test/functional/autocmd/termxx_spec.lua +++ b/test/functional/autocmd/termxx_spec.lua @@ -1,15 +1,16 @@ -local uv = vim.uv -local t = require('test.functional.testutil')() +local t = require('test.testutil') +local n = require('test.functional.testnvim')() local tt = require('test.functional.terminal.testutil') +local uv = vim.uv -local clear, command, testprg = t.clear, t.command, t.testprg -local eval, eq, neq, retry = t.eval, t.eq, t.neq, t.retry +local clear, command, testprg = n.clear, n.command, n.testprg +local eval, eq, neq, retry = n.eval, t.eq, t.neq, t.retry local matches = t.matches local ok = t.ok -local feed = t.feed -local api = t.api +local feed = n.feed +local api = n.api local pcall_err = t.pcall_err -local assert_alive = t.assert_alive +local assert_alive = n.assert_alive local skip = t.skip local is_os = t.is_os diff --git a/test/functional/autocmd/textchanged_spec.lua b/test/functional/autocmd/textchanged_spec.lua index 1991632cca..7c679cd4c0 100644 --- a/test/functional/autocmd/textchanged_spec.lua +++ b/test/functional/autocmd/textchanged_spec.lua @@ -1,12 +1,14 @@ -local t = require('test.functional.testutil')() -local clear = t.clear -local exec = t.exec -local command = t.command -local feed = t.feed +local t = require('test.testutil') +local n = require('test.functional.testnvim')() + +local clear = n.clear +local exec = n.exec +local command = n.command +local feed = n.feed local eq = t.eq local neq = t.neq -local eval = t.eval -local poke_eventloop = t.poke_eventloop +local eval = n.eval +local poke_eventloop = n.poke_eventloop local write_file = t.write_file -- oldtest: Test_ChangedP() diff --git a/test/functional/autocmd/textyankpost_spec.lua b/test/functional/autocmd/textyankpost_spec.lua index 9c77874652..cf8cbe25c1 100644 --- a/test/functional/autocmd/textyankpost_spec.lua +++ b/test/functional/autocmd/textyankpost_spec.lua @@ -1,7 +1,9 @@ -local t = require('test.functional.testutil')() -local clear, eval, eq = t.clear, t.eval, t.eq -local feed, command, expect = t.feed, t.command, t.expect -local api, fn, neq = t.api, t.fn, t.neq +local t = require('test.testutil') +local n = require('test.functional.testnvim')() + +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 describe('TextYankPost', function() before_each(function() diff --git a/test/functional/autocmd/win_scrolled_resized_spec.lua b/test/functional/autocmd/win_scrolled_resized_spec.lua index 467f80d67f..72bbc1e469 100644 --- a/test/functional/autocmd/win_scrolled_resized_spec.lua +++ b/test/functional/autocmd/win_scrolled_resized_spec.lua @@ -1,14 +1,15 @@ -local t = require('test.functional.testutil')() +local t = require('test.testutil') +local n = require('test.functional.testnvim')() local Screen = require('test.functional.ui.screen') -local clear = t.clear +local clear = n.clear local eq = t.eq -local eval = t.eval -local exec = t.exec -local command = t.command -local feed = t.feed -local api = t.api -local assert_alive = t.assert_alive +local eval = n.eval +local exec = n.exec +local command = n.command +local feed = n.feed +local api = n.api +local assert_alive = n.assert_alive before_each(clear) |