diff options
| author | b-r-o-c-k <brockmammen@gmail.com> | 2018-04-14 14:17:51 -0500 | 
|---|---|---|
| committer | b-r-o-c-k <brockmammen@gmail.com> | 2018-04-14 14:17:51 -0500 | 
| commit | ad999eaa775d7d4b0cacedb30c6ea3a0ee699a6f (patch) | |
| tree | 92de2079e80f5f289dd87a54af123cb7d90c3058 /test/functional/ex_cmds/write_spec.lua | |
| parent | 78bc52ea5397c092d01cd08296fe1dc85d998329 (diff) | |
| parent | ef4feab0e75be19c5f41d70a001db980b72090f5 (diff) | |
| download | rneovim-ad999eaa775d7d4b0cacedb30c6ea3a0ee699a6f.tar.gz rneovim-ad999eaa775d7d4b0cacedb30c6ea3a0ee699a6f.tar.bz2 rneovim-ad999eaa775d7d4b0cacedb30c6ea3a0ee699a6f.zip  | |
Merge branch 'master' into s-dash-stdin
Diffstat (limited to 'test/functional/ex_cmds/write_spec.lua')
| -rw-r--r-- | test/functional/ex_cmds/write_spec.lua | 31 | 
1 files changed, 23 insertions, 8 deletions
diff --git a/test/functional/ex_cmds/write_spec.lua b/test/functional/ex_cmds/write_spec.lua index 863d439080..bcf83698bb 100644 --- a/test/functional/ex_cmds/write_spec.lua +++ b/test/functional/ex_cmds/write_spec.lua @@ -10,8 +10,6 @@ local feed_command = helpers.feed_command  local funcs = helpers.funcs  local meths = helpers.meths -if helpers.pending_win32(pending) then return end -  local fname = 'Xtest-functional-ex_cmds-write'  local fname_bak = fname .. '~'  local fname_broken = fname_bak .. 'broken' @@ -36,7 +34,11 @@ describe(':write', function()    it('&backupcopy=auto preserves symlinks', function()      command('set backupcopy=auto')      write_file('test_bkc_file.txt', 'content0') -    command("silent !ln -s test_bkc_file.txt test_bkc_link.txt") +    if helpers.iswin() then +      command("silent !mklink test_bkc_link.txt test_bkc_file.txt") +    else +      command("silent !ln -s test_bkc_file.txt test_bkc_link.txt") +    end      source([[        edit test_bkc_link.txt        call setline(1, ['content1']) @@ -49,7 +51,11 @@ describe(':write', function()    it('&backupcopy=no replaces symlink with new file', function()      command('set backupcopy=no')      write_file('test_bkc_file.txt', 'content0') -    command("silent !ln -s test_bkc_file.txt test_bkc_link.txt") +    if helpers.iswin() then +      command("silent !mklink test_bkc_link.txt test_bkc_file.txt") +    else +      command("silent !ln -s test_bkc_file.txt test_bkc_link.txt") +    end      source([[        edit test_bkc_link.txt        call setline(1, ['content1']) @@ -82,8 +88,10 @@ describe(':write', function()      command('let $HOME=""')      eq(funcs.fnamemodify('.', ':p:h'), funcs.fnamemodify('.', ':p:h:~'))      -- Message from check_overwrite -    eq(('\nE17: "'..funcs.fnamemodify('.', ':p:h')..'" is a directory'), -       redir_exec('write .')) +    if not helpers.iswin() then +      eq(('\nE17: "'..funcs.fnamemodify('.', ':p:h')..'" is a directory'), +        redir_exec('write .')) +    end      meths.set_option('writeany', true)      -- Message from buf_write      eq(('\nE502: "." is a directory'), @@ -100,9 +108,16 @@ describe(':write', function()      funcs.setfperm(fname, 'r--------')      eq('Vim(write):E505: "Xtest-functional-ex_cmds-write" is read-only (add ! to override)',         exc_exec('write')) -    os.remove(fname) -    os.remove(fname_bak) +    if helpers.iswin() then +      eq(0, os.execute('del /q/f ' .. fname)) +      eq(0, os.execute('rd /q/s ' .. fname_bak)) +    else +      eq(true, os.remove(fname)) +      eq(true, os.remove(fname_bak)) +    end      write_file(fname_bak, 'TTYX') +    -- FIXME: exc_exec('write!') outputs 0 in Windows +    if helpers.iswin() then return end      lfs.link(fname_bak .. ('/xxxxx'):rep(20), fname, true)      eq('Vim(write):E166: Can\'t open linked file for writing',         exc_exec('write!'))  | 
