diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2020-01-01 06:36:10 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-01 06:36:10 -0800 |
| commit | a251b588acb3a561e5da695280774b9b6fbcd0ea (patch) | |
| tree | e361e0c201d04c304e5c188bf7a9f295a318c0d2 /test | |
| parent | 070bd3ea231b6b98c9e9f1057fdbcf31d1877a70 (diff) | |
| parent | 0da7774cf0e503efc93c15033a94ff756d5252e1 (diff) | |
| download | rneovim-a251b588acb3a561e5da695280774b9b6fbcd0ea.tar.gz rneovim-a251b588acb3a561e5da695280774b9b6fbcd0ea.tar.bz2 rneovim-a251b588acb3a561e5da695280774b9b6fbcd0ea.zip | |
Merge #11642 'CI: test powershell core'
Diffstat (limited to 'test')
| -rw-r--r-- | test/functional/helpers.lua | 6 | ||||
| -rw-r--r-- | test/functional/ui/output_spec.lua | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua index eead1ea3e0..0fdfcd70ba 100644 --- a/test/functional/helpers.lua +++ b/test/functional/helpers.lua @@ -504,9 +504,13 @@ function module.source(code) return fname end +function module.has_powershell() + return module.eval('executable("'..(iswin() and 'powershell' or 'pwsh')..'")') == 1 +end + function module.set_shell_powershell() local shell = iswin() and 'powershell' or 'pwsh' - assert(module.eval('executable("'..shell..'")')) + assert(module.has_powershell()) local cmd = 'Remove-Item -Force '..table.concat(iswin() and {'alias:cat', 'alias:echo', 'alias:sleep'} or {'alias:echo'}, ',')..';' diff --git a/test/functional/ui/output_spec.lua b/test/functional/ui/output_spec.lua index 9b1e803649..d7dde6345f 100644 --- a/test/functional/ui/output_spec.lua +++ b/test/functional/ui/output_spec.lua @@ -10,6 +10,7 @@ local iswin = helpers.iswin local clear = helpers.clear local command = helpers.command local nvim_dir = helpers.nvim_dir +local has_powershell = helpers.has_powershell local set_shell_powershell = helpers.set_shell_powershell describe("shell command :!", function() @@ -228,7 +229,7 @@ describe("shell command :!", function() ]]) end) end) - if iswin() or eval('executable("pwsh")') == 1 then + if has_powershell() then it('powershell supports literal strings', function() set_shell_powershell() local screen = Screen.new(30, 4) |