Skip to content

chore: POC plenary test #3063

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/luals-out/
/luals/
/plenary.nvim/
# backup vim files
*~
3 changes: 2 additions & 1 deletion .luarc.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"workspace": {
"library": [
"$VIMRUNTIME/lua/vim",
"${3rd}/luv/library"
"${3rd}/luv/library",
"plenary.nvim"
]
},
"diagnostics": {
Expand Down
13 changes: 13 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,19 @@ help-update:
help-check: help-update
git diff --exit-code doc/nvim-tree-lua.txt

#
# test
#
test: plenary.nvim
scripts/test.sh

#
# Dependencies
#
# no plenary tags or releases available
plenary.nvim:
git clone [email protected]:nvim-lua/plenary.nvim.git


.PHONY: all lint style check luacheck style-check style-doc luals style-fix help-update help-check

6 changes: 5 additions & 1 deletion lua/nvim-tree/utils.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ M.is_wsl = vim.fn.has("wsl") == 1
-- false for WSL
M.is_windows = vim.fn.has("win32") == 1 or vim.fn.has("win32unix") == 1

function M._is_windows()
return vim.fn.has("win32") == 1 or vim.fn.has("win32unix") == 1
end

---@param haystack string
---@param needle string
---@return boolean
Expand Down Expand Up @@ -299,7 +303,7 @@ end
---@param path string
---@return string
function M.canonical_path(path)
if M.is_windows and path:match("^%a:") then
if M._is_windows() and path:match("^%a:") then
return path:sub(1, 1):upper() .. path:sub(2)
end
return path
Expand Down
25 changes: 25 additions & 0 deletions scripts/test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/sh

set -e

DIR_REPO="$(git rev-parse --show-toplevel)"
export DIR_REPO

DIR_PLENARY="${DIR_REPO}/plenary.nvim"
export DIR_PLENARY

if [ "${#}" -eq 1 ]; then
TEST_NAME="${1}"
elif [ -z "${TEST_NAME}" ]; then
TEST_NAME="tests"
fi
export TEST_NAME

echo "testing: ${TEST_NAME}"

nvim --headless \
--clean \
-u "${DIR_REPO}/tests/minimal_init.lua" \
-l "${DIR_REPO}/tests/test_init.lua" \
-c "qa!"

8 changes: 8 additions & 0 deletions tests/minimal_init.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
-- Prepend these as plenary appends a "." and plenary directory
-- The spawned processes don't specify --clean so contain the full ~/.local runtime path
vim.o.runtimepath = string.format(
"%s,%s,%s",
vim.env.DIR_REPO,
vim.env.DIR_PLENARY,
vim.o.runtimepath
)
9 changes: 9 additions & 0 deletions tests/test_init.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
local test_harness = require("plenary.test_harness")

test_harness.test_directory(
vim.env.TEST_NAME,
{
minimal_init = vim.env.DIR_REPO .. "/tests/minimal_init.lua",
sequential = true,
}
)
30 changes: 30 additions & 0 deletions tests/unit/utils_spec.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---@type Luassert
local assert = require("luassert")
local stub = require("luassert.stub")

local utils = require("nvim-tree.utils")

describe("utils.path_add_trailing", function()
it("trailing added", function()
assert.equals("foo/", utils.path_add_trailing("foo"))
end)

it("trailing already present", function()
assert.equals("foo/", utils.path_add_trailing("foo/"))
end)
end)

describe("utils.canonical_path", function()
before_each(function()
stub(vim.fn, "has")
end)

it("is windows", function()
vim.fn.has.on_call_with("win32unix").returns(1)
assert.equals("C:\\foo\\bar", utils.canonical_path("c:\\foo\\bar"), "should be uppercase drive")
end)

it("not windows", function()
assert.equals("c:\\foo\\bar", utils.canonical_path("c:\\foo\\bar"))
end)
end)
Loading