diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index ff12e0b5..5e243f21 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -76,7 +76,8 @@ def display_builder_state(state) end def format_changeset_log(log) - h(log.strip) if log.present? + log = "" if log.blank? + h(log.strip) end def elapsed_time(build, format = :general) diff --git a/test/unit/application_helper_test.rb b/test/unit/application_helper_test.rb index f02a1bfd..274bfd9a 100644 --- a/test/unit/application_helper_test.rb +++ b/test/unit/application_helper_test.rb @@ -35,6 +35,11 @@ class ApplicationHelperTest < ActionView::TestCase end context "#format_changeset_log" do + test "should render nothing if log is nil" do + @helper.extend(ERB::Util) + assert_equal "", @helper.format_changeset_log(nil) + end + test "should strip html tags" do @helper.extend(ERB::Util) assert_equal "<hr />some changeset<script>alert('bad')</script>",