Merge pull request #715 from nickspoons/fix-github-action-tests

Fix Vader tests to work correctly with github actions

Author: nickspoons

.github/workflows/vader.yml

@@ -12,11 +12,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        vim:
-        - 'v8.2.0000'
-        - 'v8.1.0000'
-        - 'v8.0.0000'
-        - 'v7.4'
+        cfg:
+          - { editor: vim, neovim: false, version: nightly }
+          - { editor: vim, neovim: false, version: stable }
+          - { editor: neovim, neovim: true, version: stable }
 
     steps:
     - name: Checkout code
@@ -30,7 +29,8 @@ jobs:
     - name: Setup Vim
       uses: rhysd/action-setup-vim@v1
       with:
-        vim_version: ${{ matrix.vim }}
+        neovim: ${{ matrix.cfg.neovim }}
+        version: ${{ matrix.cfg.version }}
 
     - name: Install Dependencies
       run: |
@@ -41,4 +41,12 @@ jobs:
       run: |
         cd test
         vim -esNu vimrc -c 'Vader! *'
-      if: ${{ always() }}
+      if: matrix.cfg.editor == 'vim'
+
+    - name: Run Test
+      run: |
+        cd test
+        nvim --headless -Nu vimrc -c 'Vader! *'
+      env:
+        VADER_OUTPUT_FILE: /dev/stderr 
+      if: matrix.cfg.editor == 'neovim'

test/fixusings.vader

@@ -85,12 +85,13 @@ Execute (should return ambiguous usings to Callback):
   call OmniSharpTestInitializeBuffer('FixUsings4')
   call OmniSharpWarmup('OmniSharp#actions#usings#Fix', [])
   let g:OmniSharp_test_locations = []
-  function! s:Callback(locations)
+  function! s:CallbackFixUsings(locations)
     let g:OmniSharp_test_waiting = 0
     let g:OmniSharp_test_locations = a:locations
   endfunction
+  let Callback = function('s:CallbackFixUsings')
   let g:OmniSharp_test_waiting = 1
-  call function('OmniSharp#actions#usings#Fix', [function('s:Callback')])()
+  call function('OmniSharp#actions#usings#Fix', [Callback])()
   let starttime = reltime()
   while g:OmniSharp_test_waiting
   \ && reltime(starttime)[0] < g:OmniSharp_test_timeout

test/utils/async-helper.vader

@@ -2,23 +2,24 @@ After():
   call OmniSharpTestCleanupBuffer()
 
 Execute (set up async helper):
-  function! s:Callback(...)
+  function! s:CallbackStopWaiting(...)
     let g:OmniSharp_test_waiting = 0
   endfunction
 
   function! OmniSharpWarmup(funcname, args) abort
     call OmniSharpTestAwait(a:funcname, a:args, 1)
   endfunction
 
-  function! OmniSharpTestAwait(funcname, args, warmup = 0) abort
+  function! OmniSharpTestAwait(funcname, args, ...) abort
+    let warmup = a:0 ? a:1 : 0
     let g:OmniSharp_test_waiting = 1
-    call function(a:funcname, a:args + [function('s:Callback')])()
+    call function(a:funcname, a:args + [function('s:CallbackStopWaiting')])()
     let starttime = reltime()
     while g:OmniSharp_test_waiting
     \ && reltime(starttime)[0] < g:OmniSharp_test_timeout
       sleep 50m
     endwhile
-    if !a:warmup
+    if !warmup
       Assert !g:OmniSharp_test_waiting, a:funcname . ' timed out'
     endif
   endfunction