Adjust decorator so we don't need to call html_safe anymore to appease rubocop

Author: maebeale

app/decorators/event_decorator.rb

@@ -82,37 +82,41 @@ def times(display_day: false, display_date: false)
       t
     end
 
+    parts_for = lambda do |d, prefix: nil|
+      parts = []
+      parts << prefix if prefix
+      parts << "#{day.call(d)}, " if display_day
+      parts << "#{date.call(d)} @ " if display_date
+      parts << format_time.call(d)
+      parts.join
+    end
+
     # --------------------------------------------------
     # DIFFERENT DAY → two lines
     # --------------------------------------------------
     if s.to_date != e.to_date
-      line1 = "Start: "
-      line1 << "#{day.call(s)}, " if display_day
-      line1 << "#{date.call(s)} @ " if display_date
-      line1 << format_time.call(s)
-
-      line2 = "End: "
-      line2 << "#{day.call(e)}, " if display_day
-      line2 << "#{date.call(e)} @ " if display_date
-      line2 << format_time.call(e)
-
-      return "#{line1}<br>#{line2}"
+      return h.safe_join(
+        [
+          parts_for.call(s, prefix: "Start: "),
+          parts_for.call(e, prefix: "End: ")
+        ],
+        h.tag.br
+      )
     end
 
     # --------------------------------------------------
     # SAME DAY → one line unless times differ
     # --------------------------------------------------
     same_exact_time = (s.hour == e.hour) && (s.min == e.min)
 
-    line = ""
-    line << "#{day.call(s)}, " if display_day
-    line << "#{date.call(s)} @ " if display_date
+    parts = []
+    parts << "#{day.call(s)}, " if display_day
+    parts << "#{date.call(s)} @ " if display_date
 
     if same_exact_time
       # Only one time
-      line << format_time.call(s)
+      parts << format_time.call(s)
     else
-      # Start time
       s_hour = s.strftime("%-l")
       s_min  = s.strftime("%M")
       s_ampm = s.strftime("%P")
@@ -121,24 +125,24 @@ def times(display_day: false, display_date: false)
       e_min  = e.strftime("%M")
       e_ampm = e.strftime("%P")
 
-      hide_start_min = (s_min == "00")
-      hide_end_min   = (e_min == "00")
+      hide_start_min  = (s_min == "00")
+      hide_end_min    = (e_min == "00")
       hide_start_ampm = (s_ampm == e_ampm)
 
       # Start
-      line << s_hour
-      line << ":#{s_min}" unless hide_start_min
-      line << " #{s_ampm}" unless hide_start_ampm
-
-      line << " - "
+      start_time = s_hour.dup
+      start_time << ":#{s_min}" unless hide_start_min
+      start_time << " #{s_ampm}" unless hide_start_ampm
 
       # End
-      line << e_hour
-      line << ":#{e_min}" unless hide_end_min
-      line << " #{e_ampm}"
+      end_time = e_hour.dup
+      end_time << ":#{e_min}" unless hide_end_min
+      end_time << " #{e_ampm}"
+
+      parts << "#{start_time} - #{end_time}"
     end
 
-    line
+    h.safe_join(parts)
   end
 
   def breadcrumbs

app/views/event_registrations/show.html.erb

@@ -60,7 +60,7 @@
           <div>
             <p class="text-gray-500 uppercase tracking-wide text-xs">Date</p>
             <p class="font-medium text-gray-900">
-              <%= @event_registration.event.decorate.times(display_day: true, display_date: true).html_safe %>
+              <%= @event_registration.event.decorate.times(display_day: true, display_date: true) %>
             </p>
           </div>
 

spec/system/events_show_spec.rb

@@ -17,8 +17,13 @@
       # Title (uses title_with_badges)
       expect(page).to have_css("div.my-3", text: "My Event")
 
-      # Times
-      expect(page).to have_text(event.times(display_day: true, display_date: true))
+      # Times block exists
+      expect(page).to have_text("Start:")
+      expect(page).to have_text("End:")
+
+      # Day + month appear (stable, user-facing)
+      expect(page).to have_text(event.start_date.strftime("%b"))
+      expect(page).to have_text(event.end_date.strftime("%b"))
 
       # Description
       expect(page).to have_css("p.text-gray-900", text: event.description)