4 files changed, 54 insertions, 43 deletions
diff --git a/src/nvim/testdir/test104.in b/src/nvim/testdir/test104.in
deleted file mode 100644
index fd847131e9..0000000000
--- a/src/nvim/testdir/test104.in
+++ /dev/null
@@ -1,30 +0,0 @@
-Tests for :let.  vim: set ft=vim ts=8 :
-
-STARTTEST
-:so small.vim
-:set runtimepath+=./sautest
-:" Test to not autoload when assigning.  It causes internal error.
-:try
-:  let Test104#numvar = function('tr')
-:  $put ='OK: ' . string(Test104#numvar)
-:catch
-:  $put ='FAIL: ' . v:exception
-:endtry
-:let a = 1
-:let b = 2
-:for letargs in ['a b', '{0 == 1 ? "a" : "b"}', '{0 == 1 ? "a" : "b"} a', 'a {0 == 1 ? "a" : "b"}']
-:  try
-:    redir => messages
-:    execute 'let' letargs
-:    redir END
-:    $put ='OK:'
-:    $put =split(substitute(messages, '\n', '\0  ', 'g'), '\n')
-:  catch
-:    $put ='FAIL: ' . v:exception
-:    redir END
-:  endtry
-:endfor
-:/^Results/,$wq! test.out
-ENDTEST
-
-Results of test104:
diff --git a/src/nvim/testdir/test104.ok b/src/nvim/testdir/test104.ok
deleted file mode 100644
index 5fb20945c3..0000000000
--- a/src/nvim/testdir/test104.ok
+++ /dev/null
@@ -1,13 +0,0 @@
-Results of test104:
-OK: function('tr')
-OK:
-  a                     #1
-  b                     #2
-OK:
-  b                     #2
-OK:
-  b                     #2
-  a                     #1
-OK:
-  a                     #1
-  b                     #2
diff --git a/src/nvim/testdir/sautest/autoload/Test104.vim b/test/functional/fixtures/autoload/Test104.vim
index d1e0e17a3b..d1e0e17a3b 100644
--- a/src/nvim/testdir/sautest/autoload/Test104.vim
+++ b/test/functional/fixtures/autoload/Test104.vim
diff --git a/test/functional/legacy/104_let_assignment.lua b/test/functional/legacy/104_let_assignment.lua
new file mode 100644
index 0000000000..a2431da835
--- /dev/null
+++ b/test/functional/legacy/104_let_assignment.lua
@@ -0,0 +1,54 @@
+-- Tests for :let.
+
+local helpers = require('test.functional.helpers')
+local clear, source = helpers.clear, helpers.source
+local execute, expect = helpers.execute, helpers.expect
+
+describe(':let', function()
+  setup(clear)
+
+  it('is working', function()
+    execute('set runtimepath+=test/functional/fixtures')
+
+    -- Test to not autoload when assigning.  It causes internal error.
+    source([[
+      try
+        let Test104#numvar = function('tr')
+        $put ='OK: ' . string(Test104#numvar)
+      catch
+        $put ='FAIL: ' . v:exception
+      endtry
+      let a = 1
+      let b = 2
+      for letargs in ['a b', '{0 == 1 ? "a" : "b"}', '{0 == 1 ? "a" : "b"} a', 'a {0 == 1 ? "a" : "b"}']
+        try
+          redir => messages
+          execute 'let' letargs
+          redir END
+          $put ='OK:'
+          $put =split(substitute(messages, '\n', '\0  ', 'g'), '\n')
+        catch
+          $put ='FAIL: ' . v:exception
+          redir END
+        endtry
+      endfor]])
+
+    -- Remove empty line
+    execute('1d')
+
+    -- Assert buffer contents.
+    expect([[
+      OK: function('tr')
+      OK:
+        a                     #1
+        b                     #2
+      OK:
+        b                     #2
+      OK:
+        b                     #2
+        a                     #1
+      OK:
+        a                     #1
+        b                     #2]])
+  end)
+end)