aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-12-31 15:40:18 -0500
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-12-31 16:44:53 -0500
commitb01a60b1aaaa6152b58af96c5054f697bbc3a31e (patch)
tree125cace41e958056812accbeb5876e154a1be85d /test
parent27548e3cd04a789951decfe6de55f9cf88f516c4 (diff)
downloadrneovim-b01a60b1aaaa6152b58af96c5054f697bbc3a31e.tar.gz
rneovim-b01a60b1aaaa6152b58af96c5054f697bbc3a31e.tar.bz2
rneovim-b01a60b1aaaa6152b58af96c5054f697bbc3a31e.zip
Revert "vim-patch:8.1.0822: peeking and flushing output slows down execution"
This reverts commit 0519a75f6eca1065a4d0184f99c71ae03a99b9b1.
Diffstat (limited to 'test')
-rw-r--r--test/functional/eval/null_spec.lua2
-rw-r--r--test/functional/eval/timer_spec.lua4
-rw-r--r--test/functional/terminal/tui_spec.lua2
-rw-r--r--test/functional/ui/screen.lua4
4 files changed, 5 insertions, 7 deletions
diff --git a/test/functional/eval/null_spec.lua b/test/functional/eval/null_spec.lua
index bef41e52d4..fa8f7d873f 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")',
- 0, '', function()
+ '', '\n', 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 3f57568b8e..9ee0735e40 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 339ba0642c..8a5dd7ef18 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 5104c58796..8fa9fcc42f 100644
--- a/test/functional/ui/screen.lua
+++ b/test/functional/ui/screen.lua
@@ -807,9 +807,7 @@ function Screen:_handle_mouse_off()
end
function Screen:_handle_mode_change(mode, idx)
- if self._mode_info ~= nil then
- assert(mode == self._mode_info[idx+1].name)
- end
+ assert(mode == self._mode_info[idx+1].name)
self.mode = mode
end