2 files changed, 14 insertions, 6 deletions
diff --git a/test/functional/ui/bufhl_spec.lua b/test/functional/ui/bufhl_spec.lua
index 3cb592c714..d7269d2c29 100644
--- a/test/functional/ui/bufhl_spec.lua
+++ b/test/functional/ui/bufhl_spec.lua
@@ -690,7 +690,7 @@ describe('Buffer highlighting', function()
     end)
 
     it('can be retrieved', function()
-      local get_virtual_text = curbufmeths.get_virtual_text
+      local get_extmarks = curbufmeths.get_extmarks
       local line_count = curbufmeths.line_count
 
       local s1 = {{'Köttbullar', 'Comment'}, {'Kräuterbutter'}}
@@ -699,12 +699,14 @@ describe('Buffer highlighting', function()
       -- TODO: only a virtual text from the same ns curretly overrides
       -- an existing virtual text. We might add a prioritation system.
       set_virtual_text(id1, 0, s1, {})
-      eq(s1, get_virtual_text(0))
+      eq({{1, 0, 0, {virt_text = s1}}}, get_extmarks(id1, {0,0}, {0, -1}, {details=true}))
 
-      set_virtual_text(-1, line_count(), s2, {})
-      eq(s2, get_virtual_text(line_count()))
+      -- TODO: is this really valid? shouldn't the max be line_count()-1?
+      local lastline = line_count()
+      set_virtual_text(id1, line_count(), s2, {})
+      eq({{3, lastline, 0, {virt_text = s2}}}, get_extmarks(id1, {lastline,0}, {lastline, -1}, {details=true}))
 
-      eq({}, get_virtual_text(line_count() + 9000))
+      eq({}, get_extmarks(id1, {lastline+9000,0}, {lastline+9000, -1}, {}))
     end)
 
     it('is not highlighted by visual selection', function()
diff --git a/test/functional/ui/options_spec.lua b/test/functional/ui/options_spec.lua
index 9646c3fdad..2f113f6ac6 100644
--- a/test/functional/ui/options_spec.lua
+++ b/test/functional/ui/options_spec.lua
@@ -14,10 +14,10 @@ describe('UI receives option updates', function()
       arabicshape=true,
       emoji=true,
       guifont='',
-      guifontset='',
       guifontwide='',
       linespace=0,
       pumblend=0,
+      mousefocus=false,
       showtabline=1,
       termguicolors=false,
       ttimeout=true,
@@ -110,6 +110,12 @@ describe('UI receives option updates', function()
       eq(expected, screen.options)
     end)
 
+    command("set mousefocus")
+    expected.mousefocus = true
+    screen:expect(function()
+      eq(expected, screen.options)
+    end)
+
     command("set nottimeout")
     expected.ttimeout = false
     screen:expect(function()