cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Report deactivates_at as block read date

Browse source
This commit is contained in:
Anton Khorev 2025-01-07 13:19:33 +03:00
parent 1ca2c2837e
commit 3df14c5a40
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/user_blocks_helper.rb
View file

@ -35,7 +35,7 @@ module UserBlocksHelper
else
if block.revoker_id.nil?
if block.deactivates_at > block.ends_at
t("user_blocks.helper.short.read_html", :time => block_short_time_in_past(block.updated_at))
t("user_blocks.helper.short.read_html", :time => block_short_time_in_past(block.deactivates_at))
else
t("user_blocks.helper.short.ended")
end

11
test/helpers/user_blocks_helper_test.rb
View file

@ -58,7 +58,16 @@ class UserBlocksHelperTest < ActionView::TestCase
block.update(:needs_view => false, :deactivates_at => Time.now.utc)
assert_match "read at", block_short_status(block)
read_date = Time.now.utc.to_date.strftime
short_status_dom = Rails::Dom::Testing.html_document.parse(block_short_status(block))
assert_dom short_status_dom, ":root", :text => "read at #{read_date}"
travel 24.hours
block.update(:reason => "updated reason")
short_status_dom = Rails::Dom::Testing.html_document.parse(block_short_status(block))
assert_dom short_status_dom, ":root", :text => "read at #{read_date}"
end
end