Skip to content

Commit

Permalink
Pull print out of template.
Browse files Browse the repository at this point in the history
  • Loading branch information
hopsoft committed Nov 14, 2014
1 parent 0793571 commit f4a92e0
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
4 changes: 2 additions & 2 deletions lib/micro_test/formatters/default_printer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions lib/micro_test/formatters/template.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
<%= @context[:file_path] %>:<%= red @context[:line_num] %>

-------------------------------------------------------------
2 changes: 1 addition & 1 deletion lib/micro_test/formatters/views/default/_test_fail.txt.erb
Original file line number Diff line number Diff line change
@@ -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 %>

0 comments on commit f4a92e0

Please sign in to comment.