Put changeset comments in <article> elements

diff --git a/app/views/changesets/show.html.erb b/app/views/changesets/show.html.erb
index 3d9041cab6c9c6b23077c5d02559f07735930218..eb144d332e4459b7467e2f85134e8ada277d54da 100644 (file)
--- a/app/views/changesets/show.html.erb
+++ b/app/views/changesets/show.html.erb
@@ -36,35 +36,31 @@
     <% end %>
   </div>
 
-  <% if @comments.length > 0 %>
-    <ul class="list-unstyled">
-      <% @comments.each do |comment| %>
-        <% next unless comment.visible || current_user&.moderator? %>
-        <li id="c<%= comment.id %>">
-          <small class='text-body-secondary'>
-            <%= comment_by_options = { :time_ago => friendly_date_ago(comment.created_at),
-                                       :user => link_to(comment.author.display_name, comment.author) }
-                comment.visible ? t(".comment_by_html", **comment_by_options) : t(".hidden_comment_by_html", **comment_by_options) %>
-            <% if current_user&.moderator? %>
-              —
-              <%= tag.button t(".#{comment.visible ? 'hide' : 'unhide'}_comment"),
-                             :class => "btn btn-sm small btn-link link-secondary p-0 align-baseline",
-                             :data => { :method => comment.visible ? "DELETE" : "POST",
-                                        :url => api_changeset_comment_visibility_path(comment) } %>
-            <% end %>
-            <a href="#c<%= comment.id %>">
-              <svg width="16" height="16" fill="currentColor">
-                <path d="M4.715 6.542 3.343 7.914a3 3 0 1 0 4.243 4.243l1.828-1.829A3 3 0 0 0 8.586 5.5L8 6.086a1 1 0 0 0-.154.199 2 2 0 0 1 .861 3.337L6.88 11.45a2 2 0 1 1-2.83-2.83l.793-.792a4 4 0 0 1-.128-1.287z" />
-                <path d="M6.586 4.672A3 3 0 0 0 7.414 9.5l.775-.776a2 2 0 0 1-.896-3.346L9.12 3.55a2 2 0 1 1 2.83 2.83l-.793.792c.112.42.155.855.128 1.287l1.372-1.372a3 3 0 1 0-4.243-4.243z" />
-              </svg>
-            </a>
-          </small>
-          <div class="mx-2">
-            <%= comment.body.to_html %>
-          </div>
-        </li>
-      <% end %>
-    </ul>
+  <% @comments.each do |comment| %>
+    <% next unless comment.visible || current_user&.moderator? %>
+    <article id="c<%= comment.id %>">
+      <small class='text-body-secondary'>
+        <%= comment_by_options = { :time_ago => friendly_date_ago(comment.created_at),
+                                   :user => link_to(comment.author.display_name, comment.author) }
+            comment.visible ? t(".comment_by_html", **comment_by_options) : t(".hidden_comment_by_html", **comment_by_options) %>
+        <% if current_user&.moderator? %>
+          —
+          <%= tag.button t(".#{comment.visible ? 'hide' : 'unhide'}_comment"),
+                         :class => "btn btn-sm small btn-link link-secondary p-0 align-baseline",
+                         :data => { :method => comment.visible ? "DELETE" : "POST",
+                                    :url => api_changeset_comment_visibility_path(comment) } %>
+        <% end %>
+        <a href="#c<%= comment.id %>">
+          <svg width="16" height="16" fill="currentColor">
+            <path d="M4.715 6.542 3.343 7.914a3 3 0 1 0 4.243 4.243l1.828-1.829A3 3 0 0 0 8.586 5.5L8 6.086a1 1 0 0 0-.154.199 2 2 0 0 1 .861 3.337L6.88 11.45a2 2 0 1 1-2.83-2.83l.793-.792a4 4 0 0 1-.128-1.287z" />
+            <path d="M6.586 4.672A3 3 0 0 0 7.414 9.5l.775-.776a2 2 0 0 1-.896-3.346L9.12 3.55a2 2 0 1 1 2.83 2.83l-.793.792c.112.42.155.855.128 1.287l1.372-1.372a3 3 0 1 0-4.243-4.243z" />
+          </svg>
+        </a>
+      </small>
+      <div class="mx-2">
+        <%= comment.body.to_html %>
+      </div>
+    </article>
   <% end %>
 
   <% unless current_user %>

diff --git a/test/controllers/changesets_controller_test.rb b/test/controllers/changesets_controller_test.rb
index 452084951105492536e344cf21e6247aeacc2f24..0f9c4b8ce72cb88b2bf3792b57eb9c17bccd9eb9 100644 (file)
--- a/test/controllers/changesets_controller_test.rb
+++ b/test/controllers/changesets_controller_test.rb
@@ -279,7 +279,7 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
     sidebar_browse_check :changeset_path, changeset.id, "changesets/show"
     assert_dom "h2", :text => "Changeset: #{changeset.id}"
     assert_dom "p", :text => "tested-changeset-comment"
-    assert_dom "li#c#{changeset_comment.id}" do
+    assert_dom "article#c#{changeset_comment.id}" do
       assert_dom "> small", :text => /^Comment from #{commenting_user.display_name}/
       assert_dom "a[href='#{user_path(commenting_user)}']"
     end