Mercurial > vim
diff src/testdir/test_packadd.vim @ 14681:285b051979a6 v8.1.0353
patch 8.1.0353: an "after" directory of a package is appended to 'rtp'
commit https://github.com/vim/vim/commit/99396d4cbf78d313a454c7448acc07412d2e45b7
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Sep 8 18:21:16 2018 +0200
patch 8.1.0353: an "after" directory of a package is appended to 'rtp'
Problem: An "after" directory of a package is appended to 'rtp', which
will be after the user's "after" directory. ()
Solution: Insert the package "after" directory before any other "after"
directory in 'rtp'. (closes #3409)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 08 Sep 2018 18:30:06 +0200 |
| parents | 5ef1e6170589 |
| children | c833cf17a4b1 |
line wrap: on
line diff
--- a/src/testdir/test_packadd.vim +++ b/src/testdir/test_packadd.vim @@ -12,6 +12,11 @@ func TearDown() endfunc func Test_packadd() + if !exists('s:plugdir') + echomsg 'when running this test manually, call SetUp() first' + return + endif + call mkdir(s:plugdir . '/plugin/also', 'p') call mkdir(s:plugdir . '/ftdetect', 'p') call mkdir(s:plugdir . '/after', 'p') @@ -19,6 +24,14 @@ func Test_packadd() let rtp = &rtp filetype on + let rtp_entries = split(rtp, ',') + for entry in rtp_entries + if entry =~? '\<after\>' + let first_after_entry = entry + break + endif + endfor + exe 'split ' . s:plugdir . '/plugin/test.vim' call setline(1, 'let g:plugin_works = 42') wq @@ -38,7 +51,12 @@ func Test_packadd() call assert_equal(17, g:ftdetect_works) call assert_true(len(&rtp) > len(rtp)) call assert_match('/testdir/Xdir/pack/mine/opt/mytest\($\|,\)', &rtp) - call assert_match('/testdir/Xdir/pack/mine/opt/mytest/after$', &rtp) + + let new_after = match(&rtp, '/testdir/Xdir/pack/mine/opt/mytest/after,') + let old_after = match(&rtp, ',' . first_after_entry . '\>') + call assert_true(new_after > 0, 'rtp is ' . &rtp) + call assert_true(old_after > 0, 'rtp is ' . &rtp) + call assert_true(new_after < old_after, 'rtp is ' . &rtp) " NOTE: '/.../opt/myte' forwardly matches with '/.../opt/mytest' call mkdir(fnamemodify(s:plugdir, ':h') . '/myte', 'p')