Escape location string. [#65]

marnen · Dec 27, 2011 · 3e36310 · 3e36310
1 parent f0845b4
commit 3e36310
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/app/views/events/ical.ics.erb b/app/views/events/ical.ics.erb
@@ -4,7 +4,7 @@ VERSION:2.0
 BEGIN:VEVENT
 UID:<%= ical_uid @event %>
 SUMMARY:<%= ical_escape @event.name %>
-LOCATION:<%= [@event.street, @event.street2, @event.city, @event.state.code, @event.country.code].compact.join(', ') %>
+LOCATION:<%= ical_escape [@event.street, @event.street2, @event.city, @event.state.code, @event.country.code].compact.join(', ') %>
 DESCRIPTION:<%= ical_escape @event.description %>
 DTSTART;VALUE=DATE:<%= @event.date.to_s :ical %>
 END:VEVENT

diff --git a/spec/views/events/ical.ics.erb_spec.rb b/spec/views/events/ical.ics.erb_spec.rb
@@ -23,7 +23,8 @@
   end
 
   it "should contain the event address as location" do
-    rendered.should have_content("LOCATION:#{[@event.street, @event.street2, @event.city, @event.state.code, @event.country.code].compact.join(', ')}")
+    escaped_location = ical_escape [@event.street, @event.street2, @event.city, @event.state.code, @event.country.code].compact.join(', ')
+    rendered.should have_content("LOCATION:#{escaped_location}")
   end
 
   it "should contain the event description as description" do