Merge remote-tracking branch 'upstream/master' into mix_20240309

1 files changed, 9 insertions, 7 deletions

diff --git a/test/functional/legacy/increment_spec.lua b/test/functional/legacy/increment_spec.lua
index a81044114c..c9c2324c42 100644
--- a/test/functional/legacy/increment_spec.lua
+++ b/test/functional/legacy/increment_spec.lua
@@ -1,9 +1,11 @@
 -- Tests for using Ctrl-A/Ctrl-X on visual selections
 
-local helpers = require('test.functional.helpers')(after_each)
-local source, command = helpers.source, helpers.command
-local call, clear = helpers.call, helpers.clear
-local eq, nvim = helpers.eq, helpers.api
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
+
+local source, command = n.source, n.command
+local call, clear = n.call, n.clear
+local eq, api = t.eq, n.api
 
 describe('Ctrl-A/Ctrl-X on visual selections', function()
   before_each(function()
@@ -743,18 +745,18 @@ describe('Ctrl-A/Ctrl-X on visual selections', function()
     it('works on Test ' .. id, function()
       command('set nrformats&vi') -- &vi makes Vim compatible
       call('Test_visual_increment_' .. id)
-      eq({}, nvim.nvim_get_vvar('errors'))
+      eq({}, api.nvim_get_vvar('errors'))
     end)
   end
 
   it('does not drop leading zeroes', function()
     command('set nrformats&vi') -- &vi makes Vim compatible
     call('Test_normal_increment_01')
-    eq({}, nvim.nvim_get_vvar('errors'))
+    eq({}, api.nvim_get_vvar('errors'))
   end)
 
   it('maintains correct column after CTRL-A', function()
     call('Test_normal_increment_02')
-    eq({}, nvim.nvim_get_vvar('errors'))
+    eq({}, api.nvim_get_vvar('errors'))
   end)
 end)