diff options
| author | Jan Edmund Lazo <janedmundlazo@hotmail.com> | 2017-10-03 17:39:17 -0400 |
|---|---|---|
| committer | Björn Linse <bjorn.linse@gmail.com> | 2018-02-10 22:28:12 +0100 |
| commit | c03a847884c017a78e099beaa1b252e5f940c8e0 (patch) | |
| tree | d5dd1064427ae89c48b2ce1f37bcdbd40553132b | |
| parent | f75c4b39ece7b5f760892c1e18af449c5bb270c7 (diff) | |
| download | rneovim-c03a847884c017a78e099beaa1b252e5f940c8e0.tar.gz rneovim-c03a847884c017a78e099beaa1b252e5f940c8e0.tar.bz2 rneovim-c03a847884c017a78e099beaa1b252e5f940c8e0.zip | |
win: enable backtick_expansion and shell output tests
| -rw-r--r-- | test/functional/eval/backtick_expansion_spec.lua | 16 | ||||
| -rw-r--r-- | test/functional/ui/output_spec.lua | 9 |
2 files changed, 19 insertions, 6 deletions
diff --git a/test/functional/eval/backtick_expansion_spec.lua b/test/functional/eval/backtick_expansion_spec.lua index 81e8e295fa..b1b44cfa8b 100644 --- a/test/functional/eval/backtick_expansion_spec.lua +++ b/test/functional/eval/backtick_expansion_spec.lua @@ -21,11 +21,19 @@ describe("backtick expansion", function() end) it("with default 'shell'", function() - if helpers.pending_win32(pending) then return end -- Need win32 shell fixes - command(":silent args `echo ***2`") + if helpers.iswin() then + command(":silent args `dir /b *2`") + else + command(":silent args `echo ***2`") + end eq({ "file2", }, eval("argv()")) - command(":silent args `echo */*4`") - eq({ "subdir/file4", }, eval("argv()")) + if helpers.iswin() then + command(":silent args `dir /s/b *4`") + eq({ "subdir\\file4", }, eval("map(argv(), 'fnamemodify(v:val, \":.\")')")) + else + command(":silent args `echo */*4`") + eq({ "subdir/file4", }, eval("argv()")) + end end) it("with shell=fish", function() diff --git a/test/functional/ui/output_spec.lua b/test/functional/ui/output_spec.lua index 14f2091046..4246020fab 100644 --- a/test/functional/ui/output_spec.lua +++ b/test/functional/ui/output_spec.lua @@ -162,14 +162,19 @@ describe("shell command :!", function() end) it("doesn't truncate Last line of shell output #3269", function() - command([[nnoremap <silent>\l :!ls bang_filter_spec<cr>]]) + command(helpers.iswin() + and [[nnoremap <silent>\l :!dir /b bang_filter_spec<cr>]] + or [[nnoremap <silent>\l :!ls bang_filter_spec<cr>]]) + local result = (helpers.iswin() + and [[:!dir /b bang_filter_spec]] + or [[:!ls bang_filter_spec ]]) feed([[\l]]) screen:expect([[ {1:~ }| {1:~ }| {1:~ }| {1:~ }| - :!ls bang_filter_spec | + ]]..result..[[ | f1 | f2 | f3 | |