From ecf6f16bfaaae4593b14d9b04ae486038d3b7b45 Mon Sep 17 00:00:00 2001
From: Andy Massimino <andymass@users.noreply.github.com>
Date: Wed, 25 May 2022 22:08:52 -0400
Subject: [PATCH] Test fix 220525 (#226)

* Try to fix TS test

* Fix gitlab ci yaml

* Fix gitlab ci syntax 2
---
 .gitlab-ci.yml                | 5 ++++-
 test/new/common/bootstrap.vim | 5 +++--
 test/vader/minvimrc           | 3 +++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5f38d1c..8852c80 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,4 @@
+---
 stages:
   - test
   - gen_coverage
@@ -81,7 +82,9 @@ coverage:
   script: cd ./test/new && make -j1 coverage
   artifacts:
     reports:
-      cobertura: ./test/new/coverage.xml
+      coverage_report:
+        coverage_format: cobertura
+        path: ./test/new/coverage.xml
     paths:
       - ./test/new/htmlcov
 
diff --git a/test/new/common/bootstrap.vim b/test/new/common/bootstrap.vim
index 38c07f8..49c773e 100644
--- a/test/new/common/bootstrap.vim
+++ b/test/new/common/bootstrap.vim
@@ -8,6 +8,9 @@ if $TESTS_ENABLE_TREESITTER
   let &rtp = s:path.'/test/vader/plugged/nvim-treesitter,' . &rtp
   let &rtp .= ','.s:path.'/test/vader/plugged/nvim-treesitter/after'
 
+  runtime! plugin/nvim-treesitter.vim
+  runtime! plugin/nvim-treesitter.lua
+
   lua <<EOF
   require'nvim-treesitter.configs'.setup {
     matchup = {
@@ -15,8 +18,6 @@ if $TESTS_ENABLE_TREESITTER
     }
   }
 EOF
-
-  runtime! plugin/nvim-treesitter.{vim,lua}
 endif
 
 filetype plugin indent on
diff --git a/test/vader/minvimrc b/test/vader/minvimrc
index 0df4dae..a72cc54 100644
--- a/test/vader/minvimrc
+++ b/test/vader/minvimrc
@@ -16,6 +16,9 @@ if $TESTS_ENABLE_TREESITTER
   let &rtp = s:path.'/test/vader/plugged/nvim-treesitter,' . &rtp
   let &rtp .= ','.s:path.'/test/vader/plugged/nvim-treesitter/after'
 
+  runtime! plugin/nvim-treesitter.vim
+  runtime! plugin/nvim-treesitter.lua
+
   lua <<EOF
   require'nvim-treesitter.configs'.setup {
     matchup = {