- <% future = Time.zone.now < event.start_at %>
+ <% future = !event.over? %>
@@ -94,6 +94,13 @@
<%= event.location %>
+ <% if event.map_url %>
+ <%= link_to "Open in Google Maps",
+ event.map_url,
+ class: "external-link mt-2 text-sm",
+ target: "_blank",
+ rel: "noopener" %>
+ <% end %>
diff --git a/config/application.rb b/config/application.rb
index 008877d..50f3b2b 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -33,7 +33,8 @@ class Application < Rails::Application
# These settings can be overridden in specific environments using the files
# in config/environments, which are processed later.
#
- # config.time_zone = "Central Time (US & Canada)"
+ # Every meetup is in Toronto, so render times there. Storage stays UTC.
+ config.time_zone = 'Eastern Time (US & Canada)'
# config.eager_load_paths << Rails.root.join("extras")
# Don't generate system test files.
diff --git a/test/controllers/admin/events_controller_test.rb b/test/controllers/admin/events_controller_test.rb
index 2e18c8a..8694b3b 100644
--- a/test/controllers/admin/events_controller_test.rb
+++ b/test/controllers/admin/events_controller_test.rb
@@ -38,6 +38,27 @@ def setup
assert response.body.include?(Event.last.name)
end
+ test 'index shows event times in Toronto time, not UTC' do
+ Event.destroy_all
+ # 00:30 UTC is the previous evening in Toronto.
+ Event.create!(
+ start_at: Time.utc(2024, 11, 26, 0, 30),
+ name: 'Late Night Edition',
+ location: 'Some Office',
+ description: 'A talk',
+ status: :published,
+ sponsor: 'Some Sponsor',
+ sponsor_link: 'https://example.com'
+ )
+
+ get admin_events_path
+
+ assert_response :success
+ assert_match 'November 25, 2024', response.body
+ assert_match '7:30 PM', response.body
+ assert_no_match(/November 26, 2024/, response.body)
+ end
+
test 'should show a single event' do
get admin_event_path(Event.first.slug)
diff --git a/test/controllers/events_controller_test.rb b/test/controllers/events_controller_test.rb
index bfd70e1..1e298f0 100644
--- a/test/controllers/events_controller_test.rb
+++ b/test/controllers/events_controller_test.rb
@@ -59,4 +59,58 @@ def setup
assert_response :found
assert_redirected_to all_events_path
end
+
+ test 'links the location to Google Maps' do
+ event = @events.first
+ event.update!(location: "Workplace One\n51 Wolseley St, Toronto ON")
+
+ get :show, params: { slug: event.slug }
+
+ assert_response :success
+ assert_match 'https://www.google.com/maps/search/?api=1&query=Workplace+One%2C+51+Wolseley+St%2C+Toronto+ON',
+ response.body
+ assert_match 'Open in Google Maps', response.body
+ end
+
+ test 'an event still in progress stays on the home page' do
+ create_only_event('In Progress Event', Time.zone.now - 1.hour)
+
+ get :index
+ assert_response :success
+ assert_match 'In Progress Event', response.body
+ assert_match 'Upcoming', response.body
+
+ get :past
+ assert_response :success
+ assert_match 'No past events', response.body
+ end
+
+ test 'an event that has ended moves to past events' do
+ create_only_event('Finished Event', Time.zone.now - (Event::DURATION + 1.minute))
+
+ get :index
+ assert_response :success
+ assert_match "We're planning our next outing", response.body
+
+ get :past
+ assert_response :success
+ assert_match 'Finished Event', response.body
+ assert_match 'Past Event', response.body
+ end
+
+ private
+
+ def create_only_event(name, start_at)
+ Event.destroy_all
+ Event.create!(
+ start_at: start_at,
+ name: name,
+ location: 'Some Office',
+ description: 'A talk',
+ status: :published,
+ rsvp_link: 'https://example.com/rsvp',
+ sponsor: 'Some Sponsor',
+ sponsor_link: 'https://example.com'
+ )
+ end
end
diff --git a/test/models/event_test.rb b/test/models/event_test.rb
new file mode 100644
index 0000000..0fc48e6
--- /dev/null
+++ b/test/models/event_test.rb
@@ -0,0 +1,64 @@
+require 'test_helper'
+
+class EventTest < ActiveSupport::TestCase
+ def build_event(attributes = {})
+ Event.new({
+ name: 'Witty Event Name',
+ location: "Workplace One\n51 Wolseley St, Toronto ON\nLower level, enter through doors on Wolseley St.",
+ description: 'A talk',
+ rsvp_link: 'https://test.com',
+ status: :published,
+ start_at: Time.zone.parse('2024-11-26T00:30Z')
+ }.merge(attributes))
+ end
+
+ test 'end_at is three hours after start_at' do
+ event = build_event(start_at: Time.zone.parse('2024-11-25T19:30-05:00'))
+
+ assert_equal Time.zone.parse('2024-11-25T22:30-05:00'), event.end_at
+ end
+
+ test 'over? flips at the end time, not the start time' do
+ event = build_event(start_at: Time.zone.now - 2.hours)
+ assert_not event.over?
+
+ event.start_at = Time.zone.now - 4.hours
+ assert event.over?
+ end
+
+ test 'map_url builds a Google Maps search from the venue and street address' do
+ event = build_event
+
+ assert_equal 'https://www.google.com/maps/search/?api=1&query=Workplace+One%2C+51+Wolseley+St%2C+Toronto+ON',
+ event.map_url
+ end
+
+ test 'map_url appends the city when the address does not name it' do
+ event = build_event(location: "FinanceIt @ The Well\n8 Spadina Ave\nSuite 2400", city: 'Toronto, Canada')
+
+ assert_equal 'https://www.google.com/maps/search/?api=1&query=FinanceIt+%40+The+Well%2C+8+Spadina+Ave%2C+Toronto%2C+Canada',
+ event.map_url
+ end
+
+ test 'map_url is nil without a location' do
+ assert_nil build_event(location: '').map_url
+ end
+
+ test 'an in-progress event is upcoming, not past' do
+ Event.destroy_all
+ event = build_event(start_at: Time.zone.now - 1.hour)
+ event.save!
+
+ assert_includes Event.upcoming, event
+ assert_not_includes Event.past, event
+ end
+
+ test 'a finished event is past, not upcoming' do
+ Event.destroy_all
+ event = build_event(start_at: Time.zone.now - (Event::DURATION + 1.minute))
+ event.save!
+
+ assert_includes Event.past, event
+ assert_not_includes Event.upcoming, event
+ end
+end