Merge branch 'master' into expression-parser

1 files changed, 67 insertions, 0 deletions

diff --git a/test/functional/ex_cmds/mkview_spec.lua b/test/functional/ex_cmds/mkview_spec.lua
new file mode 100644
index 0000000000..97a49dbbd5
--- /dev/null
+++ b/test/functional/ex_cmds/mkview_spec.lua
@@ -0,0 +1,67 @@
+local lfs = require('lfs')
+local helpers = require('test.functional.helpers')(after_each)
+
+local clear = helpers.clear
+local command = helpers.command
+local get_pathsep = helpers.get_pathsep
+local eq = helpers.eq
+local funcs = helpers.funcs
+local rmdir = helpers.rmdir
+
+local file_prefix = 'Xtest-functional-ex_cmds-mkview_spec'
+
+describe(':mkview', function()
+  local tmp_file_base = file_prefix .. '-tmpfile'
+  local local_dir = file_prefix .. '.d'
+  local view_dir = file_prefix .. '.view.d'
+
+  before_each(function()
+    clear()
+    lfs.mkdir(view_dir)
+    lfs.mkdir(local_dir)
+  end)
+
+  after_each(function()
+    -- Remove any views created in the view directory
+    rmdir(view_dir)
+    lfs.rmdir(local_dir)
+  end)
+
+  it('viewoption curdir restores local current directory', function()
+    local cwd_dir = funcs.getcwd()
+    local set_view_dir_command = 'set viewdir=' .. cwd_dir ..
+          get_pathsep() .. view_dir
+
+    -- By default the local current directory should save
+    command(set_view_dir_command)
+    command('edit ' .. tmp_file_base .. '1')
+    command('lcd ' .. local_dir)
+    command('mkview')
+
+    -- Create a new instance of Nvim to remove the 'lcd'
+    clear()
+
+    -- Disable saving the local current directory for the second view
+    command(set_view_dir_command)
+    command('set viewoptions-=curdir')
+    command('edit ' .. tmp_file_base .. '2')
+    command('lcd ' .. local_dir)
+    command('mkview')
+
+    -- Create a new instance of Nvim to test saved 'lcd' option
+    clear()
+    command(set_view_dir_command)
+
+    -- Load the view without a saved local current directory
+    command('edit ' .. tmp_file_base .. '2')
+    command('loadview')
+    -- The view's current directory should not have changed
+    eq(cwd_dir, funcs.getcwd())
+    -- Load the view with a saved local current directory
+    command('edit ' .. tmp_file_base .. '1')
+    command('loadview')
+    -- The view's local directory should have been saved
+    eq(cwd_dir .. get_pathsep() .. local_dir, funcs.getcwd())
+  end)
+
+end)