1 files changed, 21 insertions, 12 deletions

diff --git a/test/functional/legacy/loadplugin_spec.lua b/test/functional/legacy/packadd_spec.lua
index af97db3ae5..94b5336b9f 100644
--- a/test/functional/legacy/loadplugin_spec.lua
+++ b/test/functional/legacy/packadd_spec.lua
@@ -1,4 +1,4 @@
--- Tests for :loadplugin
+-- Tests for 'packpath' and :packadd
 
 local helpers = require('test.functional.helpers')(after_each)
 local clear, source = helpers.clear, helpers.source
@@ -8,8 +8,8 @@ local function expected_empty()
   eq({}, nvim.get_vvar('errors'))
 end
 
-describe('loadplugin', function()
-  setup(function()
+describe('packadd', function()
+  before_each(function()
     clear()
 
     source([=[
@@ -23,7 +23,7 @@ describe('loadplugin', function()
         call delete(s:topdir, 'rf')
       endfunc
 
-      func Test_loadplugin()
+      func Test_packadd()
         call mkdir(s:plugdir . '/plugin', 'p')
         call mkdir(s:plugdir . '/ftdetect', 'p')
         set rtp&
@@ -38,7 +38,7 @@ describe('loadplugin', function()
         call setline(1, 'let g:ftdetect_works = 17')
         wq
 
-        loadplugin mytest
+        packadd mytest
 
         call assert_true(42, g:plugin_works)
         call assert_true(17, g:ftdetect_works)
@@ -46,34 +46,43 @@ describe('loadplugin', function()
         call assert_true(&rtp =~ (s:plugdir . '\($\|,\)'))
       endfunc
 
-      func Test_packadd()
+      func Test_packadd_noload()
+        call mkdir(s:plugdir . '/plugin', 'p')
         call mkdir(s:plugdir . '/syntax', 'p')
         set rtp&
         let rtp = &rtp
-        packadd mytest
+
+        exe 'split ' . s:plugdir . '/plugin/test.vim'
+        call setline(1, 'let g:plugin_works = 42')
+        wq
+        let g:plugin_works = 0
+
+        packadd! mytest
+
         call assert_true(len(&rtp) > len(rtp))
         call assert_true(&rtp =~ (s:plugdir . '\($\|,\)'))
+        call assert_equal(0, g:plugin_works)
 
         " check the path is not added twice
         let new_rtp = &rtp
-        packadd mytest
+        packadd! mytest
         call assert_equal(new_rtp, &rtp)
       endfunc
     ]=])
     call('SetUp')
   end)
 
-  teardown(function()
+  after_each(function()
     call('TearDown')
   end)
 
   it('is working', function()
-    call('Test_loadplugin')
+    call('Test_packadd')
     expected_empty()
   end)
 
-  it('works with packadd', function()
-    call('Test_packadd')
+  it('works with packadd!', function()
+    call('Test_packadd_noload')
     expected_empty()
   end)
 end)