3 files changed, 48 insertions, 38 deletions
diff --git a/src/nvim/testdir/test84.in b/src/nvim/testdir/test84.in
deleted file mode 100644
index 25482db54c..0000000000
--- a/src/nvim/testdir/test84.in
+++ /dev/null
@@ -1,35 +0,0 @@
-Tests for curswant not changing when setting an option
-
-STARTTEST
-:so small.vim
-:/^start target options$/+1,/^end target options$/-1 yank
-:let target_option_names = split(@0)
-:function TestCurswant(option_name)
-:  normal! ggf8j
-:  let curswant_before = winsaveview().curswant
-:  execute 'let' '&'.a:option_name '=' '&'.a:option_name
-:  let curswant_after = winsaveview().curswant
-:  return [a:option_name, curswant_before, curswant_after]
-:endfunction
-:
-:new
-:put =['1234567890', '12345']
-:1 delete _
-:let result = []
-:for option_name in target_option_names
-:  call add(result, TestCurswant(option_name))
-:endfor
-:
-:new
-:put =map(copy(result), 'join(v:val, '' '')')
-:1 delete _
-:write test.out
-:
-:qall!
-ENDTEST
-
-start target options
-	tabstop
-	timeoutlen
-	ttimeoutlen
-end target options
diff --git a/src/nvim/testdir/test84.ok b/src/nvim/testdir/test84.ok
deleted file mode 100644
index 8b8e4ee824..0000000000
--- a/src/nvim/testdir/test84.ok
+++ /dev/null
@@ -1,3 +0,0 @@
-tabstop 7 4
-timeoutlen 7 7
-ttimeoutlen 7 7
diff --git a/test/functional/legacy/084_curswant_spec.lua b/test/functional/legacy/084_curswant_spec.lua
new file mode 100644
index 0000000000..55df5d3e73
--- /dev/null
+++ b/test/functional/legacy/084_curswant_spec.lua
@@ -0,0 +1,48 @@
+-- Tests for curswant not changing when setting an option.
+
+local helpers = require('test.functional.helpers')
+local feed, insert, source = helpers.feed, helpers.insert, helpers.source
+local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
+
+describe('curswant', function()
+  setup(clear)
+
+  it('is working', function()
+    insert([[
+      start target options
+      	tabstop
+      	timeoutlen
+      	ttimeoutlen
+      end target options]])
+
+    source([[
+      /^start target options$/+1,/^end target options$/-1 yank
+      let target_option_names = split(@0)
+      function TestCurswant(option_name)
+        normal! ggf8j
+        let curswant_before = winsaveview().curswant
+        execute 'let' '&'.a:option_name '=' '&'.a:option_name
+        let curswant_after = winsaveview().curswant
+        return [a:option_name, curswant_before, curswant_after]
+      endfunction
+      
+      new
+      put =['1234567890', '12345']
+      1 delete _
+      let result = []
+      for option_name in target_option_names
+        call add(result, TestCurswant(option_name))
+      endfor
+      
+      new
+      put =map(copy(result), 'join(v:val, '' '')')
+      1 delete _
+    ]])
+
+    -- Assert buffer contents.
+    expect([[
+      tabstop 7 4
+      timeoutlen 7 7
+      ttimeoutlen 7 7]])
+  end)
+end)