test/highlight_spec: Test "gui" arg of synIDattr().

Also use less "regular" values for cterm colors.

1 files changed, 23 insertions, 23 deletions

diff --git a/test/functional/terminal/highlight_spec.lua b/test/functional/terminal/highlight_spec.lua
index 79b2bf0bc4..8d7c7451d3 100644
--- a/test/functional/terminal/highlight_spec.lua
+++ b/test/functional/terminal/highlight_spec.lua
@@ -168,46 +168,46 @@ describe('synIDattr()', function()
   before_each(function()
     clear()
     screen = Screen.new(50, 7)
-    execute('highlight Normal ctermfg=1 guifg=#ff0000 guibg=Black')
+    execute('highlight Normal ctermfg=252 guifg=#ff0000 guibg=Black')
     -- Salmon #fa8072 Maroon #800000
-    execute('highlight Keyword ctermfg=2 guifg=Salmon guisp=Maroon')
+    execute('highlight Keyword ctermfg=79 guifg=Salmon guisp=Maroon')
   end)
 
-  after_each(function()
-    screen:detach()
+  it('returns cterm-color if RGB-capable UI is _not_ attached', function()
+    eq('252', eval('synIDattr(hlID("Normal"),  "fg")'))
+    eq('252', eval('synIDattr(hlID("Normal"),  "fg#")'))
+    eq('-1',  eval('synIDattr(hlID("Normal"),  "bg")'))
+    eq('-1',  eval('synIDattr(hlID("Normal"),  "bg#")'))
+    eq('79',  eval('synIDattr(hlID("Keyword"), "fg")'))
+    eq('79',  eval('synIDattr(hlID("Keyword"), "fg#")'))
+    eq('',    eval('synIDattr(hlID("Keyword"), "sp")'))
+    eq('',    eval('synIDattr(hlID("Keyword"), "sp#")'))
   end)
 
-  it('returns gui-color if GUI', function()
-    eq('1', eval('synIDattr(hlID("Normal"), "fg")'))
-    eq('-1', eval('synIDattr(hlID("Normal"), "bg")'))
+  it('returns gui-color if "gui" arg is passed', function()
+    eq('Black',  eval('synIDattr(hlID("Normal"),  "bg", "gui")'))
+    eq('Maroon', eval('synIDattr(hlID("Keyword"), "sp", "gui")'))
+  end)
 
-    eq('2', eval('synIDattr(hlID("Keyword"), "fg")'))
-    eq('', eval('synIDattr(hlID("Keyword"), "sp")'))
+  it('returns gui-color if RGB-capable UI is attached', function()
     screen:attach(true)
-    eq('#ff0000', eval('synIDattr(hlID("Normal"), "fg")'))
-    eq('Black', eval('synIDattr(hlID("Normal"), "bg")'))
-
-    eq('Salmon', eval('synIDattr(hlID("Keyword"), "fg")'))
-    eq('Maroon', eval('synIDattr(hlID("Keyword"), "sp")'))
+    eq('#ff0000', eval('synIDattr(hlID("Normal"),  "fg")'))
+    eq('Black',   eval('synIDattr(hlID("Normal"),  "bg")'))
+    eq('Salmon',  eval('synIDattr(hlID("Keyword"), "fg")'))
+    eq('Maroon',  eval('synIDattr(hlID("Keyword"), "sp")'))
   end)
 
-  it('returns #RRGGBB value for [fg|bg|sp]#', function()
-    eq('1', eval('synIDattr(hlID("Normal"), "fg#")'))
-    eq('-1', eval('synIDattr(hlID("Normal"), "bg#")'))
-
-    eq('2', eval('synIDattr(hlID("Keyword"), "fg#")'))
-    eq('', eval('synIDattr(hlID("Keyword"), "sp#")'))
+  it('returns #RRGGBB value for fg#/bg#/sp#', function()
     screen:attach(true)
     eq('#ff0000', eval('synIDattr(hlID("Normal"), "fg#")'))
     eq('#000000', eval('synIDattr(hlID("Normal"), "bg#")'))
-
     eq('#fa8072', eval('synIDattr(hlID("Keyword"), "fg#")'))
     eq('#800000', eval('synIDattr(hlID("Keyword"), "sp#")'))
   end)
 
   it('returns color number if non-GUI', function()
     screen:attach(false)
-    eq('1', eval('synIDattr(hlID("Normal"), "fg")'))
-    eq('2', eval('synIDattr(hlID("Keyword"), "fg")'))
+    eq('252', eval('synIDattr(hlID("Normal"), "fg")'))
+    eq('79', eval('synIDattr(hlID("Keyword"), "fg")'))
   end)
 end)