diff --git a/app/views/reports/_distribution.html.erb b/app/views/reports/_distribution.html.erb index 3ff3b12eb3..01422a6563 100644 --- a/app/views/reports/_distribution.html.erb +++ b/app/views/reports/_distribution.html.erb @@ -6,5 +6,5 @@ <% end %>
- <%= distance_of_time_in_words_to_now distribution.created_at %> ago + <%= distance_of_time_in_words_to_now distribution.issued_at %> ago
diff --git a/app/views/reports/_donation.html.erb b/app/views/reports/_donation.html.erb index f7565631b6..32af425d16 100644 --- a/app/views/reports/_donation.html.erb +++ b/app/views/reports/_donation.html.erb @@ -5,5 +5,5 @@ <% end %>
- <%= distance_of_time_in_words_to_now donation.created_at %> ago + <%= distance_of_time_in_words_to_now donation.issued_at %> ago
diff --git a/app/views/reports/_purchase.html.erb b/app/views/reports/_purchase.html.erb index dfa4b79ddb..c85f5bcb80 100644 --- a/app/views/reports/_purchase.html.erb +++ b/app/views/reports/_purchase.html.erb @@ -5,5 +5,5 @@ <% end %>
- <%= distance_of_time_in_words_to_now purchase.created_at %> ago + <%= distance_of_time_in_words_to_now purchase.issued_at %> ago
diff --git a/spec/requests/reports/distributions_summary_requests_spec.rb b/spec/requests/reports/distributions_summary_requests_spec.rb index 260aed326f..06f583429e 100644 --- a/spec/requests/reports/distributions_summary_requests_spec.rb +++ b/spec/requests/reports/distributions_summary_requests_spec.rb @@ -11,6 +11,18 @@ sign_in(user) end + describe "time display" do + let!(:distribution) { create(:distribution, :with_items, issued_at: 2.days.ago) } + + before do + get reports_distributions_summary_path + end + + it "uses issued_at for the relative time display, not created_at" do + expect(response.body).to include("2 days ago") + end + end + context "the index page" do context "without filters" do before do diff --git a/spec/requests/reports/donations_summary_spec.rb b/spec/requests/reports/donations_summary_spec.rb index 75196ac6f8..3fa10edd7b 100644 --- a/spec/requests/reports/donations_summary_spec.rb +++ b/spec/requests/reports/donations_summary_spec.rb @@ -7,6 +7,18 @@ sign_in user end + describe "time display" do + let!(:donation) { create(:donation, :with_items, issued_at: 1.day.ago) } + + before do + get reports_donations_summary_path + end + + it "uses issued_at for the relative time display, not created_at" do + expect(response.body).to include("1 day ago") + end + end + describe "GET #index" do subject do get reports_donations_summary_path(format: response_format) diff --git a/spec/requests/reports/purchases_summary_requests_spec.rb b/spec/requests/reports/purchases_summary_requests_spec.rb index 0e0ff9d89f..b8ff38496d 100644 --- a/spec/requests/reports/purchases_summary_requests_spec.rb +++ b/spec/requests/reports/purchases_summary_requests_spec.rb @@ -7,6 +7,18 @@ sign_in(user) end + describe "time display" do + let!(:purchase) { create(:purchase, :with_items, issued_at: 3.days.ago) } + + before do + get reports_purchases_summary_path + end + + it "uses issued_at for the relative time display, not created_at" do + expect(response.body).to include("3 days ago") + end + end + describe "GET #index" do it "shows a list of recent purchases" do get reports_purchases_summary_path