test: depend on vim-surround

Author: justinmk

Makefile

@@ -1,19 +1,22 @@
-VIM = vim -N -u NORC -i NONE --cmd 'set rtp+=tests/vader rtp+=tests/repeat rtp+=$$PWD'
+VIM = vim -N -u NORC -i NONE --cmd 'set rtp+=tests/vim-vader rtp+=tests/vim-repeat rtp+=tests/vim-surround rtp+=$$PWD'
 
-test: tests/vader tests/repeat
+test: tests/vim-vader tests/vim-repeat tests/vim-surround
 	$(VIM) '+Vader! tests/*.vader'
 
 # https://github.com/junegunn/vader.vim/pull/75
-testnvim: tests/vader tests/repeat
+testnvim: tests/vim-vader tests/vim-repeat tests/vim-surround
 	VADER_OUTPUT_FILE=/dev/stderr n$(VIM) --headless '+Vader! tests/*.vader'
 
-testinteractive: tests/vader tests/repeat
+testinteractive: tests/vim-vader tests/vim-repeat tests/vim-surround
 	$(VIM) '+Vader tests/*.vader'
 
-tests/vader:
-	git clone https://github.com/junegunn/vader.vim tests/vader || ( cd tests/vader && git pull --rebase; )
+tests/vim-vader:
+	git clone https://github.com/junegunn/vader.vim tests/vim-vader || ( cd tests/vim-vader && git pull --rebase; )
 
-tests/repeat:
-	git clone https://github.com/tpope/vim-repeat tests/repeat || ( cd tests/repeat && git pull --rebase; )
+tests/vim-repeat:
+	git clone https://github.com/tpope/vim-repeat tests/vim-repeat || ( cd tests/vim-repeat && git pull --rebase; )
 
-.PHONY: test testinteractive
+tests/vim-surround:
+	git clone https://github.com/tpope/vim-surround tests/vim-surround || ( cd tests/vim-surround && git pull --rebase; )
+
+.PHONY: test testnvim testinteractive

tests/.gitignore

@@ -1,2 +1,3 @@
-vader
-repeat
+vim-vader
+vim-repeat
+vim-surround

tests/test.vader

@@ -1,5 +1,4 @@
 # vim -N -u NONE -c "set rtp+=~/.vim/bundle/vim-sneak,~/.vim/bundle/vader.vim,~/.vim/bundle/vim-repeat" -c "runtime! plugin/sneak.vim plugin/vader.vim plugin/repeat.vim" -c "Vader ~/.vim/bundle/vim-sneak/tests/test.vader"
-# vim -N -u NONE -c 'set rtp+=~/.vim/bundle/vim-sneak,~/.vim/bundle/vader.vim,~/.vim/bundle/vim-repeat' -c 'runtime! plugin/sneak.vim plugin/vader.vim plugin/repeat.vim' -c 'Vader ~/.vim/bundle/vim-sneak/tests/test.vader'
 #
 # BUG: highlight targets are bogus if &iminsert=1
 # BUG: sneak cannot find ёе: in this text