win: enable backtick_expansion and bang_filter tests

janlazo · Feb 1, 2018 · 6e077b2 · 6e077b2
1 parent 6710164
commit 6e077b2
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 21 deletions.
diff --git 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/ex_cmds/bang_filter_spec.lua b/test/functional/ex_cmds/bang_filter_spec.lua
@@ -4,8 +4,6 @@ local helpers = require('test.functional.helpers')(after_each)
 local feed, command, clear = helpers.feed, helpers.command, helpers.clear
 local mkdir, write_file, rmdir = helpers.mkdir, helpers.write_file, helpers.rmdir
 
-if helpers.pending_win32(pending) then return end
-
 local Screen = require('test.functional.ui.screen')
 
 
@@ -28,23 +26,30 @@ describe('issues', function()
   end)
 
   it('#3269 Last line of shell output is not truncated', 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([[
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      :!ls bang_filter_spec                                |
-                                                           |
-      f1                                                   |
-      f2                                                   |
-      f3                                                   |
-      Press ENTER or type command to continue^              |
+    ~                                                    |
+    ~                                                    |
+    ~                                                    |
+    ~                                                    |
+    ~                                                    |
+    ~                                                    |
+    ~                                                    |
+    ~                                                    |
+    ]]
+    .. result .. [[
+
+                                                         |
+    f1                                                   |
+    f2                                                   |
+    f3                                                   |
+    Press ENTER or type command to continue^              |
     ]])
   end)