3 files changed, 113 insertions, 0 deletions
diff --git a/test/functional/api/highlight_spec.lua b/test/functional/api/highlight_spec.lua
index 058706718a..21e3094f8e 100644
--- a/test/functional/api/highlight_spec.lua
+++ b/test/functional/api/highlight_spec.lua
@@ -158,3 +158,98 @@ describe('API: highlight',function()
     assert_alive()
   end)
 end)
+
+describe("API: set highlight", function()
+  local highlight_color = {
+    fg = tonumber('0xff0000'),
+    bg = tonumber('0x0032aa'),
+    ctermfg = 8,
+    ctermbg = 15,
+  }
+  local highlight1 = {
+    background = highlight_color.bg,
+    foreground = highlight_color.fg,
+    bold = true,
+    italic = true,
+  }
+  local highlight2_config = {
+    ctermbg = highlight_color.ctermbg,
+    ctermfg = highlight_color.ctermfg,
+    underline = true,
+    reverse = true,
+  }
+  local highlight2_result = {
+    background = highlight_color.ctermbg,
+    foreground = highlight_color.ctermfg,
+    underline = true,
+    reverse = true,
+  }
+  local highlight3_config = {
+    background = highlight_color.bg,
+    foreground = highlight_color.fg,
+    ctermbg = highlight_color.ctermbg,
+    ctermfg = highlight_color.ctermfg,
+    bold = true,
+    italic = true,
+    reverse = true,
+    undercurl = true,
+    underline = true,
+    cterm = {
+      italic = true,
+      reverse = true,
+      undercurl = true,
+    }
+  }
+  local highlight3_result_gui = {
+    background = highlight_color.bg,
+    foreground = highlight_color.fg,
+    bold = true,
+    italic = true,
+    reverse = true,
+    undercurl = true,
+    underline = true,
+  }
+  local highlight3_result_cterm = {
+    background = highlight_color.ctermbg,
+    foreground = highlight_color.ctermfg,
+    italic = true,
+    reverse = true,
+    undercurl = true,
+  }
+
+  local function get_ns()
+    local ns = meths.create_namespace('Test_set_hl')
+    meths._set_hl_ns(ns)
+    return ns
+  end
+
+  before_each(clear)
+
+  it ("can set gui highlight", function()
+    local ns = get_ns()
+    meths.set_hl(ns, 'Test_hl', highlight1)
+    eq(highlight1, meths.get_hl_by_name('Test_hl', true))
+  end)
+
+  it ("can set cterm highlight", function()
+    local ns = get_ns()
+    meths.set_hl(ns, 'Test_hl', highlight2_config)
+    eq(highlight2_result, meths.get_hl_by_name('Test_hl', false))
+  end)
+
+  it ("cterm attr defaults to gui attr", function()
+    local ns = get_ns()
+    meths.set_hl(ns, 'Test_hl', highlight1)
+    eq({
+      bold = true,
+      italic = true,
+    }, meths.get_hl_by_name('Test_hl', false))
+  end)
+
+  it ("can overwrite attr for cterm", function()
+    local ns = get_ns()
+    meths.set_hl(ns, 'Test_hl', highlight3_config)
+    eq(highlight3_result_gui, meths.get_hl_by_name('Test_hl', true))
+    eq(highlight3_result_cterm, meths.get_hl_by_name('Test_hl', false))
+  end)
+end)
diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua
index 6926022ee3..0c0f610401 100644
--- a/test/functional/api/vim_spec.lua
+++ b/test/functional/api/vim_spec.lua
@@ -1986,6 +1986,10 @@ describe('API', function()
 
       eq(meths.get_option_info'winhighlight', options_info.winhighlight)
     end)
+
+    it('should not crash when echoed', function()
+      meths.exec("echo nvim_get_all_options_info()", true)
+    end)
   end)
 
   describe('nvim_get_option_info', function()
diff --git a/test/functional/api/window_spec.lua b/test/functional/api/window_spec.lua
index ceeb84cec9..a57826f7e7 100644
--- a/test/functional/api/window_spec.lua
+++ b/test/functional/api/window_spec.lua
@@ -387,4 +387,18 @@ describe('API/win', function()
       eq({oldbuf}, meths.list_bufs())
     end)
   end)
+
+  describe('open_win', function()
+    it('noautocmd option works', function()
+      command('autocmd BufEnter,BufLeave,BufWinEnter * let g:fired = 1')
+      meths.open_win(meths.create_buf(true, true), true, {
+        relative='win', row=3, col=3, width=12, height=3, noautocmd=true
+      })
+      eq(0, funcs.exists('g:fired'))
+      meths.open_win(meths.create_buf(true, true), true, {
+        relative='win', row=3, col=3, width=12, height=3
+      })
+      eq(1, funcs.exists('g:fired'))
+    end)
+  end)
 end)