1 files changed, 17 insertions, 20 deletions
diff --git a/test/functional/ui/quickfix_spec.lua b/test/functional/ui/quickfix_spec.lua
index df43871e60..40f8ef353a 100644
--- a/test/functional/ui/quickfix_spec.lua
+++ b/test/functional/ui/quickfix_spec.lua
@@ -1,9 +1,8 @@
 local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
-local clear, feed, meths = helpers.clear, helpers.feed, helpers.meths
+local clear, feed, api = helpers.clear, helpers.feed, helpers.api
 local insert, command = helpers.insert, helpers.command
 
-
 describe('quickfix selection highlight', function()
   local screen
 
@@ -14,20 +13,20 @@ describe('quickfix selection highlight', function()
     screen:attach()
     screen:set_default_attr_ids({
       [1] = { bold = true, foreground = Screen.colors.Blue },
-      [2] = {reverse = true},
-      [3] = {foreground = Screen.colors.Brown},
-      [4] = {bold = true, reverse = true},
-      [5] = {background = Screen.colors.Green},
-      [6] = {foreground = Screen.colors.Brown, background = Screen.colors.Green},
-      [7] = {background = Screen.colors.Red},
-      [8] = {foreground = Screen.colors.Brown, background = Screen.colors.Red},
-      [9] = {background = Screen.colors.Fuchsia},
-      [10] = {foreground = Screen.colors.Red, background = Screen.colors.Fuchsia},
-      [11] = {foreground = Screen.colors.Red},
-      [12] = {foreground = Screen.colors.Brown, background = Screen.colors.Fuchsia},
+      [2] = { reverse = true },
+      [3] = { foreground = Screen.colors.Brown },
+      [4] = { bold = true, reverse = true },
+      [5] = { background = Screen.colors.Green },
+      [6] = { foreground = Screen.colors.Brown, background = Screen.colors.Green },
+      [7] = { background = Screen.colors.Red },
+      [8] = { foreground = Screen.colors.Brown, background = Screen.colors.Red },
+      [9] = { background = Screen.colors.Fuchsia },
+      [10] = { foreground = Screen.colors.Red, background = Screen.colors.Fuchsia },
+      [11] = { foreground = Screen.colors.Red },
+      [12] = { foreground = Screen.colors.Brown, background = Screen.colors.Fuchsia },
     })
 
-    meths.set_option_value('errorformat', '%m %l', {})
+    api.nvim_set_option_value('errorformat', '%m %l', {})
     command('syntax on')
     command('highlight Search guibg=Green')
 
@@ -49,9 +48,7 @@ describe('quickfix selection highlight', function()
       Line 4                   |
       Line 5                   |
                                |
-      {1:~                        }|
-      {1:~                        }|
-      {1:~                        }|
+      {1:~                        }|*3
                                |
     ]])
   end)
@@ -89,7 +86,7 @@ describe('quickfix selection highlight', function()
   end)
 
   it('using QuickFixLine highlight group', function()
-    command('highlight QuickFixLine guibg=Red')
+    command('highlight QuickFixLine guibg=Red guifg=NONE gui=NONE')
 
     command('copen')
 
@@ -124,7 +121,7 @@ describe('quickfix selection highlight', function()
 
   it('combines with CursorLine', function()
     command('set cursorline')
-    command('highlight QuickFixLine guifg=Red')
+    command('highlight QuickFixLine guifg=Red guibg=NONE gui=NONE')
     command('highlight CursorLine guibg=Fuchsia')
 
     command('copen')
@@ -160,7 +157,7 @@ describe('quickfix selection highlight', function()
 
   it('QuickFixLine background takes precedence over CursorLine', function()
     command('set cursorline')
-    command('highlight QuickFixLine guibg=Red')
+    command('highlight QuickFixLine guibg=Red guifg=NONE gui=NONE')
     command('highlight CursorLine guibg=Fuchsia')
 
     command('copen')