2 files changed, 74 insertions, 0 deletions
diff --git a/test/functional/lua/ui_spec.lua b/test/functional/lua/ui_spec.lua
new file mode 100644
index 0000000000..94f1b5840b
--- /dev/null
+++ b/test/functional/lua/ui_spec.lua
@@ -0,0 +1,46 @@
+local helpers = require('test.functional.helpers')(after_each)
+local eq = helpers.eq
+local exec_lua = helpers.exec_lua
+local clear = helpers.clear
+
+describe('vim.ui', function()
+  before_each(function()
+    clear()
+  end)
+
+
+  describe('select', function()
+    it('can select an item', function()
+      local result = exec_lua[[
+        local items = {
+          { name = 'Item 1' },
+          { name = 'Item 2' },
+        }
+        local opts = {
+          format_item = function(entry)
+            return entry.name
+          end
+        }
+        local selected
+        local cb = function(item)
+          selected = item
+        end
+        -- inputlist would require input and block the test;
+        local choices
+        vim.fn.inputlist = function(x)
+          choices = x
+          return 1
+        end
+        vim.ui.select(items, opts, cb)
+        vim.wait(100, function() return selected ~= nil end)
+        return {selected, choices}
+      ]]
+      eq({ name = 'Item 1' }, result[1])
+      eq({
+        'Select one of:',
+        '1: Item 1',
+        '2: Item 2',
+      }, result[2])
+    end)
+  end)
+end)
diff --git a/test/functional/plugin/lsp/codelens_spec.lua b/test/functional/plugin/lsp/codelens_spec.lua
index e48a0ad260..c8b75e65fc 100644
--- a/test/functional/plugin/lsp/codelens_spec.lua
+++ b/test/functional/plugin/lsp/codelens_spec.lua
@@ -58,5 +58,33 @@ describe('vim.lsp.codelens', function()
     ]], bufnr)
 
     eq({[1] = {'Lens1', 'LspCodeLens'}}, virtual_text_chunks)
+
+  end)
+  it('codelens uses client commands', function()
+    local fake_uri = "file:///fake/uri"
+    local cmd = exec_lua([[
+      fake_uri = ...
+      local bufnr = vim.uri_to_bufnr(fake_uri)
+      vim.fn.bufload(bufnr)
+      vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, {'One line'})
+      local lenses = {
+        {
+          range = {
+            start = { line = 0, character = 0, },
+            ['end'] = { line = 0, character = 8 }
+          },
+          command = { title = 'Lens1', command = 'Dummy' }
+        },
+      }
+      vim.lsp.codelens.on_codelens(nil, lenses, {method='textDocument/codeLens', client_id=1, bufnr=bufnr})
+      local cmd_called = nil
+      vim.lsp.commands['Dummy'] = function(command)
+        cmd_called = command
+      end
+      vim.api.nvim_set_current_buf(bufnr)
+      vim.lsp.codelens.run()
+      return cmd_called
+    ]], fake_uri)
+    eq({ command = 'Dummy', title = 'Lens1' }, cmd)
   end)
 end)