1 files changed, 29 insertions, 213 deletions
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index 8b168816d6c..605761867bf 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -72,12 +72,6 @@ describe API::MergeRequests do
 
         expect(response).to have_gitlab_http_status(401)
       end
-
-      it "returns authentication error when scope is created_by_me" do
-        get api("/merge_requests"), scope: 'created_by_me'
-
-        expect(response).to have_gitlab_http_status(401)
-      end
     end
 
     context 'when authenticated' do
@@ -229,224 +223,46 @@ describe API::MergeRequests do
   end
 
   describe "GET /projects/:id/merge_requests" do
-    context "when unauthenticated" do
-      it 'returns merge requests for public projects' do
-        get api("/projects/#{project.id}/merge_requests")
-
-        expect_paginated_array_response
-      end
-
-      it "returns 404 for non public projects" do
-        project = create(:project, :private)
-        get api("/projects/#{project.id}/merge_requests")
-
-        expect(response).to have_gitlab_http_status(404)
-      end
-    end
-
-    context "when authenticated" do
-      it 'avoids N+1 queries' do
-        control = ActiveRecord::QueryRecorder.new do
-          get api("/projects/#{project.id}/merge_requests", user)
-        end
+    let(:endpoint_path) { "/projects/#{project.id}/merge_requests" }
 
-        create(:merge_request, state: 'closed', milestone: milestone1, author: user, assignee: user, source_project: project, target_project: project, title: "Test", created_at: base_time)
-
-        create(:merge_request, milestone: milestone1, author: user, assignee: user, source_project: project, target_project: project, title: "Test", created_at: base_time)
-
-        expect do
-          get api("/projects/#{project.id}/merge_requests", user)
-        end.not_to exceed_query_limit(control)
-      end
-
-      it "returns an array of all merge_requests" do
-        get api("/projects/#{project.id}/merge_requests", user)
-
-        expect_response_ordered_exactly(merge_request_merged, merge_request_closed, merge_request)
-        expect(json_response.last['title']).to eq(merge_request.title)
-        expect(json_response.last).to have_key('web_url')
-        expect(json_response.last['sha']).to eq(merge_request.diff_head_sha)
-        expect(json_response.last['merge_commit_sha']).to be_nil
-        expect(json_response.last['merge_commit_sha']).to eq(merge_request.merge_commit_sha)
-        expect(json_response.last['downvotes']).to eq(1)
-        expect(json_response.last['upvotes']).to eq(1)
-        expect(json_response.last['labels']).to eq([label2.title, label.title])
-        expect(json_response.first['title']).to eq(merge_request_merged.title)
-        expect(json_response.first['sha']).to eq(merge_request_merged.diff_head_sha)
-        expect(json_response.first['merge_commit_sha']).not_to be_nil
-        expect(json_response.first['merge_commit_sha']).to eq(merge_request_merged.merge_commit_sha)
-        expect(json_response.first['squash']).to eq(merge_request_merged.squash)
-      end
-
-      it "returns an array of all merge_requests using simple mode" do
-        get api("/projects/#{project.id}/merge_requests?view=simple", user)
-
-        expect_response_ordered_exactly(merge_request_merged, merge_request_closed, merge_request)
-        expect(json_response.last.keys).to match_array(%w(id iid title web_url created_at description project_id state updated_at))
-        expect(json_response.last['iid']).to eq(merge_request.iid)
-        expect(json_response.last['title']).to eq(merge_request.title)
-        expect(json_response.last).to have_key('web_url')
-        expect(json_response.first['iid']).to eq(merge_request_merged.iid)
-        expect(json_response.first['title']).to eq(merge_request_merged.title)
-        expect(json_response.first).to have_key('web_url')
-      end
-
-      it "returns an array of all merge_requests" do
-        get api("/projects/#{project.id}/merge_requests?state", user)
-
-        expect_response_ordered_exactly(merge_request_merged, merge_request_closed, merge_request)
-        expect(json_response.last['title']).to eq(merge_request.title)
-      end
-
-      it "returns an array of open merge_requests" do
-        get api("/projects/#{project.id}/merge_requests?state=opened", user)
-
-        expect_response_ordered_exactly(merge_request)
-        expect(json_response.last['title']).to eq(merge_request.title)
-      end
+    it_behaves_like 'merge requests list'
 
-      it "returns an array of closed merge_requests" do
-        get api("/projects/#{project.id}/merge_requests?state=closed", user)
-
-        expect_response_ordered_exactly(merge_request_closed)
-        expect(json_response.first['title']).to eq(merge_request_closed.title)
-      end
-
-      it "returns an array of merged merge_requests" do
-        get api("/projects/#{project.id}/merge_requests?state=merged", user)
-
-        expect_response_ordered_exactly(merge_request_merged)
-        expect(json_response.first['title']).to eq(merge_request_merged.title)
-      end
-
-      it 'returns merge_request by "iids" array' do
-        get api("/projects/#{project.id}/merge_requests", user), iids: [merge_request.iid, merge_request_closed.iid]
-
-        expect_response_ordered_exactly(merge_request_closed, merge_request)
-        expect(json_response.first['title']).to eq merge_request_closed.title
-      end
-
-      it 'matches V4 response schema' do
-        get api("/projects/#{project.id}/merge_requests", user)
-
-        expect(response).to have_gitlab_http_status(200)
-        expect(response).to match_response_schema('public_api/v4/merge_requests')
-      end
-
-      it 'returns an empty array if no issue matches milestone' do
-        get api("/projects/#{project.id}/merge_requests", user), milestone: '1.0.0'
-
-        expect_paginated_array_response
-        expect(json_response.length).to eq(0)
-      end
-
-      it 'returns an empty array if milestone does not exist' do
-        get api("/projects/#{project.id}/merge_requests", user), milestone: 'foo'
-
-        expect_paginated_array_response
-        expect(json_response.length).to eq(0)
-      end
-
-      it 'returns an array of merge requests in given milestone' do
-        get api("/projects/#{project.id}/merge_requests", user), milestone: '0.9'
-
-        expect(json_response.first['title']).to eq merge_request_closed.title
-        expect(json_response.first['id']).to eq merge_request_closed.id
-      end
-
-      it 'returns an array of merge requests matching state in milestone' do
-        get api("/projects/#{project.id}/merge_requests", user), milestone: '0.9', state: 'closed'
-
-        expect_response_ordered_exactly(merge_request_closed)
-      end
-
-      it 'returns an array of labeled merge requests' do
-        get api("/projects/#{project.id}/merge_requests?labels=#{label.title}", user)
-
-        expect_paginated_array_response
-        expect(json_response.length).to eq(1)
-        expect(json_response.first['labels']).to eq([label2.title, label.title])
-      end
-
-      it 'returns an array of labeled merge requests where all labels match' do
-        get api("/projects/#{project.id}/merge_requests?labels=#{label.title},foo,bar", user)
-
-        expect_paginated_array_response
-        expect(json_response.length).to eq(0)
-      end
-
-      it 'returns an empty array if no merge request matches labels' do
-        get api("/projects/#{project.id}/merge_requests?labels=foo,bar", user)
-
-        expect_paginated_array_response
-        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_ordered_exactly(mr2)
-      end
-
-      context "with ordering" do
-        let(:merge_requests) { [merge_request_merged, merge_request_closed, merge_request] }
-
-        before do
-          @mr_later = mr_with_later_created_and_updated_at_time
-          @mr_earlier = mr_with_earlier_created_and_updated_at_time
-        end
-
-        it "returns an array of merge_requests in ascending order" do
-          get api("/projects/#{project.id}/merge_requests?sort=asc", user)
-
-          expect_response_ordered_exactly(*merge_requests.sort_by { |mr| mr['created_at'] })
-        end
-
-        it "returns an array of merge_requests in descending order" do
-          get api("/projects/#{project.id}/merge_requests?sort=desc", user)
+    it "returns 404 for non public projects" do
+      project = create(:project, :private)
 
-          expect_response_ordered_exactly(*merge_requests.sort_by { |mr| mr['created_at'] }.reverse)
-        end
+      get api("/projects/#{project.id}/merge_requests")
 
-        it "returns an array of merge_requests ordered by updated_at" do
-          get api("/projects/#{project.id}/merge_requests?order_by=updated_at", user)
+      expect(response).to have_gitlab_http_status(404)
+    end
 
-          expect_response_ordered_exactly(*merge_requests.sort_by { |mr| mr['updated_at'] }.reverse)
-        end
+    it 'returns merge_request by "iids" array' do
+      get api(endpoint_path, user), iids: [merge_request.iid, merge_request_closed.iid]
 
-        it "returns an array of merge_requests ordered by created_at" do
-          get api("/projects/#{project.id}/merge_requests?order_by=created_at&sort=asc", user)
+      expect(response).to have_gitlab_http_status(200)
+      expect(json_response).to be_an Array
+      expect(json_response.length).to eq(2)
+      expect(json_response.first['title']).to eq merge_request_closed.title
+      expect(json_response.first['id']).to eq merge_request_closed.id
+    end
+  end
 
-          expect_response_ordered_exactly(*merge_requests.sort_by { |mr| mr['created_at'] })
-        end
-      end
+  describe "GET /groups/:id/merge_requests" do
+    let!(:group) { create(:group, :public) }
+    let!(:project) { create(:project, :public, :repository, creator: user, namespace: group, only_allow_merge_if_pipeline_succeeds: false) }
+    let(:endpoint_path) { "/groups/#{group.id}/merge_requests" }
 
-      context 'source_branch param' do
-        it 'returns merge requests with the given source branch' do
-          get api('/merge_requests', user), source_branch: merge_request_closed.source_branch, state: 'all'
+    before do
+      group.add_reporter(user)
+    end
 
-          expect_response_contain_exactly(merge_request_closed, merge_request_merged)
-        end
-      end
+    it_behaves_like 'merge requests list'
 
-      context 'target_branch param' do
-        it 'returns merge requests with the given target branch' do
-          get api('/merge_requests', user), target_branch: merge_request_closed.target_branch, state: 'all'
+    context 'when have subgroups', :nested_groups do
+      let!(:group) { create(:group, :public) }
+      let!(:subgroup) { create(:group, parent: group) }
+      let!(:project) { create(:project, :public, :repository, creator: user, namespace: subgroup, only_allow_merge_if_pipeline_succeeds: false) }
 
-          expect_response_contain_exactly(merge_request_closed, merge_request_merged)
-        end
-      end
+      it_behaves_like 'merge requests list'
     end
   end