Merge branch 'rz_fix_milestone_count' into 'master'

Fixing count on Milestones

Closes #50848

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

4 files changed, 49 insertions, 38 deletions

diff --git a/spec/controllers/dashboard/milestones_controller_spec.rb b/spec/controllers/dashboard/milestones_controller_spec.rb
index 56047c0c8d2..278b980b6d8 100644
--- a/spec/controllers/dashboard/milestones_controller_spec.rb
+++ b/spec/controllers/dashboard/milestones_controller_spec.rb
@@ -45,6 +45,8 @@ describe Dashboard::MilestonesController do
   end
 
   describe "#index" do
+    render_views
+
     it 'returns group and project milestones to which the user belongs' do
       get :index, format: :json
 
@@ -53,5 +55,12 @@ describe Dashboard::MilestonesController do
       expect(json_response.map { |i| i["first_milestone"]["id"] }).to match_array([group_milestone.id, project_milestone.id])
       expect(json_response.map { |i| i["group_name"] }.compact).to match_array(group.name)
     end
+
+    it 'should contain 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("Closed\n<span class=\"badge badge-pill\">0</span>")
+    end
   end
 end
diff --git a/spec/features/groups/milestone_spec.rb b/spec/features/groups/milestone_spec.rb
index e8ca6a6714f..174840794ed 100644
--- a/spec/features/groups/milestone_spec.rb
+++ b/spec/features/groups/milestone_spec.rb
@@ -95,9 +95,9 @@ describe 'Group milestones' do
       end
 
       it 'counts milestones correctly' do
-        expect(find('.top-area .active .badge').text).to eq("2")
-        expect(find('.top-area .closed .badge').text).to eq("2")
-        expect(find('.top-area .all .badge').text).to eq("4")
+        expect(find('.top-area .active .badge').text).to eq("3")
+        expect(find('.top-area .closed .badge').text).to eq("3")
+        expect(find('.top-area .all .badge').text).to eq("6")
       end
 
       it 'lists legacy group milestones and group milestones' do
diff --git a/spec/models/global_milestone_spec.rb b/spec/models/global_milestone_spec.rb
index ab58f5c5021..b6355455c1d 100644
--- a/spec/models/global_milestone_spec.rb
+++ b/spec/models/global_milestone_spec.rb
@@ -92,41 +92,6 @@ describe GlobalMilestone do
     end
   end
 
-  describe '.states_count' do
-    context 'when the projects have milestones' do
-      before do
-        create(:closed_milestone, title: 'Active Group Milestone', project: project3)
-        create(:active_milestone, title: 'Active Group Milestone', project: project1)
-        create(:active_milestone, title: 'Active Group Milestone', project: project2)
-        create(:closed_milestone, title: 'Closed Group Milestone', project: project1)
-        create(:closed_milestone, title: 'Closed Group Milestone', project: project2)
-        create(:closed_milestone, title: 'Closed Group Milestone', project: project3)
-      end
-
-      it 'returns the quantity of global milestones in each possible state' do
-        expected_count = { opened: 1, closed: 2, all: 2 }
-
-        count = described_class.states_count(Project.all)
-
-        expect(count).to eq(expected_count)
-      end
-    end
-
-    context 'when the projects do not have milestones' do
-      before do
-        project1
-      end
-
-      it 'returns 0 as the quantity of global milestones in each state' do
-        expected_count = { opened: 0, closed: 0, all: 0 }
-
-        count = described_class.states_count(Project.all)
-
-        expect(count).to eq(expected_count)
-      end
-    end
-  end
-
   describe '#initialize' do
     let(:milestone1_project1) { create(:milestone, title: "Milestone v1.2", project: project1) }
     let(:milestone1_project2) { create(:milestone, title: "Milestone v1.2", project: project2) }
diff --git a/spec/models/milestone_spec.rb b/spec/models/milestone_spec.rb
index 27d4e622710..d11eb46159e 100644
--- a/spec/models/milestone_spec.rb
+++ b/spec/models/milestone_spec.rb
@@ -348,4 +348,41 @@ describe Milestone do
       end
     end
   end
+
+  describe '.states_count' do
+    context 'when the projects have milestones' do
+      before do
+        project_1 = create(:project)
+        project_2 = create(:project)
+        group_1 = create(:group)
+        group_2 = create(:group)
+
+        create(:active_milestone, title: 'Active Group Milestone', project: project_1)
+        create(:closed_milestone, title: 'Closed Group Milestone', project: project_1)
+        create(:active_milestone, title: 'Active Group Milestone', project: project_2)
+        create(:closed_milestone, title: 'Closed Group Milestone', project: project_2)
+        create(:closed_milestone, title: 'Active Group Milestone', group: group_1)
+        create(:closed_milestone, title: 'Closed Group Milestone', group: group_1)
+        create(:closed_milestone, title: 'Active Group Milestone', group: group_2)
+        create(:closed_milestone, title: 'Closed Group Milestone', group: group_2)
+      end
+
+      it 'returns the quantity of milestones in each possible state' do
+        expected_count = { opened: 5, closed: 6, all: 11 }
+
+        count = described_class.states_count(Project.all, Group.all)
+        expect(count).to eq(expected_count)
+      end
+    end
+
+    context 'when the projects do not have milestones' do
+      it 'returns 0 as the quantity of global milestones in each state' do
+        expected_count = { opened: 0, closed: 0, all: 0 }
+
+        count = described_class.states_count([project])
+
+        expect(count).to eq(expected_count)
+      end
+    end
+  end
 end