From f4a92e0662468f026b90b9a3aebe53838f7d6617 Mon Sep 17 00:00:00 2001 From: Nathan Hopkins Date: Fri, 14 Nov 2014 07:28:29 -0700 Subject: [PATCH] Pull print out of template. --- lib/micro_test/formatters/default_printer.rb | 4 ++-- lib/micro_test/formatters/template.rb | 8 ++++---- .../formatters/views/default/_assert_fail.txt.erb | 1 + .../formatters/views/default/_test_fail.txt.erb | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/micro_test/formatters/default_printer.rb b/lib/micro_test/formatters/default_printer.rb index cf02230..f438cdf 100644 --- a/lib/micro_test/formatters/default_printer.rb +++ b/lib/micro_test/formatters/default_printer.rb @@ -15,11 +15,11 @@ def print_with_line(value) end def print_test_pass(test) - Template.new(test, DefaultHelper).render(:_test_pass) + print Template.new(test, DefaultHelper).render(:_test_pass) end def print_test_fail(test) - Template.new(test, DefaultHelper).render(:_test_fail) + print Template.new(test, DefaultHelper).render(:_test_fail) end #def print_assert_fail(assert) diff --git a/lib/micro_test/formatters/template.rb b/lib/micro_test/formatters/template.rb index 5019721..1b30916 100644 --- a/lib/micro_test/formatters/template.rb +++ b/lib/micro_test/formatters/template.rb @@ -14,13 +14,13 @@ def initialize(object, *helpers) def render(name) instance_eval do - print ERB.new(self.class.view(name), nil, ">").result(binding) + ERB.new(self.class.view(name), nil, ">").result(binding) end end - def partial(name, options={}) - return render(name) if options[:collection].nil? - options[:collection].each do |item| + def partial(name, *collection) + return render(name) if collection.empty? + collection.map do |item| Template.new(item).render(name) end end diff --git a/lib/micro_test/formatters/views/default/_assert_fail.txt.erb b/lib/micro_test/formatters/views/default/_assert_fail.txt.erb index 6ac6e90..f2f7f18 100644 --- a/lib/micro_test/formatters/views/default/_assert_fail.txt.erb +++ b/lib/micro_test/formatters/views/default/_assert_fail.txt.erb @@ -1,2 +1,3 @@ <%= @context[:file_path] %>:<%= red @context[:line_num] %> + ------------------------------------------------------------- diff --git a/lib/micro_test/formatters/views/default/_test_fail.txt.erb b/lib/micro_test/formatters/views/default/_test_fail.txt.erb index 221e5cb..e315303 100644 --- a/lib/micro_test/formatters/views/default/_test_fail.txt.erb +++ b/lib/micro_test/formatters/views/default/_test_fail.txt.erb @@ -1,3 +1,3 @@ <%= send duration_color(@context.duration), @context.duration %> <%= red @context.desc %> - <%= partial :_assert_fail, :collection => @context.failed_asserts %> + <%= partial :_assert_fail, *@context.failed_asserts %>