From 564f209800be2dab886c21d370b1d3f95ad1ca8b Mon Sep 17 00:00:00 2001 From: Reinier Balt Date: Tue, 8 Feb 2011 23:03:05 +0100 Subject: [PATCH] fix #1062. I did not test is, so please reopen ticket if it does not work :-) --- app/helpers/todos_helper.rb | 2 +- test/integration/feed_smoke_test.rb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb index 2f61bf80..b2ef5772 100644 --- a/app/helpers/todos_helper.rb +++ b/app/helpers/todos_helper.rb @@ -275,7 +275,7 @@ module TodosHelper end def format_ical_notes(notes) - unless notes.blank? + unless notes.nil? || notes.blank? split_notes = notes.split(/\n/) joined_notes = split_notes.join("\\n") end diff --git a/test/integration/feed_smoke_test.rb b/test/integration/feed_smoke_test.rb index 2f5bd97d..7de89ba2 100644 --- a/test/integration/feed_smoke_test.rb +++ b/test/integration/feed_smoke_test.rb @@ -115,6 +115,10 @@ class FeedSmokeTest < ActionController::IntegrationTest assert_success "/projects.txt?token=#{ users(:admin_user).token }" end + def test_calendar_ics + assert_success "/calendar.ics?token=#{ users(:admin_user).token }" + end + def test_all_projects_txt_with_hidden_project p = projects(:timemachine) p.hide!