aboutsummaryrefslogtreecommitdiff
path: root/test/functional
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2017-05-15 14:53:31 +0200
committerJustin M. Keyes <justinkz@gmail.com>2017-05-15 14:53:31 +0200
commit8e052f677ee80414a4ef635afb5ce0f323f602f3 (patch)
treeeec3e95d46c59360f08457cd4cb1f040069d2cae /test/functional
parent6e4e70f51b8a889d38fe5d954d9ac817750424c3 (diff)
parent8d8b6224d941567aeefc67beb471aea36b8bdc05 (diff)
downloadrneovim-8e052f677ee80414a4ef635afb5ce0f323f602f3.tar.gz
rneovim-8e052f677ee80414a4ef635afb5ce0f323f602f3.tar.bz2
rneovim-8e052f677ee80414a4ef635afb5ce0f323f602f3.zip
Merge #6737 "options: make 'highlight' read-only"
Diffstat (limited to 'test/functional')
-rw-r--r--test/functional/ex_cmds/encoding_spec.lua4
-rw-r--r--test/functional/ui/cursor_spec.lua4
2 files changed, 4 insertions, 4 deletions
diff --git a/test/functional/ex_cmds/encoding_spec.lua b/test/functional/ex_cmds/encoding_spec.lua
index 0769259be4..7f2bd78a47 100644
--- a/test/functional/ex_cmds/encoding_spec.lua
+++ b/test/functional/ex_cmds/encoding_spec.lua
@@ -15,7 +15,7 @@ describe('&encoding', function()
feed_command('set encoding=latin1')
-- error message expected
feed('<cr>')
- neq(nil, string.find(eval('v:errmsg'), '^E474:'))
+ neq(nil, string.find(eval('v:errmsg'), '^E519:'))
eq('utf-8', eval('&encoding'))
-- check nvim is still in utf-8 mode
eq(3, eval('strwidth("Bär")'))
@@ -25,7 +25,7 @@ describe('&encoding', function()
clear('--cmd', 'set enc=latin1')
-- error message expected
feed('<cr>')
- neq(nil, string.find(eval('v:errmsg'), '^E474:'))
+ neq(nil, string.find(eval('v:errmsg'), '^E519:'))
eq('utf-8', eval('&encoding'))
eq(3, eval('strwidth("Bär")'))
end)
diff --git a/test/functional/ui/cursor_spec.lua b/test/functional/ui/cursor_spec.lua
index f4eec4bdc7..b47210a777 100644
--- a/test/functional/ui/cursor_spec.lua
+++ b/test/functional/ui/cursor_spec.lua
@@ -194,8 +194,8 @@ describe('ui/cursor', function()
if m.blinkoff then m.blinkoff = 400 end
if m.blinkwait then m.blinkwait = 700 end
end
- if m.hl_id then m.hl_id = 47 end
- if m.id_lm then m.id_lm = 48 end
+ if m.hl_id then m.hl_id = 48 end
+ if m.id_lm then m.id_lm = 49 end
end
-- Assert the new expectation.