shada,functests: Refactor shada items skipping

1 files changed, 16 insertions, 2 deletions

diff --git a/test/functional/shada/marks_spec.lua b/test/functional/shada/marks_spec.lua
index f1a112bfef..a6518ccbf9 100644
--- a/test/functional/shada/marks_spec.lua
+++ b/test/functional/shada/marks_spec.lua
@@ -48,13 +48,13 @@ describe('ShaDa support code', function()
     eq(2, nvim_current_line())
   end)
 
-  it('does not read back global mark without `f0` in viminfo', function()
+  it('does not dump global mark with `f0` in viminfo', function()
+    nvim_command('set viminfo+=f0')
     nvim_command('edit ' .. testfilename)
     nvim_command('mark A')
     nvim_command('2')
     nvim_command('kB')
     nvim_command('wviminfo')
-    set_additional_cmd('set viminfo+=f0')
     reset()
     nvim_command('language C')
     nvim_command([[
@@ -66,6 +66,20 @@ describe('ShaDa support code', function()
     eq('Vim(normal):E20: Mark not set', nvim('get_var', 'exception'))
   end)
 
+  it('does read back global mark even with `\'0` and `f0` in viminfo', function()
+    nvim_command('edit ' .. testfilename)
+    nvim_command('mark A')
+    nvim_command('2')
+    nvim_command('kB')
+    nvim_command('wviminfo')
+    set_additional_cmd('set viminfo=\'0,f0')
+    reset()
+    nvim_command('language C')
+    nvim_command('normal! `A')
+    eq(testfilename, nvim_eval('fnamemodify(@%, ":t")'))
+    eq(1, nvim_current_line())
+  end)
+
   it('is able to dump and read back local mark', function()
     nvim_command('edit ' .. testfilename)
     nvim_command('mark a')