Merge branch '56332-exclude-public-group-milestones-from-count' into 'master'

Exclude public group milestones from counts in milestones dashboard

Closes #56332

See merge request gitlab-org/gitlab-ce!25230

(cherry picked from commit bd488bc2)

0f0bf2a2 Exclude public group milestones from counts

app/controllers/dashboard/milestones_controller.rb

@@ -25,8 +25,6 @@ class Dashboard::MilestonesController < Dashboard::ApplicationController
   private
   def group_milestones
-    groups = GroupsFinder.new(current_user, all_available: false).execute
-
     DashboardGroupMilestone.build_collection(groups, params)
   end
@@ -45,6 +43,6 @@ class Dashboard::MilestonesController < Dashboard::ApplicationController
   end
   def groups
-    @groups ||= GroupsFinder.new(current_user, state_all: true).execute
+    @groups ||= GroupsFinder.new(current_user, all_available: false).execute
   end
 end

changelogs/unreleased/56332-exclude-public-group-milestones-from-count.yml

+---
+title: Fix counts in milestones dashboard
+merge_request: 25230
+author:
+type: fixed

spec/controllers/dashboard/milestones_controller_spec.rb

@@ -3,11 +3,9 @@ require 'spec_helper'
 describe Dashboard::MilestonesController do
   let(:project) { create(:project) }
   let(:group) { create(:group) }
-  let(:public_group) { create(:group, :public) }
   let(:user) { create(:user) }
   let(:project_milestone) { create(:milestone, project: project) }
   let(:group_milestone) { create(:milestone, group: group) }
-  let!(:public_milestone) { create(:milestone, group: public_group) }
   let(:milestone) do
     DashboardMilestone.build(
       [project],
@@ -45,6 +43,9 @@ describe Dashboard::MilestonesController do
   end
   describe "#index" do
+    let(:public_group) { create(:group, :public) }
+    let!(:public_milestone) { create(:milestone, group: public_group) }
+
     render_views
     it 'returns group and project milestones to which the user belongs' do
@@ -74,10 +75,10 @@ describe Dashboard::MilestonesController do
       expect(response.body).not_to include(project_milestone.title)
     end
-    it 'should contain group and project milestones to which the user belongs to' do
+    it 'should show counts of group and project milestones to which the user belongs to' do
       get :index
-      expect(response.body).to include("Open\n<span class=\"badge badge-pill\">3</span>")
+      expect(response.body).to include("Open\n<span class=\"badge badge-pill\">2</span>")
       expect(response.body).to include("Closed\n<span class=\"badge badge-pill\">0</span>")
     end
   end