3 files changed, 52 insertions, 17 deletions
diff --git a/src/nvim/testdir/test23.in b/src/nvim/testdir/test23.in
deleted file mode 100644
index 0e0e605531..0000000000
--- a/src/nvim/testdir/test23.in
+++ /dev/null
@@ -1,15 +0,0 @@
-Tests for complicated + argument to :edit command
-
-STARTTEST
-:$-1w! Xfile1
-:$w! Xfile2
-:edit +1|s/|/PIPE/|w Xfile1| e Xfile2|1 | s/\//SLASH/|w
-:w! test.out
-:e Xfile1
-:w >> test.out
-:qa!
-ENDTEST
-
-The result should be in Xfile1: "fooPIPEbar", in Xfile2: "fooSLASHbar"
-foo|bar
-foo/bar
diff --git a/src/nvim/testdir/test23.ok b/src/nvim/testdir/test23.ok
deleted file mode 100644
index f1930abad6..0000000000
--- a/src/nvim/testdir/test23.ok
+++ /dev/null
@@ -1,2 +0,0 @@
-fooSLASHbar
-fooPIPEbar
diff --git a/test/functional/legacy/023_edit_arguments_spec.lua b/test/functional/legacy/023_edit_arguments_spec.lua
new file mode 100644
index 0000000000..b5955c5987
--- /dev/null
+++ b/test/functional/legacy/023_edit_arguments_spec.lua
@@ -0,0 +1,52 @@
+-- Tests for complicated + argument to :edit command
+
+local helpers = require('test.functional.helpers')
+local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
+local execute, expect = helpers.execute, helpers.expect
+
+describe(':edit', function()
+  setup(clear)
+
+  it('is working', function()
+    insert([[
+      The result should be in Xfile1: "fooPIPEbar", in Xfile2: "fooSLASHbar"
+      foo|bar
+      foo/bar]])
+
+    -- Prepare some test files
+    execute('$-1w! Xfile1')
+    execute('$w! Xfile2')
+    execute('w! Xfile0')
+
+    -- Open Xfile using '+' range
+    execute('edit +1 Xfile1')
+    execute('s/|/PIPE/')
+    execute('yank A')
+    execute('w! Xfile1')
+
+    -- Open Xfile2 using '|' range
+    execute('edit Xfile2|1')
+    execute("s/\\//SLASH/")
+    execute('yank A')
+    execute('w! Xfile2')
+
+    -- Clean first buffer and put @a
+    execute('bf')
+    execute('%d')
+    execute('0put a')
+
+    -- Remove empty lines
+    execute('1d | $d')
+
+    -- The buffer should now contain
+    expect([[
+      fooPIPEbar
+      fooSLASHbar]])
+  end)
+
+  teardown(function()
+    os.remove('Xfile0')
+    os.remove('Xfile1')
+    os.remove('Xfile2')
+  end)
+end)