aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago de Arruda <tpadilha84@gmail.com>2015-03-16 08:29:57 -0300
committerThiago de Arruda <tpadilha84@gmail.com>2015-03-16 08:29:57 -0300
commit5199456471a5c484a10e3590d20767c6a78d34e0 (patch)
treee3a20ecbd53e72c8b552abc8fc518ca0eba2b23e
parent7eee9c2a220fd1f0e600ae365e996fb56aa4cec1 (diff)
downloadrneovim-5199456471a5c484a10e3590d20767c6a78d34e0.tar.gz
rneovim-5199456471a5c484a10e3590d20767c6a78d34e0.tar.bz2
rneovim-5199456471a5c484a10e3590d20767c6a78d34e0.zip
test: Only display cursor marker in screen tests if nvim is not busy
-rw-r--r--test/functional/shell/viml_system_spec.lua4
-rw-r--r--test/functional/ui/screen.lua2
2 files changed, 3 insertions, 3 deletions
diff --git a/test/functional/shell/viml_system_spec.lua b/test/functional/shell/viml_system_spec.lua
index 2742e23e00..c9ae92048c 100644
--- a/test/functional/shell/viml_system_spec.lua
+++ b/test/functional/shell/viml_system_spec.lua
@@ -93,7 +93,7 @@ describe('system()', function()
~ |
~ |
~ |
- ^:call system("yes") |
+ :call system("yes") |
]])
feed('<c-c>')
screen:expect([[
@@ -259,7 +259,7 @@ describe('systemlist()', function()
~ |
~ |
~ |
- ^:call systemlist("yes | xargs") |
+ :call systemlist("yes | xargs") |
]])
feed('<c-c>')
screen:expect([[
diff --git a/test/functional/ui/screen.lua b/test/functional/ui/screen.lua
index 7ba90abde2..2cebaf048c 100644
--- a/test/functional/ui/screen.lua
+++ b/test/functional/ui/screen.lua
@@ -417,7 +417,7 @@ function Screen:_row_repr(row, attr_ids, attr_ignore)
table.insert(rv, '{' .. attr_id .. ':')
current_attr_id = attr_id
end
- if self._rows[self._cursor.row] == row and self._cursor.col == i then
+ if not self._busy and self._rows[self._cursor.row] == row and self._cursor.col == i then
table.insert(rv, '^')
end
table.insert(rv, row[i].text)