Merge pull request #17211 from opf/bug/58738-work-package-creation-ev…

…ent-not-displayed-if-aggregation-includes-a-comment Bug/58738 work package creation event not displayed if aggregation includes a comment
opf · Nov 19, 2024 · 2556277 · 2556277
2 parents ad7a414 + 9662d71
commit 2556277
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/app/components/work_packages/activities_tab/journals/item_component.html.erb b/app/components/work_packages/activities_tab/journals/item_component.html.erb
@@ -30,6 +30,16 @@
                                                     classes: "work-packages-activities-tab-journals-item-component--user-name ellipsis hidden-for-mobile") do
                     truncated_user_name(journal.user)
                   end
+                  if journal.initial?
+                      header_start_container.with_column(
+                        mr: 1,
+                        classes: "work-packages-activities-tab-journals-item-component-details--journal-type hidden-for-mobile"
+                      ) do
+                        render(Primer::Beta::Text.new(font_size: :small, color: :subtle, mt: 1)) do
+                          I18n.t("activities.work_packages.activity_tab.created_on")
+                        end
+                      end
+                    end
                   header_start_container.with_column(mr: 1, classes: "hidden-for-mobile") do
                     render(Primer::Beta::Text.new(font_size: :small, color: :subtle, mt: 1)) { format_time(journal.updated_at) }
                   end

diff --git a/spec/features/activities/work_package/activities_spec.rb b/spec/features/activities/work_package/activities_spec.rb
@@ -375,7 +375,7 @@
                                                     version: 2)
 
       # the comment is shown without browser reload
-      wait_for { page }.to have_test_selector("op-journal-notes-body", text: "First comment by member")
+      activity_tab.expect_journal_notes(text: "First comment by member")
 
       # simulate comments made within the polling interval
       create(:work_package_journal, user: member, notes: "Second comment by member", journable: work_package, version: 3)
@@ -393,7 +393,7 @@
       first_journal.update!(notes: "First comment by member updated")
 
       # properly updates the comment when the comment is updated
-      wait(delay: 0.5).for { page }.to have_test_selector("op-journal-notes-body", text: "First comment by member updated")
+      activity_tab.expect_journal_notes(text: "First comment by member updated")
     end
   end
 

diff --git a/spec/support/components/work_packages/activities.rb b/spec/support/components/work_packages/activities.rb
@@ -98,7 +98,7 @@ def expect_no_journal_notes_header(text: nil)
       end
 
       def expect_journal_notes(text: nil)
-        expect(page).to have_test_selector("op-journal-notes-body", text:)
+        expect(page).to have_test_selector("op-journal-notes-body", text:, wait: 10)
       end
 
       def expect_notification_bubble