Skip to content
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

Match top-level tests as well #749

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion busted/modules/filter_loader.lua
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ return function()
if not (options.suppressPending and status == 'pending') then
local fullname = getFullName()
local trace = element.trace
if trace and trace.what == 'Lua' then
if trace and (trace.what == 'Lua' or trace.what == 'main') then
fullname = trace.short_src .. ':' .. trace.currentline .. ': ' .. fullname
end
print(fullname)
Expand Down
3 changes: 3 additions & 0 deletions spec/cl_list.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
-- supporting testfile; belongs to 'cl_spec.lua'

it('top-level test', function()
end)

describe('Tests list', function()
it('test 1', function()
end)
Expand Down
14 changes: 8 additions & 6 deletions spec/cl_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -183,17 +183,19 @@ describe('Tests the busted command-line options', function()

it('tests running with -l specified', function()
local _, _, result = executeBusted('-l --pattern=cl_list.lua$')
local expected = 'spec/cl_list.lua:4: Tests list test 1\n' ..
'spec/cl_list.lua:7: Tests list test 2\n' ..
'spec/cl_list.lua:10: Tests list test 3\n'
local expected = 'spec/cl_list.lua:3: top-level test\n' ..
'spec/cl_list.lua:7: Tests list test 1\n' ..
'spec/cl_list.lua:10: Tests list test 2\n' ..
'spec/cl_list.lua:13: Tests list test 3\n'
assert.is_equal(normpath(expected), result)
end)

it('tests running with --list specified', function()
local _, _, result = executeBusted('--list --pattern=cl_list.lua$')
local expected = 'spec/cl_list.lua:4: Tests list test 1\n' ..
'spec/cl_list.lua:7: Tests list test 2\n' ..
'spec/cl_list.lua:10: Tests list test 3\n'
local expected = 'spec/cl_list.lua:3: top-level test\n' ..
'spec/cl_list.lua:7: Tests list test 1\n' ..
'spec/cl_list.lua:10: Tests list test 2\n' ..
'spec/cl_list.lua:13: Tests list test 3\n'
assert.is_equal(normpath(expected), result)
end)

Expand Down