summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToon Claes <toon@gitlab.com>2017-05-08 14:28:15 +0200
committerToon Claes <toon@iotcl.com>2017-08-03 16:44:22 +0200
commite15d339a5cca13bc476b87cbac89975e7a76e37b (patch)
tree05acbe0fe2f9b487465df3e75c173491d601de0e
parentc39daf937bd62eedcbe7e3b44f107bb7e87452e7 (diff)
downloadgitlab-ce-e15d339a5cca13bc476b87cbac89975e7a76e37b.tar.gz
Add spec to test combining API merge_requests query parameters
To investigate gitlab-org/gitlab-ce#31599
-rw-r--r--spec/requests/api/merge_requests_spec.rb20
1 files changed, 20 insertions, 0 deletions
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index d8dfe71342d..9eda6836ded 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -293,6 +293,26 @@ describe API::MergeRequests do
expect(json_response.length).to eq(0)
end
+ it 'returns an array of labeled merge requests that are merged for a milestone' do
+ bug_label = create(:label, title: 'bug', color: '#FFAABB', project: project)
+
+ mr1 = create(:merge_request, state: "merged", source_project: project, target_project: project, milestone: milestone)
+ mr2 = create(:merge_request, state: "merged", source_project: project, target_project: project, milestone: milestone1)
+ mr3 = create(:merge_request, state: "closed", source_project: project, target_project: project, milestone: milestone1)
+ _mr = create(:merge_request, state: "merged", source_project: project, target_project: project, milestone: milestone1)
+
+ create(:label_link, label: bug_label, target: mr1)
+ create(:label_link, label: bug_label, target: mr2)
+ create(:label_link, label: bug_label, target: mr3)
+
+ get api("/projects/#{project.id}/merge_requests?labels=#{bug_label.title}&milestone=#{milestone1.title}&state=merged", user)
+
+ expect(response).to have_http_status(200)
+ expect(json_response).to be_an Array
+ expect(json_response.length).to eq(1)
+ expect(json_response.first['id']).to eq(mr2.id)
+ end
+
context "with ordering" do
before do
@mr_later = mr_with_later_created_and_updated_at_time