3 files changed, 66 insertions, 54 deletions
diff --git a/src/nvim/testdir/test26.in b/src/nvim/testdir/test26.in
deleted file mode 100644
index e7cd757661..0000000000
--- a/src/nvim/testdir/test26.in
+++ /dev/null
@@ -1,44 +0,0 @@
-Test for :execute, :while and :if
-
-STARTTEST
-:so small.vim
-mt:let i = 0
-:while i < 12
-:  let i = i + 1
-:  if has("ebcdic")
-:    execute "normal o" . i . "\047"
-:  else
-:    execute "normal o" . i . "\033"
-:  endif
-:  if i % 2
-:    normal Ax
-:    if i == 9
-:      break
-:    endif
-:    if i == 5
-:      continue
-:    else
-:      let j = 9
-:      while j > 0
-:        if has("ebcdic")
-:          execute "normal" j . "a" . j . "\x27"
-:        else
-:          execute "normal" j . "a" . j . "\x1b"
-:        endif
-:        let j = j - 1
-:      endwhile
-:    endif
-:  endif
-:  if i == 9
-:    if has("ebcdic")
-:      execute "normal Az\047"
-:    else
-:      execute "normal Az\033"
-:    endif
-:  endif
-:endwhile
-:unlet i j
-:'t,$w! test.out
-:qa!
-ENDTEST
-
diff --git a/src/nvim/testdir/test26.ok b/src/nvim/testdir/test26.ok
deleted file mode 100644
index bc44761187..0000000000
--- a/src/nvim/testdir/test26.ok
+++ /dev/null
@@ -1,10 +0,0 @@
-
-1x999999999888888887777777666666555554444333221
-2
-3x999999999888888887777777666666555554444333221
-4
-5x
-6
-7x999999999888888887777777666666555554444333221
-8
-9x
diff --git a/test/functional/legacy/026_execute_while_if_spec.lua b/test/functional/legacy/026_execute_while_if_spec.lua
new file mode 100644
index 0000000000..9acbf76673
--- /dev/null
+++ b/test/functional/legacy/026_execute_while_if_spec.lua
@@ -0,0 +1,66 @@
+-- Test for :execute, :while and :if
+
+local helpers = require('test.functional.helpers')
+local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
+local execute, expect = helpers.execute, helpers.expect
+local source = helpers.source
+
+describe(':execute, :while and :if', function()
+  setup(clear)
+
+  it('is working', function()
+    source([[
+      let i = 0
+      while i < 12
+        let i = i + 1
+        if has("ebcdic")
+          execute "normal o" . i . "\047"
+        else
+          execute "normal o" . i . "\033"
+        endif
+        if i % 2
+          normal Ax
+          if i == 9
+            break
+          endif
+          if i == 5
+            continue
+          else
+            let j = 9
+            while j > 0
+              if has("ebcdic")
+                execute "normal" j . "a" . j . "\x27"
+              else
+                execute "normal" j . "a" . j . "\x1b"
+              endif
+              let j = j - 1
+            endwhile
+          endif
+        endif
+        if i == 9
+          if has("ebcdic")
+            execute "normal Az\047"
+          else
+            execute "normal Az\033"
+          endif
+        endif
+      endwhile
+      unlet i j
+    ]])
+
+    -- Remove empty line
+    execute('1d')
+
+    -- Assert buffer contents.
+    expect([[
+      1x999999999888888887777777666666555554444333221
+      2
+      3x999999999888888887777777666666555554444333221
+      4
+      5x
+      6
+      7x999999999888888887777777666666555554444333221
+      8
+      9x]])
+  end)
+end)