Skip to content

Added suite_field_formatter option and fixed a couple display issues when suite_names = false #6

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.

Sign up for GitHub

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

Open
chiliburger wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Added suite_field_formatter option and fixed a couple display issues when suite_names = false #6

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
219372c
Added suite_field_formatter option to have more control over newlines…
Apr 17, 2014
30c842d
Tuned/fixed formatting when the suite_names option is false.
Apr 17, 2014
72a2e73
Added examples in comments for suite_field_formatter option.
Apr 17, 2014
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
40 changes: 31 additions & 9 deletions lib/minitest/display.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ def options
@options ||= {
:suite_names => true,
:suite_divider => " | ",
:suite_field_formatter => false, # Examples: 1 line output: " | %s", multi-line output: "\n %s"
:suite_time => true,
:color => true,
:wrap_at => 80,
Expand Down Expand Up @@ -213,15 +214,22 @@ def _run_suite(suite, type)
# PATCH
if display.options[:suite_names] && display.printable_suite?(suite)
suite_header ||= suite.to_s
print display.color("\n#{suite_header}#{display.options[:suite_divider]}", :suite)

if display.options[:suite_field_formatter]
print display.color("\n#{suite_header}#{display.options[:suite_field_formatter]}" % '', :suite)
else
print display.color("\n#{suite_header}#{display.options[:suite_divider]}", :suite)
end
end

suite_header_length = suite_header ? suite_header.length : 0
# END

filter = options[:filter] || '/./'
filter = Regexp.new $1 if filter =~ /\/(.*)\//

# PATCH
wrap_at = display.options[:wrap_at] - suite_header.length if suite_header
wrap_at = display.options[:wrap_at] - suite_header_length if suite_header
wrap_count = wrap_at

record_suite_started(suite)
Expand Down Expand Up @@ -258,10 +266,18 @@ def _run_suite(suite, type)

puts if @verbose

wrap_count -= 1
if wrap_count == 0
print "\n#{' ' * suite_header.length}#{display.options[:suite_divider]}"
wrap_count = wrap_at
unless wrap_count.nil?
wrap_count -= 1

if wrap_count == 0
if display.options[:suite_field_formatter]
print display.options[:suite_field_formatter] % ''
else
print "\n#{' ' * suite_header_length}#{display.options[:suite_divider]}"
end

wrap_count = wrap_at
end
end

inst._assertions
Expand All @@ -270,10 +286,16 @@ def _run_suite(suite, type)
total_time = Time.now - full_start_time

record_suite_finished(suite, assertions, total_time)
if assertions.length > 0 && display.options[:suite_time]
print "\n#{' ' * suite_header.length}#{display.options[:suite_divider]}"
print "%.2f s" % total_time

if suite_header && assertions.length > 0 && display.options[:suite_time]
if display.options[:suite_field_formatter]
print display.options[:suite_field_formatter] % ("%.2f s" % total_time)
else
print "\n#{' ' * suite_header_length}#{display.options[:suite_divider]}"
print "%.2f s" % total_time
end
end

return assertions.size, assertions.inject(0) { |sum, n| sum + n }
end

Expand Down