Merge remote-tracking branch 'upstream/master' into fix_repeatcmdline

1 files changed, 31 insertions, 7 deletions

diff --git a/test/functional/plugin/man_spec.lua b/test/functional/plugin/man_spec.lua
index c8da5a711f..c6c7d2b03d 100644
--- a/test/functional/plugin/man_spec.lua
+++ b/test/functional/plugin/man_spec.lua
@@ -1,10 +1,21 @@
 local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
-local command, eval, rawfeed = helpers.command, helpers.eval, helpers.rawfeed
+local command, rawfeed = helpers.command, helpers.rawfeed
 local clear = helpers.clear
+local exec_lua = helpers.exec_lua
 local funcs = helpers.funcs
 local nvim_prog = helpers.nvim_prog
 local matches = helpers.matches
+local write_file = helpers.write_file
+local tmpname = helpers.tmpname
+local skip = helpers.skip
+local is_ci = helpers.is_ci
+
+clear()
+if funcs.executable('man') == 0 then
+  pending('missing "man" command', function() end)
+  return
+end
 
 describe(':Man', function()
   before_each(function()
@@ -44,7 +55,7 @@ describe(':Man', function()
                                                             |
       ]]}
 
-      eval('man#init_pager()')
+      exec_lua[[require'man'.init_pager()]]
 
       screen:expect([[
       ^this {b:is} {b:a} test                                      |
@@ -68,7 +79,7 @@ describe(':Man', function()
                                                             |
       ]=]}
 
-      eval('man#init_pager()')
+      exec_lua[[require'man'.init_pager()]]
 
       screen:expect([[
       ^this {b:is }{bi:a }{biu:test}                                      |
@@ -83,7 +94,7 @@ describe(':Man', function()
       rawfeed([[
         ithis i<C-v><C-h>is<C-v><C-h>s あ<C-v><C-h>あ test
         with _<C-v><C-h>ö_<C-v><C-h>v_<C-v><C-h>e_<C-v><C-h>r_<C-v><C-h>s_<C-v><C-h>t_<C-v><C-h>r_<C-v><C-h>u_<C-v><C-h>̃_<C-v><C-h>c_<C-v><C-h>k te<C-v><ESC>[3mxt¶<C-v><ESC>[0m<ESC>]])
-      eval('man#init_pager()')
+      exec_lua[[require'man'.init_pager()]]
 
       screen:expect([[
       ^this {b:is} {b:あ} test                                     |
@@ -99,7 +110,7 @@ describe(':Man', function()
         i_<C-v><C-h>_b<C-v><C-h>be<C-v><C-h>eg<C-v><C-h>gi<C-v><C-h>in<C-v><C-h>ns<C-v><C-h>s
         m<C-v><C-h>mi<C-v><C-h>id<C-v><C-h>d_<C-v><C-h>_d<C-v><C-h>dl<C-v><C-h>le<C-v><C-h>e
         _<C-v><C-h>m_<C-v><C-h>i_<C-v><C-h>d_<C-v><C-h>__<C-v><C-h>d_<C-v><C-h>l_<C-v><C-h>e<ESC>]])
-      eval('man#init_pager()')
+      exec_lua[[require'man'.init_pager()]]
 
       screen:expect([[
       {b:^_begins}                                             |
@@ -115,7 +126,7 @@ describe(':Man', function()
         i· ·<C-v><C-h>·
         +<C-v><C-h>o
         +<C-v><C-h>+<C-v><C-h>o<C-v><C-h>o double<ESC>]])
-      eval('man#init_pager()')
+      exec_lua[[require'man'.init_pager()]]
 
       screen:expect([[
       ^· {b:·}                                                 |
@@ -132,7 +143,7 @@ describe(':Man', function()
         <C-v><C-[>[44m    4  <C-v><C-[>[45m    5  <C-v><C-[>[46m    6  <C-v><C-[>[47m    7  <C-v><C-[>[100m    8  <C-v><C-[>[101m    9
         <C-v><C-[>[102m   10  <C-v><C-[>[103m   11  <C-v><C-[>[104m   12  <C-v><C-[>[105m   13  <C-v><C-[>[106m   14  <C-v><C-[>[107m   15
         <C-v><C-[>[48:5:16m   16  <ESC>]])
-      eval('man#init_pager()')
+      exec_lua[[require'man'.init_pager()]]
 
       screen:expect([[
        ^    0      1      2      3                          |
@@ -149,4 +160,17 @@ describe(':Man', function()
     local args = {nvim_prog, '--headless', '+autocmd VimLeave * echo "quit works!!"', '+Man!', '+call nvim_input("q")'}
     matches('quit works!!', funcs.system(args, {'manpage contents'}))
   end)
+
+  it('reports non-existent man pages for absolute paths', function()
+    skip(is_ci('cirrus'))
+    local actual_file = tmpname()
+    -- actual_file must be an absolute path to an existent file for us to test against it
+    matches('^/.+', actual_file)
+    write_file(actual_file, '')
+    local args = {nvim_prog, '--headless', '+:Man ' .. actual_file, '+q'}
+    matches(('Error detected while processing command line:\r\n' ..
+      'man.lua: "no manual entry for %s"'):format(actual_file),
+      funcs.system(args, {''}))
+    os.remove(actual_file)
+  end)
 end)