Skip to content

Commit a510e4a

Browse files
committed
Don't check for inclusion when running tr/tn
1 parent 237d588 commit a510e4a

File tree

2 files changed

+19
-17
lines changed

2 files changed

+19
-17
lines changed

lua/clojure-test/api/init.lua

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,34 +23,45 @@ end
2323
function M.run_tests()
2424
nio.run(function()
2525
local current_test = location.get_test_at_cursor()
26-
local tests = tests_api.select_tests(current_test)
26+
27+
local tests
28+
if current_test then
29+
tests = { current_test }
30+
else
31+
tests = tests_api.select_tests()
32+
end
33+
2734
if #tests == 0 then
2835
return
2936
end
37+
3038
M.state.previous = tests
3139
run_api.run_tests(tests)
3240
end)
3341
end
3442

3543
function M.run_tests_in_ns()
3644
nio.run(function()
45+
local namespaces
3746
local current_namespace = location.get_current_namespace()
38-
39-
local namespaces = tests_api.select_namespaces(current_namespace)
40-
if #namespaces == 0 then
41-
return
47+
if current_namespace then
48+
namespaces = { current_namespace }
49+
else
50+
namespaces = tests_api.select_namespaces()
4251
end
52+
4353
local tests = {}
4454
for _, namespace in ipairs(namespaces) do
45-
print(namespace)
4655
local ns_tests = tests_api.get_tests_in_ns(namespace)
4756
for _, test in ipairs(ns_tests) do
4857
table.insert(tests, test)
4958
end
5059
end
60+
5161
if #tests == 0 then
5262
return
5363
end
64+
5465
M.state.previous = tests
5566
run_api.run_tests(tests)
5667
end)

lua/clojure-test/api/tests.lua

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
local eval = require("clojure-test.api.eval")
2-
local utils = require("clojure-test.utils")
32
local nio = require("nio")
43

54
local select = nio.wrap(function(choices, opts, cb)
@@ -22,30 +21,22 @@ function M.get_all_tests()
2221
return tests
2322
end
2423

25-
function M.select_tests(current_test)
24+
function M.select_tests()
2625
local tests = M.get_all_tests()
2726

28-
if current_test and utils.included_in_table(tests, current_test) then
29-
return { current_test }
30-
end
31-
3227
local test = select(tests, { prompt = "Select test" })
3328
if not test then
3429
return {}
3530
end
3631
return { test }
3732
end
3833

39-
function M.select_namespaces(current_namespace)
34+
function M.select_namespaces()
4035
local namespaces = eval.eval(eval.API.get_test_namespaces)
4136
if not namespaces then
4237
return {}
4338
end
4439

45-
if current_namespace and utils.included_in_table(namespaces, current_namespace) then
46-
return { current_namespace }
47-
end
48-
4940
local namespace = select(namespaces, { prompt = "Select namespace" })
5041
if not namespace then
5142
return {}

0 commit comments

Comments
 (0)