Merge branch '9579-burndown-chart-number-of-open-issues-do-not-match-open-issues' into 'master'

Resolve "Burndown Chart: Number of open issues do not match open issues"

Closes #9579

See merge request gitlab-org/gitlab-ee!13287

ee/spec/requests/api/group_milestones_spec.rb

@@ -9,12 +9,12 @@ describe API::GroupMilestones do
   let!(:group_member) { create(:group_member, group: group, user: user) }
   let!(:closed_milestone) { create(:closed_milestone, group: group, title: 'version1', description: 'closed milestone') }
   let!(:milestone) { create(:milestone, group: group, title: 'version2', description: 'open milestone', start_date: Date.today, due_date: Date.today + 3.days) }
-  let(:issue) { create(:issue, created_at: Date.today.beginning_of_day, weight: 2, project: project) }
+  let!(:issue1) { create(:issue, created_at: Date.today.beginning_of_day, weight: 2, project: project, milestone: milestone) }
+  let!(:issue2) { create(:issue, created_at: Date.today.middle_of_day, weight: 5, project: project, milestone: milestone) }
   let(:issues_route) { "/groups/#{group.id}/milestones/#{milestone.id}/issues" }
 
   before do
     project.add_developer(user)
-    milestone.issues << issue
   end
 
   it 'matches V4 EE-specific  response schema for a list of issues' do

ee/spec/requests/api/project_milestones_spec.rb

@@ -6,12 +6,12 @@ describe API::ProjectMilestones do
   let(:user) { create(:user) }
   let!(:project) { create(:project, namespace: user.namespace ) }
   let!(:milestone) { create(:milestone, project: project, title: 'version2', description: 'open milestone', start_date: Date.today, due_date: Date.today + 3.days) }
-  let(:issue) { create(:issue, created_at: Date.today.beginning_of_day, weight: 2, project: project) }
+  let!(:issue1) { create(:issue, created_at: Date.today.beginning_of_day, weight: 2, project: project, milestone: milestone) }
+  let!(:issue2) { create(:issue, created_at: Date.today.middle_of_day, weight: 5, project: project, milestone: milestone) }
   let(:issues_route) { "/projects/#{project.id}/milestones/#{milestone.id}/issues" }
 
   before do
     project.add_developer(user)
-    milestone.issues << issue
   end
 
   it 'matches V4 EE-specific response schema for a list of issues' do

ee/spec/support/shared_examples/milestone_burndown_shared_examples.rb

@@ -9,9 +9,12 @@ shared_examples_for 'group and project milestone burndowns' do |route_definition
 
       expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
-      expect(json_response.first['created_at'].to_time).to eq(Date.today.beginning_of_day)
-      expect(json_response.first['weight']).to eq(2)
+      expect(json_response.first['created_at'].to_time).to eq(Date.today.middle_of_day)
+      expect(json_response.first['weight']).to eq(5)
       expect(json_response.first['action']).to eq('created')
+      expect(json_response.last['created_at'].to_time).to eq(Date.today.beginning_of_day)
+      expect(json_response.last['weight']).to eq(2)
+      expect(json_response.last['action']).to eq('created')
     end
 
     it 'returns 404 when user is not authorized to read milestone' do