From 04f2f864e270e772c6326cefdf24947f0130e492 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Wed, 3 Jan 2024 02:09:18 +0100 Subject: refactor: format test/* --- test/functional/ex_cmds/file_spec.lua | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'test/functional/ex_cmds/file_spec.lua') diff --git a/test/functional/ex_cmds/file_spec.lua b/test/functional/ex_cmds/file_spec.lua index 131661828e..bfcfccda7b 100644 --- a/test/functional/ex_cmds/file_spec.lua +++ b/test/functional/ex_cmds/file_spec.lua @@ -8,7 +8,7 @@ local rmdir = helpers.rmdir local mkdir = helpers.mkdir describe(':file', function() - local swapdir = luv.cwd()..'/Xtest-file_spec' + local swapdir = luv.cwd() .. '/Xtest-file_spec' before_each(function() clear() rmdir(swapdir) @@ -19,18 +19,17 @@ describe(':file', function() rmdir(swapdir) end) - it("rename does not lose swapfile #6487", function() + it('rename does not lose swapfile #6487', function() local testfile = 'test-file_spec' - local testfile_renamed = testfile..'-renamed' + local testfile_renamed = testfile .. '-renamed' -- Note: `set swapfile` *must* go after `set directory`: otherwise it may -- attempt to create a swapfile in different directory. - command('set directory^='..swapdir..'//') + command('set directory^=' .. swapdir .. '//') command('set swapfile fileformat=unix undolevels=-1') - command('edit! '..testfile) + command('edit! ' .. testfile) -- Before #6487 this gave "E301: Oops, lost the swap file !!!" on Windows. - command('file '..testfile_renamed) - eq(testfile_renamed..'.swp', - string.match(funcs.execute('swapname'), '[^%%]+$')) + command('file ' .. testfile_renamed) + eq(testfile_renamed .. '.swp', string.match(funcs.execute('swapname'), '[^%%]+$')) end) end) -- cgit From 284e0ad26dd9de90c3a813dd1b357a425eca6bad Mon Sep 17 00:00:00 2001 From: Lewis Russell Date: Fri, 12 Jan 2024 12:03:25 +0000 Subject: test: use vim.mpack and vim.uv directly --- test/functional/ex_cmds/file_spec.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'test/functional/ex_cmds/file_spec.lua') diff --git a/test/functional/ex_cmds/file_spec.lua b/test/functional/ex_cmds/file_spec.lua index bfcfccda7b..ce55b61d53 100644 --- a/test/functional/ex_cmds/file_spec.lua +++ b/test/functional/ex_cmds/file_spec.lua @@ -1,5 +1,4 @@ local helpers = require('test.functional.helpers')(after_each) -local luv = require('luv') local clear = helpers.clear local command = helpers.command local eq = helpers.eq @@ -8,7 +7,7 @@ local rmdir = helpers.rmdir local mkdir = helpers.mkdir describe(':file', function() - local swapdir = luv.cwd() .. '/Xtest-file_spec' + local swapdir = vim.uv.cwd() .. '/Xtest-file_spec' before_each(function() clear() rmdir(swapdir) -- cgit From 795f896a5772d5e0795f86642bdf90c82efac45c Mon Sep 17 00:00:00 2001 From: Lewis Russell Date: Fri, 12 Jan 2024 17:59:57 +0000 Subject: test: rename (meths, funcs) -> (api, fn) --- test/functional/ex_cmds/file_spec.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/functional/ex_cmds/file_spec.lua') diff --git a/test/functional/ex_cmds/file_spec.lua b/test/functional/ex_cmds/file_spec.lua index ce55b61d53..a48c408600 100644 --- a/test/functional/ex_cmds/file_spec.lua +++ b/test/functional/ex_cmds/file_spec.lua @@ -2,7 +2,7 @@ local helpers = require('test.functional.helpers')(after_each) local clear = helpers.clear local command = helpers.command local eq = helpers.eq -local funcs = helpers.funcs +local fn = helpers.fn local rmdir = helpers.rmdir local mkdir = helpers.mkdir @@ -29,6 +29,6 @@ describe(':file', function() command('edit! ' .. testfile) -- Before #6487 this gave "E301: Oops, lost the swap file !!!" on Windows. command('file ' .. testfile_renamed) - eq(testfile_renamed .. '.swp', string.match(funcs.execute('swapname'), '[^%%]+$')) + eq(testfile_renamed .. '.swp', string.match(fn.execute('swapname'), '[^%%]+$')) end) end) -- cgit