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

Merge remote-tracking branch 'upstream/pull/5371'

Browse source
This commit is contained in:
Tom Hughes 2024-12-03 18:33:38 +00:00
commit 10bd646d40
2 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/changesets_helper.rb
View file

@ -3,7 +3,7 @@ module ChangesetsHelper
if changeset.user.status == "deleted"
t("users.no_such_user.deleted")
elsif changeset.user.data_public?
link_to changeset.user.display_name, changeset.user
link_to changeset.user.display_name, changeset.user, :class => "mw-100 d-inline-block align-bottom text-truncate text-wrap", :dir => "auto"
else
t("browse.anonymous")
end

28
test/helpers/changesets_helper_test.rb
View file

@ -3,7 +3,10 @@ require "test_helper"
class ChangesetsHelperTest < ActionView::TestCase
def test_changeset_user_link
changeset = create(:changeset)
assert_equal %(<a href="/user/#{ERB::Util.u(changeset.user.display_name)}">#{changeset.user.display_name}</a>), changeset_user_link(changeset)
changeset_user_link_dom = Rails::Dom::Testing.html_document_fragment.parse changeset_user_link(changeset)
assert_dom changeset_user_link_dom, "a:root", :text => changeset.user.display_name do
assert_dom "> @href", "/user/#{ERB::Util.u(changeset.user.display_name)}"
end
changeset = create(:changeset, :user => create(:user, :data_public => false))
assert_equal "anonymous", changeset_user_link(changeset)
@ -16,12 +19,25 @@ class ChangesetsHelperTest < ActionView::TestCase
changeset = create(:changeset, :created_at => Time.utc(2007, 1, 1, 0, 0, 0), :user => create(:user, :data_public => false))
# We need to explicitly reset the closed_at to some point in the future, and avoid the before_save callback
changeset.update_column(:closed_at, Time.now.utc + 1.day) # rubocop:disable Rails/SkipsModelValidations
assert_match %r{^Created <time title="Mon, 01 Jan 2007 00:00:00 \+0000" datetime="2007-01-01T00:00:00Z">.*</time> by anonymous$}, changeset_details(changeset)
changeset_details_dom = Rails::Dom::Testing.html_document_fragment.parse "<div>#{changeset_details(changeset)}</div>"
assert_dom changeset_details_dom, ":root", :text => /^Created .* by anonymous$/ do
assert_dom "> time", :count => 1 do
assert_dom "> @title", "Mon, 01 Jan 2007 00:00:00 +0000"
assert_dom "> @datetime", "2007-01-01T00:00:00Z"
end
assert_dom "> a", :count => 0
end
changeset = create(:changeset, :created_at => Time.utc(2007, 1, 1, 0, 0, 0), :closed_at => Time.utc(2007, 1, 2, 0, 0, 0))
user_link = %(<a href="/user/#{ERB::Util.u(changeset.user.display_name)}">#{changeset.user.display_name}</a>)
assert_match %r{^Closed <time title="Created: Mon, 01 Jan 2007 00:00:00 \+0000&#10;Closed: Tue, 02 Jan 2007 00:00:00 \+0000" datetime="2007-01-02T00:00:00Z">.*</time> by #{user_link}$}, changeset_details(changeset)
changeset_details_dom = Rails::Dom::Testing.html_document_fragment.parse "<div>#{changeset_details(changeset)}</div>"
assert_dom changeset_details_dom, ":root", :text => /^Closed .* by #{changeset.user.display_name}$/ do
assert_dom "> time", :count => 1 do
assert_dom "> @title", "Created: Mon, 01 Jan 2007 00:00:00 +0000\nClosed: Tue, 02 Jan 2007 00:00:00 +0000"
assert_dom "> @datetime", "2007-01-02T00:00:00Z"
end
assert_dom "> a", :count => 1, :text => changeset.user.display_name do
assert_dom "> @href", "/user/#{ERB::Util.u(changeset.user.display_name)}"
end
end
end
end