Merge remote-tracking branch 'upstream/master' into floattitlefloattitle

1 files changed, 65 insertions, 0 deletions

diff --git a/test/functional/core/fileio_spec.lua b/test/functional/core/fileio_spec.lua
index a4d22685e8..d1ff5b8036 100644
--- a/test/functional/core/fileio_spec.lua
+++ b/test/functional/core/fileio_spec.lua
@@ -23,6 +23,9 @@ local iswin = helpers.iswin
 local assert_alive = helpers.assert_alive
 local expect_exit = helpers.expect_exit
 local write_file = helpers.write_file
+local Screen = require('test.functional.ui.screen')
+local feed_command = helpers.feed_command
+local uname = helpers.uname
 
 describe('fileio', function()
   before_each(function()
@@ -35,6 +38,7 @@ describe('fileio', function()
     os.remove('Xtest_startup_file2')
     os.remove('Xtest_тест.md')
     os.remove('Xtest-u8-int-max')
+    os.remove('Xtest-overwrite-forced')
     rmdir('Xtest_startup_swapdir')
     rmdir('Xtest_backupdir')
   end)
@@ -83,6 +87,9 @@ describe('fileio', function()
   end)
 
   it('backup #9709', function()
+    if uname() == 'freebsd' then
+      pending('Failing FreeBSD test')
+    end
     clear({ args={ '-i', 'Xtest_startup_shada',
                    '--cmd', 'set directory=Xtest_startup_swapdir' } })
 
@@ -102,6 +109,9 @@ describe('fileio', function()
   end)
 
   it('backup with full path #11214', function()
+    if uname() == 'freebsd' then
+      pending('Failing FreeBSD test')
+    end
     clear()
     mkdir('Xtest_backupdir')
     command('set backup')
@@ -144,6 +154,61 @@ describe('fileio', function()
     command('edit ++enc=utf32 Xtest-u8-int-max')
     assert_alive()
   end)
+
+  it(':w! does not show "file has been changed" warning', function()
+    clear()
+    write_file("Xtest-overwrite-forced", 'foobar')
+    command('set nofixendofline')
+    local screen = Screen.new(40,4)
+    screen:set_default_attr_ids({
+      [1] = {bold = true, foreground = Screen.colors.Blue1},
+      [2] = {foreground = Screen.colors.Grey100, background = Screen.colors.Red},
+      [3] = {bold = true, foreground = Screen.colors.SeaGreen4}
+    })
+    screen:attach()
+    command("set shortmess-=F")
+
+    command("e Xtest-overwrite-forced")
+    screen:expect([[
+      ^foobar                                  |
+      {1:~                                       }|
+      {1:~                                       }|
+      "Xtest-overwrite-forced" [noeol] 1L, 6B |
+    ]])
+
+    -- Get current unix time.
+    local cur_unix_time = os.time(os.date("!*t"))
+    local future_time = cur_unix_time + 999999
+    -- Set the file's access/update time to be
+    -- greater than the time at which it was created.
+    local uv = require("luv")
+    uv.fs_utime('Xtest-overwrite-forced', future_time, future_time)
+    -- use async feed_command because nvim basically hangs on the prompt
+    feed_command("w")
+    screen:expect([[
+      {2:WARNING: The file has been changed since}|
+      {2: reading it!!!}                          |
+      {3:Do you really want to write to it (y/n)^?}|
+                                              |
+    ]])
+
+    feed("n")
+    feed("<cr>")
+    screen:expect([[
+      ^foobar                                  |
+      {1:~                                       }|
+      {1:~                                       }|
+                                              |
+    ]])
+    -- Use a screen test because the warning does not set v:errmsg.
+    command("w!")
+    screen:expect([[
+      ^foobar                                  |
+      {1:~                                       }|
+      {1:~                                       }|
+      <erwrite-forced" [noeol] 1L, 6B written |
+    ]])
+  end)
 end)
 
 describe('tmpdir', function()