diff --git a/test/run b/test/run index 2562b87..28d2bc3 100755 --- a/test/run +++ b/test/run @@ -16,6 +16,7 @@ mkdir -p "$TEMP" cat > $TEMP/mini-vimrc << VIMRC set rtp+=$TEMP/junegunn/vader.vim +source $TEMP/junegunn/vader.vim/plugin/vader.vim set shell=/bin/bash VIMRC @@ -127,9 +128,9 @@ git --version vim=$(select_vim) echo "Selected Vim: $vim" if [ "${1:-}" = '!' ]; then - $vim -Nu $TEMP/mini-vimrc -c 'Vader! test.vader' > /dev/null && + $vim --noplugin -Nu $TEMP/mini-vimrc -c 'Vader! test.vader' && prepare && - $vim -Nu $TEMP/mini-vimrc -c 'let g:plug_threads = 1 | Vader! test.vader' > /dev/null + $vim --noplugin -Nu $TEMP/mini-vimrc -c 'let g:plug_threads = 1 | Vader! test.vader' else - $vim -Nu $TEMP/mini-vimrc -c 'Vader test.vader' + $vim --noplugin -Nu $TEMP/mini-vimrc -c 'Vader test.vader' fi diff --git a/test/test.vader b/test/test.vader index 9922773..591e702 100644 --- a/test/test.vader +++ b/test/test.vader @@ -40,12 +40,6 @@ Execute (Initialize test environment): endfunction command! -nargs=+ -bang AssertExpect call AssertExpect('' == '!', ) - function! EnsureLoaded() - if has('vim_starting') - runtime! plugin/**/*.vim - endif - endfunction - function! RmRf(file) call system(printf('rm -rf "%s"', a:file)) endfunction @@ -95,7 +89,6 @@ Execute (Cleanup): silent! delf PlugStatusSorted silent! delf AssertExpect silent! delf PlugUpdated - silent! delf EnsureLoaded silent! delf ReloadPlug silent! delc AssertExpect silent! unmap / diff --git a/test/workflow.vader b/test/workflow.vader index 65de605..c5a2e8a 100644 --- a/test/workflow.vader +++ b/test/workflow.vader @@ -659,7 +659,7 @@ Given (Unaligned code): aa=2 Execute (Check installed plugins): - call EnsureLoaded() + runtime plugin/fnr.vim plugin/redis.vim Assert exists(':FNR'), 'FNR command should be found' Assert !exists(':RedisExecute'), 'RedisExecute command still should not be found' @@ -1419,7 +1419,6 @@ Execute (Strict load order): Plug '$PLUG_FIXTURES/xxx' Plug '$PLUG_FIXTURES/yyy', { 'for': ['xxx'] } call plug#end() - call EnsureLoaded() setf xxx Log 'Case 1: ' . &rtp AssertEqual ['yyy/ftdetect', 'yyy/after/ftdetect', 'xxx/ftdetect', 'xxx/after/ftdetect'], g:total_order[0:3] @@ -1433,7 +1432,6 @@ Execute (Strict load order): Plug '$PLUG_FIXTURES/xxx', { 'for': ['xxx'] } Plug '$PLUG_FIXTURES/yyy' call plug#end() - call EnsureLoaded() set rtp^=manually-prepended set rtp+=manually-appended setf xxx @@ -1453,7 +1451,6 @@ Execute (Strict load order): Plug '$PLUG_FIXTURES/xxx', { 'for': ['xxx'] } Plug '$PLUG_FIXTURES/yyy', { 'for': ['xxx'] } call plug#end() - call EnsureLoaded() setf xxx Log 'Case 3: ' . &rtp AssertEqual ['xxx/ftdetect', 'xxx/after/ftdetect', 'yyy/ftdetect', 'yyy/after/ftdetect'], g:total_order[0:3]