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

This commit is contained in:
Tom Hughes 2024-02-25 09:28:48 +00:00
commit 746bfd0a48
7 changed files with 205 additions and 128 deletions

View file

@ -142,20 +142,6 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest
browse_check :changeset_path, changeset.id, "browse/changeset"
end
def test_read_changeset_hidden_comments
changeset = create(:changeset)
create_list(:changeset_comment, 3, :changeset => changeset)
create(:changeset_comment, :visible => false, :changeset => changeset)
browse_check :changeset_path, changeset.id, "browse/changeset"
assert_select "div.changeset-comments ul li", :count => 3
session_for(create(:moderator_user))
browse_check :changeset_path, changeset.id, "browse/changeset"
assert_select "div.changeset-comments ul li", :count => 4
end
def test_read_changeset_element_links
changeset = create(:changeset)
node = create(:node, :with_history, :changeset => changeset)