diff options
| author | kylo252 <[email protected]> | 2022-10-22 15:25:46 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-10-22 15:25:46 +0200 |
| commit | 25c4241b07d2036fc5d0d4c18be43a16a5370ef0 (patch) | |
| tree | 4375736f21d6e8eaa316af748d9938d3c2740d52 | |
| parent | 36c8bdee9ff59a0a63c1edfc445b5eb2886cf246 (diff) | |
refactor: clean up test env paths (#3318)
| -rw-r--r-- | lua/lvim/bootstrap.lua | 5 | ||||
| -rw-r--r-- | lua/lvim/lsp/config.lua | 2 | ||||
| -rw-r--r-- | tests/minimal_init.lua | 2 | ||||
| -rw-r--r-- | utils/ci/run_test.sh | 7 |
4 files changed, 6 insertions, 10 deletions
diff --git a/lua/lvim/bootstrap.lua b/lua/lvim/bootstrap.lua index 5d980498..55a22502 100644 --- a/lua/lvim/bootstrap.lua +++ b/lua/lvim/bootstrap.lua @@ -10,7 +10,6 @@ end local uv = vim.loop local path_sep = uv.os_uname().version:match "Windows" and "\\" or "/" -local in_headless = #vim.api.nvim_list_uis() == 0 ---Join path segments that were passed as input ---@return string @@ -96,9 +95,7 @@ function M:init(base_dir) vim.cmd [[let &packpath = &runtimepath]] end - -- FIXME: currently unreliable in unit-tests - if not in_headless then - _G.PLENARY_DEBUG = false + if not vim.env.LVIM_TEST_ENV then require "lvim.impatient" end diff --git a/lua/lvim/lsp/config.lua b/lua/lvim/lsp/config.lua index 358e83f8..eeba9fb0 100644 --- a/lua/lvim/lsp/config.lua +++ b/lua/lvim/lsp/config.lua @@ -39,7 +39,7 @@ local skipped_servers = { "vuels", } -local skipped_filetypes = { "markdown", "rst", "plaintext" } +local skipped_filetypes = { "markdown", "rst", "plaintext", "toml" } local join_paths = require("lvim.utils").join_paths diff --git a/tests/minimal_init.lua b/tests/minimal_init.lua index 91579243..e9fe3d6a 100644 --- a/tests/minimal_init.lua +++ b/tests/minimal_init.lua @@ -1,5 +1,5 @@ local path_sep = vim.loop.os_uname().version:match "Windows" and "\\" or "/" -local base_dir = os.getenv "LUNARVIM_RUNTIME_DIR" .. path_sep .. "lvim" +local base_dir = vim.env.LUNARVIM_BASE_DIR local tests_dir = base_dir .. path_sep .. "tests" vim.opt.rtp:append(tests_dir) diff --git a/utils/ci/run_test.sh b/utils/ci/run_test.sh index b12ceb7e..3e1bcf1b 100644 --- a/utils/ci/run_test.sh +++ b/utils/ci/run_test.sh @@ -2,6 +2,7 @@ set -e export LUNARVIM_RUNTIME_DIR="${LUNARVIM_RUNTIME_DIR:-"$HOME/.local/share/lunarvim"}" +export LUNARVIM_BASE_DIR="${LUNARVIM_BASE_DIR:-"$LUNARVIM_RUNTIME_DIR/lvim"}" export LVIM_TEST_ENV=true @@ -11,12 +12,10 @@ LUNARVIM_CACHE_DIR="$(mktemp -d)" export LUNARVIM_CONFIG_DIR LUNARVIM_CACHE_DIR -echo "cache: $LUNARVIM_CACHE_DIR - -config: $LUNARVIM_CONFIG_DIR" +printf "cache_dir: %s\nconfig_dir: %s\n" "$LUNARVIM_CACHE_DIR" "$LUNARVIM_CONFIG_DIR" lvim() { - nvim -u "$LUNARVIM_RUNTIME_DIR/lvim/tests/minimal_init.lua" --cmd "set runtimepath+=$LUNARVIM_RUNTIME_DIR/lvim" "$@" + nvim -u "$LUNARVIM_BASE_DIR/tests/minimal_init.lua" --cmd "set runtimepath+=$LUNARVIM_BASE_DIR" "$@" } if [ -n "$1" ]; then |