1 files changed, 13 insertions, 15 deletions
diff --git a/test/functional/api/highlight_spec.lua b/test/functional/api/highlight_spec.lua
index 4082b0daf9..c482128a31 100644
--- a/test/functional/api/highlight_spec.lua
+++ b/test/functional/api/highlight_spec.lua
@@ -1,23 +1,20 @@
-
 local helpers = require('test.functional.helpers')(after_each)
 local clear, nvim = helpers.clear, helpers.nvim
 local Screen = require('test.functional.ui.screen')
 local eq, eval = helpers.eq, helpers.eval
 local command = helpers.command
-local ok = helpers.ok
 local meths = helpers.meths
 
-
 describe('highlight api',function()
   local expected_rgb = { background = Screen.colors.Yellow,
-                          foreground = Screen.colors.Red,
-                          special = Screen.colors.Blue,
-                          bold = true,
-                        }
+                         foreground = Screen.colors.Red,
+                         special = Screen.colors.Blue,
+                         bold = true,
+                       }
 
   local expected_cterm = { background = 10,
-                          underline = true,
-                        }
+                           underline = true,
+                         }
 
   before_each(function()
     clear()
@@ -26,23 +23,23 @@ describe('highlight api',function()
 
   it("nvim_get_hl_by_id", function()
     local hl_id = eval("hlID('NewHighlight')")
-
     eq(expected_cterm, nvim("get_hl_by_id", hl_id, false))
 
     hl_id = eval("hlID('NewHighlight')")
     eq(expected_rgb, nvim("get_hl_by_id", hl_id, true))
 
-    -- assume there is no hl with id = 30000
+    local expected_error = 'Invalid highlight id'
+    -- Assume there is no hl id 30000.
     local err, emsg = pcall(meths.get_hl_by_id, 30000, false)
     eq(false, err)
-    ok(string.find(emsg, 'Invalid highlight id') ~= nil)
+    eq(expected_error, string.match(emsg, expected_error))
   end)
 
   it("nvim_get_hl_by_name", function()
     local expected_normal = { background = Screen.colors.Yellow,
-                          foreground = Screen.colors.Red }
+                              foreground = Screen.colors.Red }
 
-    -- test "Normal" hl defaults
+    -- Test "Normal" hl defaults.
     eq({}, nvim("get_hl_by_name", 'Normal', true))
 
     eq(expected_cterm, nvim("get_hl_by_name", 'NewHighlight', false))
@@ -51,8 +48,9 @@ describe('highlight api',function()
     command('hi Normal guifg=red guibg=yellow')
     eq(expected_normal, nvim("get_hl_by_name", 'Normal', true))
 
+    local expected_error = 'Invalid highlight name'
     local err, emsg = pcall(meths.get_hl_by_name , 'unknown_highlight', false)
     eq(false, err)
-    ok(string.find(emsg, 'Invalid highlight name') ~= nil)
+    eq(expected_error, string.match(emsg, expected_error))
   end)
 end)