Skip to content

Commit b9a481a

Browse files
authored
Fix/5170 reports update issued_at from created_at (#5172)
* fix: distribution report should use issued_at date * fix: donation report should use issued_at date * fix: purchase report should use issued_at date * chore: replace system test with request test * fix: rubocop issues
1 parent eb8453a commit b9a481a

File tree

6 files changed

+39
-3
lines changed

6 files changed

+39
-3
lines changed

app/views/reports/_distribution.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
<% end %>
77
</div>
88
<div class="pull-right">
9-
<%= distance_of_time_in_words_to_now distribution.created_at %> ago
9+
<%= distance_of_time_in_words_to_now distribution.issued_at %> ago
1010
</div>

app/views/reports/_donation.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
<% end %>
66
</div>
77
<div class="pull-right">
8-
<%= distance_of_time_in_words_to_now donation.created_at %> ago
8+
<%= distance_of_time_in_words_to_now donation.issued_at %> ago
99
</div>

app/views/reports/_purchase.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
<% end %>
66
</div>
77
<div class="pull-right">
8-
<%= distance_of_time_in_words_to_now purchase.created_at %> ago
8+
<%= distance_of_time_in_words_to_now purchase.issued_at %> ago
99
</div>

spec/requests/reports/distributions_summary_requests_spec.rb

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,18 @@
1111
sign_in(user)
1212
end
1313

14+
describe "time display" do
15+
let!(:distribution) { create(:distribution, :with_items, issued_at: 2.days.ago) }
16+
17+
before do
18+
get reports_distributions_summary_path
19+
end
20+
21+
it "uses issued_at for the relative time display, not created_at" do
22+
expect(response.body).to include("2 days ago")
23+
end
24+
end
25+
1426
context "the index page" do
1527
context "without filters" do
1628
before do

spec/requests/reports/donations_summary_spec.rb

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,18 @@
77
sign_in user
88
end
99

10+
describe "time display" do
11+
let!(:donation) { create(:donation, :with_items, issued_at: 1.day.ago) }
12+
13+
before do
14+
get reports_donations_summary_path
15+
end
16+
17+
it "uses issued_at for the relative time display, not created_at" do
18+
expect(response.body).to include("1 day ago")
19+
end
20+
end
21+
1022
describe "GET #index" do
1123
subject do
1224
get reports_donations_summary_path(format: response_format)

spec/requests/reports/purchases_summary_requests_spec.rb

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,18 @@
77
sign_in(user)
88
end
99

10+
describe "time display" do
11+
let!(:purchase) { create(:purchase, :with_items, issued_at: 3.days.ago) }
12+
13+
before do
14+
get reports_purchases_summary_path
15+
end
16+
17+
it "uses issued_at for the relative time display, not created_at" do
18+
expect(response.body).to include("3 days ago")
19+
end
20+
end
21+
1022
describe "GET #index" do
1123
it "shows a list of recent purchases" do
1224
get reports_purchases_summary_path

0 commit comments

Comments
 (0)