2 files changed, 27 insertions, 30 deletions
diff --git a/test/functional/autocmd/autocmd_spec.lua b/test/functional/autocmd/autocmd_spec.lua
index c38bd75c69..9a0c5c2b0c 100644
--- a/test/functional/autocmd/autocmd_spec.lua
+++ b/test/functional/autocmd/autocmd_spec.lua
@@ -5,6 +5,15 @@ local command = helpers.command
 local eq = helpers.eq
 local eval = helpers.eval
 
+local eq = helpers.eq
+local eval = helpers.eval
+local clear = helpers.clear
+local meths = helpers.meths
+local expect = helpers.expect
+local command = helpers.command
+local exc_exec = helpers.exc_exec
+local curbufmeths = helpers.curbufmeths
+
 describe('autocmds:', function()
   before_each(clear)
 
@@ -33,4 +42,22 @@ describe('autocmds:', function()
   it('v:vim_did_enter is 1 after VimEnter', function()
     eq(1, eval('v:vim_did_enter'))
   end)
+
+  describe('BufLeave autocommand', function()
+    it('can wipe out the buffer created by :edit which triggered autocmd',
+    function()
+      meths.set_option('hidden', true)
+      curbufmeths.set_lines(0, 1, false, {
+        'start of test file xx',
+        'end of test file xx'})
+
+      command('autocmd BufLeave * bwipeout yy')
+      eq('Vim(edit):E143: Autocommands unexpectedly deleted new buffer yy',
+         exc_exec('edit yy'))
+
+      expect([[
+        start of test file xx
+        end of test file xx]])
+    end)
+  end)
 end)
diff --git a/test/functional/legacy/009_bufleave_autocommand_spec.lua b/test/functional/legacy/009_bufleave_autocommand_spec.lua
deleted file mode 100644
index e2b3dca685..0000000000
--- a/test/functional/legacy/009_bufleave_autocommand_spec.lua
+++ /dev/null
@@ -1,30 +0,0 @@
--- Test for Bufleave autocommand that deletes the buffer we are about to edit.
-
-local helpers = require('test.functional.helpers')(after_each)
-
-local eq = helpers.eq
-local clear = helpers.clear
-local meths = helpers.meths
-local expect = helpers.expect
-local command = helpers.command
-local exc_exec = helpers.exc_exec
-local curbufmeths = helpers.curbufmeths
-
-describe('BufLeave autocommand', function()
-  setup(clear)
-
-  it('is working', function()
-    meths.set_option('hidden', true)
-    curbufmeths.set_lines(0, 1, false, {
-      'start of test file xx',
-      'end of test file xx'})
-
-    command('autocmd BufLeave * bwipeout yy')
-    eq('Vim(edit):E143: Autocommands unexpectedly deleted new buffer yy',
-       exc_exec('edit yy'))
-
-    expect([[
-      start of test file xx
-      end of test file xx]])
-  end)
-end)