diff options
author | Chantal Rollison <crollison@gitlab.com> | 2018-08-03 22:52:37 +0300 |
---|---|---|
committer | Kamil TrzciĆski <ayufan@ayufan.eu> | 2018-08-03 22:52:37 +0300 |
commit | 90aae02bd77e438510a4c562cc75ef482cf0dcf1 (patch) | |
tree | dbde07c5b39910993c226117280cfb8f4f3b19b1 /spec/controllers/dashboard | |
parent | c4be8de7ad404f30dd6bfa9c17be4b94ecaf92e6 (diff) |
Add group milestones to dashboard milestone page
Diffstat (limited to 'spec/controllers/dashboard')
-rw-r--r-- | spec/controllers/dashboard/milestones_controller_spec.rb | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/spec/controllers/dashboard/milestones_controller_spec.rb b/spec/controllers/dashboard/milestones_controller_spec.rb index ba2669a5ea7..505c040b5d5 100644 --- a/spec/controllers/dashboard/milestones_controller_spec.rb +++ b/spec/controllers/dashboard/milestones_controller_spec.rb @@ -2,8 +2,10 @@ require 'spec_helper' describe Dashboard::MilestonesController do let(:project) { create(:project) } - let(:user) { create(:user) } + let(:group) { create(:group) } + let(:user) { create(:user) } let(:project_milestone) { create(:milestone, project: project) } + let(:group_milestone) { create(:milestone, group: group) } let(:milestone) do DashboardMilestone.build( [project], @@ -11,13 +13,17 @@ describe Dashboard::MilestonesController do ) end let(:issue) { create(:issue, project: project, milestone: project_milestone) } + let(:group_issue) { create(:issue, milestone: group_milestone) } + let!(:label) { create(:label, project: project, title: 'Issue Label', issues: [issue]) } + let!(:group_label) { create(:group_label, group: group, title: 'Group Issue Label', issues: [group_issue]) } let!(:merge_request) { create(:merge_request, source_project: project, target_project: project, milestone: project_milestone) } let(:milestone_path) { dashboard_milestone_path(milestone.safe_title, title: milestone.title) } before do sign_in(user) project.add_maintainer(user) + group.add_developer(user) end it_behaves_like 'milestone tabs' @@ -35,4 +41,15 @@ describe Dashboard::MilestonesController do expect(response).to have_gitlab_http_status(200) end end + + describe "#index" do + it 'should contain group and project milestones' do + get :index, format: :json + + expect(response).to have_gitlab_http_status(200) + expect(json_response.size).to eq(2) + expect(json_response.map { |i| i["first_milestone"]["id"] }).to include(group_milestone.id, project_milestone.id) + expect(json_response.map { |i| i["group_name"] }).to include(group.name) + end + end end |