Merge pull request #2506 from ZyX-I/shada

Replace viminfo with ShaDa files

2 files changed, 22 insertions, 18 deletions

diff --git a/test/functional/ex_cmds/recover_spec.lua b/test/functional/ex_cmds/recover_spec.lua
index b92739e40e..a24a60af81 100644
--- a/test/functional/ex_cmds/recover_spec.lua
+++ b/test/functional/ex_cmds/recover_spec.lua
@@ -47,7 +47,8 @@ describe(':preserve', function()
 
     --TODO(justinmk): this is an ugly hack to force `helpers` to support
     --multiple sessions.
-    local nvim2 = helpers.spawn({helpers.nvim_prog, '-u', 'NONE', '--embed'})
+    local nvim2 = helpers.spawn({helpers.nvim_prog, '-u', 'NONE', '--embed'},
+                                true)
     helpers.set_session(nvim2)
 
     source(init)
diff --git a/test/functional/ex_cmds/wviminfo_spec.lua b/test/functional/ex_cmds/wviminfo_spec.lua
index f4911cd3e8..0c85157a0f 100644
--- a/test/functional/ex_cmds/wviminfo_spec.lua
+++ b/test/functional/ex_cmds/wviminfo_spec.lua
@@ -3,8 +3,8 @@ local clear, execute, eq, neq, spawn, nvim_prog, set_session, wait, write_file
   = helpers.clear, helpers.execute, helpers.eq, helpers.neq, helpers.spawn,
   helpers.nvim_prog, helpers.set_session, helpers.wait, helpers.write_file
 
-describe(':wviminfo', function()
-  local viminfo_file = 'wviminfo_test'
+describe(':wshada', function()
+  local shada_file = 'wshada_test'
   local session
 
   before_each(function()
@@ -17,38 +17,41 @@ describe(':wviminfo', function()
                            '--cmd', 'set swapfile'})
     set_session(session)
 
-    os.remove(viminfo_file)
+    os.remove(shada_file)
   end)
 
-  it('creates a viminfo file', function()
+  it('creates a shada file', function()
     -- file should _not_ exist
-    eq(nil, lfs.attributes(viminfo_file))
-    execute('wv! '..viminfo_file)
+    eq(nil, lfs.attributes(shada_file))
+    execute('wsh! '..shada_file)
     wait()
     -- file _should_ exist
-    neq(nil, lfs.attributes(viminfo_file))
+    neq(nil, lfs.attributes(shada_file))
   end)
 
   it('overwrites existing files', function()
-    local text = 'wviminfo test'
+    local text = 'wshada test'
 
     -- Create a dummy file
-    write_file(viminfo_file, text)
+    write_file(shada_file, text)
 
     -- sanity check
-    eq(text, io.open(viminfo_file):read())
-    neq(nil, lfs.attributes(viminfo_file))
+    eq(text, io.open(shada_file):read())
+    neq(nil, lfs.attributes(shada_file))
 
-    execute('wv! '..viminfo_file)
+    execute('wsh! '..shada_file)
     wait()
 
-    -- File should have been overwritten with a viminfo file.
-    local line1 = io.lines(viminfo_file)()
-    assert(nil ~= string.find(line1, 'This viminfo file was generated by Nvim'),
-      viminfo_file..' should be a viminfo-formatted file')
+    -- File should have been overwritten with a shada file.
+    local fp = io.open(shada_file, 'r')
+    local char1 = fp:read(1)
+    fp:close()
+    -- ShaDa file starts with a “header” entry
+    assert(char1:byte() == 0x01,
+      shada_file..' should be a shada file')
   end)
 
   teardown(function()
-    os.remove(viminfo_file)
+    os.remove(shada_file)
   end)
 end)