mirror of
https://github.com/pnx/neotest-phpunit
synced 2026-06-17 04:00:03 +02:00
Make this even slicker
This commit is contained in:
parent
6bef79c766
commit
d12585b5b8
2 changed files with 45 additions and 53 deletions
|
|
@ -18,7 +18,7 @@ function NeotestAdapter.root(dir)
|
|||
|
||||
logger.info("Finding root...")
|
||||
|
||||
for _, root_ignore_file in ipairs(config.get_root_ignore_files()) do
|
||||
for _, root_ignore_file in ipairs(config.get("root_ignore_files")) do
|
||||
logger.info("Checking root ignore file", root_ignore_file)
|
||||
|
||||
result = lib.files.match_root_pattern(root_ignore_file)(dir)
|
||||
|
|
@ -29,7 +29,7 @@ function NeotestAdapter.root(dir)
|
|||
end
|
||||
end
|
||||
|
||||
for _, root_file in ipairs(config.get_root_files()) do
|
||||
for _, root_file in ipairs(config.get("root_files")) do
|
||||
logger.info("Checking root file", root_file)
|
||||
|
||||
result = lib.files.match_root_pattern(root_file)(dir)
|
||||
|
|
@ -83,10 +83,6 @@ function NeotestAdapter.discover_positions(path)
|
|||
})
|
||||
end
|
||||
|
||||
local is_callable = function(obj)
|
||||
return type(obj) == "function" or (type(obj) == "table" and obj.__call)
|
||||
end
|
||||
|
||||
---@param args neotest.RunArgs
|
||||
---@return neotest.RunSpec | nil
|
||||
function NeotestAdapter.build_spec(args)
|
||||
|
|
@ -164,44 +160,9 @@ end
|
|||
setmetatable(NeotestAdapter, {
|
||||
__call = function(_, opts)
|
||||
logger.info("Initializing opts")
|
||||
if is_callable(opts.pest_cmd) then
|
||||
config.get_pest_cmd = opts.pest_cmd
|
||||
elseif opts.pest_cmd then
|
||||
config.get_pest_cmd = function()
|
||||
return opts.pest_cmd
|
||||
end
|
||||
end
|
||||
if is_callable(opts.root_ignore_files) then
|
||||
config.get_root_ignore_files = opts.root_ignore_files
|
||||
elseif opts.root_ignore_files then
|
||||
config.get_root_ignore_files = function()
|
||||
return opts.root_ignore_files
|
||||
end
|
||||
end
|
||||
if is_callable(opts.root_files) then
|
||||
config.get_root_files = opts.root_files
|
||||
elseif opts.root_files then
|
||||
config.get_root_files = function()
|
||||
return opts.root_files
|
||||
end
|
||||
end
|
||||
if is_callable(opts.filter_dirs) then
|
||||
config.get_filter_dirs = opts.filter_dirs
|
||||
elseif opts.filter_dirs then
|
||||
config.get_filter_dirs = function()
|
||||
return opts.filter_dirs
|
||||
end
|
||||
end
|
||||
if is_callable(opts.env) then
|
||||
config.get_env = opts.env
|
||||
elseif type(opts.env) == "table" then
|
||||
config.get_env = function()
|
||||
return opts.env
|
||||
end
|
||||
end
|
||||
if type(opts.dap) == "table" then
|
||||
dap_configuration = opts.dap
|
||||
end
|
||||
|
||||
config.opts = opts or {}
|
||||
|
||||
return NeotestAdapter
|
||||
end,
|
||||
})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue