aboutsummaryrefslogtreecommitdiff
path: root/test/functional/shada/marks_spec.lua
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2015-08-12 21:01:45 +0300
committerZyX <kp-pav@yandex.ru>2015-10-08 22:00:39 +0300
commit17c69258a7128ee31fbf294b46599241f8e226cc (patch)
tree195c160d04c3d897f9a79ad7d375a168aaa22438 /test/functional/shada/marks_spec.lua
parent9d8184c65a5fdbf9793b759843178db74137b2a7 (diff)
downloadrneovim-17c69258a7128ee31fbf294b46599241f8e226cc.tar.gz
rneovim-17c69258a7128ee31fbf294b46599241f8e226cc.tar.bz2
rneovim-17c69258a7128ee31fbf294b46599241f8e226cc.zip
shada: Use same merging code for jumps and changes
Diffstat (limited to 'test/functional/shada/marks_spec.lua')
-rw-r--r--test/functional/shada/marks_spec.lua26
1 files changed, 6 insertions, 20 deletions
diff --git a/test/functional/shada/marks_spec.lua b/test/functional/shada/marks_spec.lua
index 8b9e70045c..dc7a710143 100644
--- a/test/functional/shada/marks_spec.lua
+++ b/test/functional/shada/marks_spec.lua
@@ -118,28 +118,14 @@ describe('ShaDa support code', function()
nvim_command('edit ' .. testfilename)
nvim_feed('G')
nvim_feed('gg')
- -- nvim_command('redir! >/tmp/jumps.last | jumps | redir END')
- -- nvim_command('wshada /tmp/foo')
+ nvim_command('enew')
+ nvim_feed('gg')
+ nvim_command('redir => g:jumps | jumps | redir END')
+ local saved = nvim_eval('g:jumps')
nvim_command('qall')
reset()
- nvim_command('redraw')
- -- nvim_command('redir! >/tmp/jumps.init | jumps | redir END')
- nvim_command('edit ' .. testfilename)
- -- nvim_command('redir! >/tmp/jumps | jumps | redir END')
- eq(testfilename, nvim_eval('bufname("%")'))
- eq(1, nvim_current_line())
- nvim_command('execute "normal! \\<C-o>"')
- eq(testfilename, nvim_eval('bufname("%")'))
- eq(1, nvim_current_line())
- nvim_command('execute "normal! \\<C-o>"')
- eq(testfilename, nvim_eval('bufname("%")'))
- eq(2, nvim_current_line())
- nvim_command('execute "normal! \\<C-o>"')
- eq(testfilename_2, nvim_eval('bufname("%")'))
- eq(1, nvim_current_line())
- nvim_command('execute "normal! \\<C-o>"')
- eq(testfilename_2, nvim_eval('bufname("%")'))
- eq(2, nvim_current_line())
+ nvim_command('redir => g:jumps | jumps | redir END')
+ eq(saved, nvim_eval('g:jumps'))
end)
it('is able to dump and restore jump list with different times (slow!)',