aboutsummaryrefslogtreecommitdiff
path: root/test/functional
diff options
context:
space:
mode:
authorLewis Russell <lewis6991@gmail.com>2024-01-15 19:41:22 +0000
committerLewis Russell <lewis6991@gmail.com>2024-01-17 10:10:17 +0000
commit96ad7e0a4aa10ba7541e9e3256f1e84cfc9037ad (patch)
tree6a045a57277e224999f61e36ca57f1c81591e619 /test/functional
parentb990a1f286fa6c5add1001e4a31fd8e699b40e99 (diff)
downloadrneovim-96ad7e0a4aa10ba7541e9e3256f1e84cfc9037ad.tar.gz
rneovim-96ad7e0a4aa10ba7541e9e3256f1e84cfc9037ad.tar.bz2
rneovim-96ad7e0a4aa10ba7541e9e3256f1e84cfc9037ad.zip
test: refactor Paths
Diffstat (limited to 'test/functional')
-rw-r--r--test/functional/helpers.lua4
-rw-r--r--test/functional/lua/fs_spec.lua4
-rw-r--r--test/functional/shada/shada_spec.lua2
-rw-r--r--test/functional/ui/messages_spec.lua2
4 files changed, 6 insertions, 6 deletions
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index 5653810f28..e1fbfe6ff3 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -18,7 +18,7 @@ local fail = global_helpers.fail
local module = {}
local runtime_set = 'set runtimepath^=./build/lib/nvim/'
-module.nvim_prog = (os.getenv('NVIM_PRG') or global_helpers.test_build_dir .. '/bin/nvim')
+module.nvim_prog = (os.getenv('NVIM_PRG') or global_helpers.paths.test_build_dir .. '/bin/nvim')
-- Default settings for the test session.
module.nvim_set = (
'set shortmess+=IS background=light termguicolors noswapfile noautoindent startofline'
@@ -915,7 +915,7 @@ end
function module.add_builddir_to_rtp()
-- Add runtime from build dir for doc/tags (used with :help).
- module.command(string.format([[set rtp+=%s/runtime]], module.test_build_dir))
+ module.command(string.format([[set rtp+=%s/runtime]], module.paths.test_build_dir))
end
-- Kill (reap) a process by PID.
diff --git a/test/functional/lua/fs_spec.lua b/test/functional/lua/fs_spec.lua
index 66ba0f71f2..6821fe3c5e 100644
--- a/test/functional/lua/fs_spec.lua
+++ b/test/functional/lua/fs_spec.lua
@@ -6,8 +6,8 @@ local eq = helpers.eq
local mkdir_p = helpers.mkdir_p
local rmdir = helpers.rmdir
local nvim_dir = helpers.nvim_dir
-local test_build_dir = helpers.test_build_dir
-local test_source_path = helpers.test_source_path
+local test_build_dir = helpers.paths.test_build_dir
+local test_source_path = helpers.paths.test_source_path
local nvim_prog = helpers.nvim_prog
local is_os = helpers.is_os
local mkdir = helpers.mkdir
diff --git a/test/functional/shada/shada_spec.lua b/test/functional/shada/shada_spec.lua
index 2942beab2f..6eb318015d 100644
--- a/test/functional/shada/shada_spec.lua
+++ b/test/functional/shada/shada_spec.lua
@@ -7,7 +7,7 @@ local is_os = helpers.is_os
local skip = helpers.skip
local uv = vim.uv
-local paths = require('test.cmakeconfig.paths')
+local paths = helpers.paths
local shada_helpers = require('test.functional.shada.helpers')
local reset, clear, get_shada_rw =
diff --git a/test/functional/ui/messages_spec.lua b/test/functional/ui/messages_spec.lua
index a742f765a9..9d1b6163d2 100644
--- a/test/functional/ui/messages_spec.lua
+++ b/test/functional/ui/messages_spec.lua
@@ -7,7 +7,7 @@ local command = helpers.command
local set_method_error = helpers.set_method_error
local api = helpers.api
local async_meths = helpers.async_meths
-local test_build_dir = helpers.test_build_dir
+local test_build_dir = helpers.paths.test_build_dir
local nvim_prog = helpers.nvim_prog
local exec = helpers.exec
local exec_capture = helpers.exec_capture