diff options
Diffstat (limited to 'test/functional')
| -rw-r--r-- | test/functional/eval/null_spec.lua | 2 | ||||
| -rw-r--r-- | test/functional/eval/timer_spec.lua | 4 | ||||
| -rw-r--r-- | test/functional/terminal/tui_spec.lua | 2 | ||||
| -rw-r--r-- | test/functional/ui/screen.lua | 4 |
4 files changed, 7 insertions, 5 deletions
diff --git a/test/functional/eval/null_spec.lua b/test/functional/eval/null_spec.lua index fa8f7d873f..bef41e52d4 100644 --- a/test/functional/eval/null_spec.lua +++ b/test/functional/eval/null_spec.lua @@ -121,7 +121,7 @@ describe('NULL', function() null_test('does not make Neovim crash when v:oldfiles gets assigned to that', ':let v:oldfiles = L|oldfiles', 0) null_expr_test('does not make complete() crash or error out', 'execute(":normal i\\<C-r>=complete(1, L)[-1]\\n")', - '', '\n', function() + 0, '', function() eq({''}, curbufmeths.get_lines(0, -1, false)) end) null_expr_test('is accepted by setmatches()', 'setmatches(L)', 0, 0) diff --git a/test/functional/eval/timer_spec.lua b/test/functional/eval/timer_spec.lua index 9ee0735e40..3f57568b8e 100644 --- a/test/functional/eval/timer_spec.lua +++ b/test/functional/eval/timer_spec.lua @@ -130,12 +130,12 @@ describe('timers', function() nvim_async("command", "call timer_start("..load_adjust(100)..", 'AddItem', {'repeat': -1})") screen:expect([[ - ITEM 1 | + ^ITEM 1 | ITEM 2 | {1:~ }| {1:~ }| {1:~ }| - ^ | + | ]]) nvim_async("command", "let g:cont = 1") diff --git a/test/functional/terminal/tui_spec.lua b/test/functional/terminal/tui_spec.lua index 8a5dd7ef18..339ba0642c 100644 --- a/test/functional/terminal/tui_spec.lua +++ b/test/functional/terminal/tui_spec.lua @@ -391,7 +391,7 @@ describe('TUI', function() {1:x} | {4:~ }| {5:[No Name] [+] 3,1 All}| - | + :set ruler | {3:-- TERMINAL --} | ]] local expected_attr = { diff --git a/test/functional/ui/screen.lua b/test/functional/ui/screen.lua index 8fa9fcc42f..5104c58796 100644 --- a/test/functional/ui/screen.lua +++ b/test/functional/ui/screen.lua @@ -807,7 +807,9 @@ function Screen:_handle_mouse_off() end function Screen:_handle_mode_change(mode, idx) - assert(mode == self._mode_info[idx+1].name) + if self._mode_info ~= nil then + assert(mode == self._mode_info[idx+1].name) + end self.mode = mode end |