Correctly use the project filter when marking all notifications as read

opf · Aug 12, 2024 · 3ee1834 · 3ee1834
1 parent 70141f2
commit 3ee1834
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb
@@ -82,7 +82,7 @@ def filtered_query
     case params[:filter]
     when "project"
       id = params[:name].to_i
-      query.where(:project, "=", [id])
+      query.where(:project_id, "=", [id])
     when "reason"
       query.where(:reason, "=", [params[:name]])
     end

diff --git a/spec/features/notifications/notification_center/notification_center_spec.rb b/spec/features/notifications/notification_center/notification_center_spec.rb
@@ -102,8 +102,13 @@
     context "with more the 100 notifications" do
       let(:notifications) do
         attributes = { recipient:, project: project1, resource: work_package }
+        attributes_project2 = { recipient:, project: project2, resource: work_package2 }
+
+        # rubocop:disable FactoryBot/ExcessiveCreateList
         create_list(:notification, 100, attributes.merge(reason: :mentioned)) +
-        create_list(:notification, 105, attributes.merge(reason: :watched))
+        create_list(:notification, 105, attributes.merge(reason: :watched)) +
+        create_list(:notification, 50, attributes_project2.merge(reason: :assigned))
+        # rubocop:enable FactoryBot/ExcessiveCreateList
       end
 
       it "can dismiss all notifications of the currently selected filter" do
@@ -112,8 +117,8 @@
         center.expect_bell_count "99+"
         center.open
 
-        # side menu items show full count of notifications (inbox has one more due to the "Created" notification)
-        side_menu.expect_item_with_count "Inbox", 206
+        # side menu items show full count of notifications (inbox has two more due to the "Created" notification)
+        side_menu.expect_item_with_count "Inbox", 257
         side_menu.expect_item_with_count "Mentioned", 100
         side_menu.expect_item_with_count "Watcher", 105
 
@@ -124,10 +129,21 @@
         wait_for_network_idle
 
         center.expect_bell_count "99+"
-        side_menu.expect_item_with_count "Inbox", 101
+        side_menu.expect_item_with_count "Inbox", 152
         side_menu.expect_item_with_count "Mentioned", 100
         side_menu.expect_item_with_no_count "Watcher"
 
+        # select a project and mark all as read
+        side_menu.click_item project2.name
+        side_menu.finished_loading
+        center.mark_all_read
+        wait_for_network_idle
+
+        center.expect_bell_count "99+"
+        side_menu.expect_item_with_count "Inbox", 101
+        side_menu.expect_item_with_count "Mentioned", 100
+        side_menu.expect_no_item project2.name
+
         # select inbox and mark all as read
         side_menu.click_item "Inbox"
         side_menu.finished_loading