1 files changed, 16 insertions, 26 deletions
diff --git a/test/functional/shada/buffers_spec.lua b/test/functional/shada/buffers_spec.lua
index a4746c2205..04c9c01d7c 100644
--- a/test/functional/shada/buffers_spec.lua
+++ b/test/functional/shada/buffers_spec.lua
@@ -1,26 +1,22 @@
--- ShaDa buffer list saving/reading support
+-- shada buffer list saving/reading support
 local helpers = require('test.functional.helpers')(after_each)
 local nvim_command, funcs, eq, curbufmeths =
   helpers.command, helpers.funcs, helpers.eq, helpers.curbufmeths
 
 local shada_helpers = require('test.functional.shada.helpers')
-local reset, set_additional_cmd, clear =
-  shada_helpers.reset, shada_helpers.set_additional_cmd,
-  shada_helpers.clear
+local reset, clear = shada_helpers.reset, shada_helpers.clear
 
-describe('ShaDa support code', function()
+describe('shada support code', function()
   local testfilename = 'Xtestfile-functional-shada-buffers'
   local testfilename_2 = 'Xtestfile-functional-shada-buffers-2'
-  before_each(reset)
   after_each(clear)
 
   it('is able to dump and restore buffer list', function()
-    set_additional_cmd('set shada+=%')
-    reset()
+    reset('set shada+=%')
     nvim_command('edit ' .. testfilename)
     nvim_command('edit ' .. testfilename_2)
     nvim_command('qall')
-    reset()
+    reset('set shada+=%')
     eq(3, funcs.bufnr('$'))
     eq('', funcs.bufname(1))
     eq(testfilename, funcs.bufname(2))
@@ -28,11 +24,9 @@ describe('ShaDa support code', function()
   end)
 
   it('does not restore buffer list without % in &shada', function()
-    set_additional_cmd('set shada+=%')
-    reset()
+    reset('set shada+=%')
     nvim_command('edit ' .. testfilename)
     nvim_command('edit ' .. testfilename_2)
-    set_additional_cmd('')
     nvim_command('qall')
     reset()
     eq(1, funcs.bufnr('$'))
@@ -40,61 +34,57 @@ describe('ShaDa support code', function()
   end)
 
   it('does not dump buffer list without % in &shada', function()
+    reset()
     nvim_command('edit ' .. testfilename)
     nvim_command('edit ' .. testfilename_2)
-    set_additional_cmd('set shada+=%')
     nvim_command('qall')
-    reset()
+    reset('set shada+=%')
     eq(1, funcs.bufnr('$'))
     eq('', funcs.bufname(1))
   end)
 
   it('does not dump unlisted buffer', function()
-    set_additional_cmd('set shada+=%')
-    reset()
+    reset('set shada+=%')
     nvim_command('edit ' .. testfilename)
     nvim_command('edit ' .. testfilename_2)
     curbufmeths.set_option('buflisted', false)
     nvim_command('qall')
-    reset()
+    reset('set shada+=%')
     eq(2, funcs.bufnr('$'))
     eq('', funcs.bufname(1))
     eq(testfilename, funcs.bufname(2))
   end)
 
   it('does not dump quickfix buffer', function()
-    set_additional_cmd('set shada+=%')
-    reset()
+    reset('set shada+=%')
     nvim_command('edit ' .. testfilename)
     nvim_command('edit ' .. testfilename_2)
     curbufmeths.set_option('buftype', 'quickfix')
     nvim_command('qall')
-    reset()
+    reset('set shada+=%')
     eq(2, funcs.bufnr('$'))
     eq('', funcs.bufname(1))
     eq(testfilename, funcs.bufname(2))
   end)
 
   it('does not dump unnamed buffers', function()
-    set_additional_cmd('set shada+=% hidden')
-    reset()
+    reset('set shada+=% hidden')
     curbufmeths.set_lines(0, 1, true, {'foo'})
     nvim_command('enew')
     curbufmeths.set_lines(0, 1, true, {'bar'})
     eq(2, funcs.bufnr('$'))
     nvim_command('qall!')
-    reset()
+    reset('set shada+=% hidden')
     eq(1, funcs.bufnr('$'))
     eq('', funcs.bufname(1))
   end)
 
   it('restores 1 buffer with %1 in &shada, #5759', function()
-    set_additional_cmd('set shada+=%1')
-    reset()
+    reset('set shada+=%1')
     nvim_command('edit ' .. testfilename)
     nvim_command('edit ' .. testfilename_2)
     nvim_command('qall')
-    reset()
+    reset('set shada+=%1')
     eq(2, funcs.bufnr('$'))
     eq('', funcs.bufname(1))
     eq(testfilename, funcs.bufname(2))