diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-10-25 22:38:23 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-10-25 22:38:23 -0400 |
| commit | 1ca5646bb52ec5c23b28f45bb7bc5d25cffad9b0 (patch) | |
| tree | 7495d3f50b897e74fc4597d061d427a4e9b1ae36 /test/functional/ex_cmds | |
| parent | de4cb766ca381c09fd3f938136c1932ebf008f63 (diff) | |
| parent | 42047acb4f07c689936b051864c6b4448b1b6aa1 (diff) | |
| download | rneovim-1ca5646bb52ec5c23b28f45bb7bc5d25cffad9b0.tar.gz rneovim-1ca5646bb52ec5c23b28f45bb7bc5d25cffad9b0.tar.bz2 rneovim-1ca5646bb52ec5c23b28f45bb7bc5d25cffad9b0.zip | |
Merge pull request #3470 from ZyX-I/pr-3198
XDG base directory specification support
Diffstat (limited to 'test/functional/ex_cmds')
| -rw-r--r-- | test/functional/ex_cmds/recover_spec.lua | 6 | ||||
| -rw-r--r-- | test/functional/ex_cmds/wviminfo_spec.lua | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/test/functional/ex_cmds/recover_spec.lua b/test/functional/ex_cmds/recover_spec.lua index a24a60af81..6749cfaf40 100644 --- a/test/functional/ex_cmds/recover_spec.lua +++ b/test/functional/ex_cmds/recover_spec.lua @@ -29,9 +29,11 @@ describe(':preserve', function() it("saves to custom 'directory' and (R)ecovers (issue #1836)", function() local testfile = 'testfile_recover_spec' + -- Note: `set swapfile` *must* go after `set directory`: otherwise it may + -- attempt to create a swapfile in different directory. local init = [[ - set swapfile fileformat=unix undolevels=-1 set directory^=]]..swapdir..[[// + set swapfile fileformat=unix undolevels=-1 ]] source(init) @@ -47,7 +49,7 @@ 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', '-i', 'NONE', '--embed'}, true) helpers.set_session(nvim2) diff --git a/test/functional/ex_cmds/wviminfo_spec.lua b/test/functional/ex_cmds/wviminfo_spec.lua index 0c85157a0f..b6b9185cf2 100644 --- a/test/functional/ex_cmds/wviminfo_spec.lua +++ b/test/functional/ex_cmds/wviminfo_spec.lua @@ -13,7 +13,7 @@ describe(':wshada', function() end -- Override the default session because we need 'swapfile' for these tests. - local session = spawn({nvim_prog, '-u', 'NONE', '--embed', + local session = spawn({nvim_prog, '-u', 'NONE', '-i', '/dev/null', '--embed', '--cmd', 'set swapfile'}) set_session(session) |