Put note comments in <article> elements

diff --git a/app/views/notes/show.html.erb b/app/views/notes/show.html.erb
index d0dcdeb1b9417354c01f5e9830011b8d980a876b..b1591dc57265577d08de428a7c3941ed5d7c2bca 100644 (file)
--- a/app/views/notes/show.html.erb
+++ b/app/views/notes/show.html.erb
@@ -52,19 +52,13 @@
     <% end %>
   </div>
 
     <% end %>
   </div>
 

-  <% if @note_comments.length > 0 %>
-    <div class='note-comments'>
-      <ul class="list-unstyled">
-        <% @note_comments.each do |comment| %>
-          <li id="c<%= comment.id %>">
-            <small class='text-body-secondary'><%= note_event(comment.event, comment.created_at, comment.author) %></small>
-            <div class="mx-2">
-              <%= comment.body.to_html %>
-            </div>
-          </li>
-        <% end %>
-      </ul>
-    </div>
+  <% @note_comments.each do |comment| %>
+    <article id="c<%= comment.id %>">
+      <small class='text-body-secondary'><%= note_event(comment.event, comment.created_at, comment.author) %></small>
+      <div class="mx-2">
+        <%= comment.body.to_html %>
+      </div>
+    </article>

   <% end %>
 
   <% if @note.status == "open" %>
   <% end %>
 
   <% if @note.status == "open" %>

diff --git a/test/controllers/notes_controller_test.rb b/test/controllers/notes_controller_test.rb
index 0185c67413141d954b88951e220800e72518ed24..b672a3a3e2aef4de057ab199adf0bc06f8acb4f0 100644 (file)
--- a/test/controllers/notes_controller_test.rb
+++ b/test/controllers/notes_controller_test.rb
@@ -129,12 +129,12 @@ class NotesControllerTest < ActionDispatch::IntegrationTest
     end
 
     sidebar_browse_check :note_path, note_with_hidden_comment.id, "notes/show"
     end
 
     sidebar_browse_check :note_path, note_with_hidden_comment.id, "notes/show"

-    assert_select "div.note-comments ul li", :count => 1
+    assert_dom "article:match('id', ?)", /^c\d+$/, :count => 1

 
     session_for(create(:moderator_user))
 
     sidebar_browse_check :note_path, note_with_hidden_comment.id, "notes/show"
 
     session_for(create(:moderator_user))
 
     sidebar_browse_check :note_path, note_with_hidden_comment.id, "notes/show"

-    assert_select "div.note-comments ul li", :count => 2
+    assert_dom "article:match('id', ?)", /^c\d+$/, :count => 2

   end
 
   def test_read_note_hidden_user_comment
   end
 
   def test_read_note_hidden_user_comment


@@ -144,12 +144,12 @@ class NotesControllerTest < ActionDispatch::IntegrationTest
     end
 
     sidebar_browse_check :note_path, note_with_hidden_user_comment.id, "notes/show"
     end
 
     sidebar_browse_check :note_path, note_with_hidden_user_comment.id, "notes/show"

-    assert_select "div.note-comments ul li", :count => 1
+    assert_dom "article:match('id', ?)", /^c\d+$/, :count => 1

 
     session_for(create(:moderator_user))
 
     sidebar_browse_check :note_path, note_with_hidden_user_comment.id, "notes/show"
 
     session_for(create(:moderator_user))
 
     sidebar_browse_check :note_path, note_with_hidden_user_comment.id, "notes/show"

-    assert_select "div.note-comments ul li", :count => 1
+    assert_dom "article:match('id', ?)", /^c\d+$/, :count => 1

   end
 
   def test_read_note_hidden_opener
   end
 
   def test_read_note_hidden_opener


@@ -158,7 +158,7 @@ class NotesControllerTest < ActionDispatch::IntegrationTest
     create(:note_comment, :author => hidden_user, :note => note_with_hidden_opener)
 
     sidebar_browse_check :note_path, note_with_hidden_opener.id, "notes/show"
     create(:note_comment, :author => hidden_user, :note => note_with_hidden_opener)
 
     sidebar_browse_check :note_path, note_with_hidden_opener.id, "notes/show"

-    assert_select "div.note-comments ul li", :count => 0
+    assert_dom "article:match('id', ?)", /^c\d+$/, :count => 0

   end
 
   def test_read_note_suspended_opener_and_comment
   end
 
   def test_read_note_suspended_opener_and_comment


@@ -167,7 +167,7 @@ class NotesControllerTest < ActionDispatch::IntegrationTest
     create(:note_comment, :note => note, :event => "commented")
 
     sidebar_browse_check :note_path, note.id, "notes/show"
     create(:note_comment, :note => note, :event => "commented")
 
     sidebar_browse_check :note_path, note.id, "notes/show"

-    assert_select "div.note-comments ul li", :count => 1
+    assert_dom "article:match('id', ?)", /^c\d+$/, :count => 1

   end
 
   def test_read_closed_note
   end
 
   def test_read_closed_note


@@ -175,16 +175,16 @@ class NotesControllerTest < ActionDispatch::IntegrationTest
     closed_note = create(:note_with_comments, :closed, :closed_by => user, :comments_count => 2)
 
     sidebar_browse_check :note_path, closed_note.id, "notes/show"
     closed_note = create(:note_with_comments, :closed, :closed_by => user, :comments_count => 2)
 
     sidebar_browse_check :note_path, closed_note.id, "notes/show"

-    assert_select "div.note-comments ul li", :count => 2
-    assert_select "div.details", /Resolved by #{user.display_name}/
+    assert_dom "article:match('id', ?)", /^c\d+$/, :count => 2
+    assert_dom "div.details", /Resolved by #{user.display_name}/

 
     user.soft_destroy!
 
     reset!
 
     sidebar_browse_check :note_path, closed_note.id, "notes/show"
 
     user.soft_destroy!
 
     reset!
 
     sidebar_browse_check :note_path, closed_note.id, "notes/show"

-    assert_select "div.note-comments ul li", :count => 1
-    assert_select "div.details", /Resolved by deleted/
+    assert_dom "article:match('id', ?)", /^c\d+$/, :count => 1
+    assert_dom "div.details", /Resolved by deleted/

   end
 
   def test_new_note_anonymous
   end
 
   def test_new_note_anonymous